Diff
Modified: trunk/app/controllers/api_controller.rb (3432 => 3433)
--- trunk/app/controllers/api_controller.rb 2013-02-20 15:43:45 UTC (rev 3432)
+++ trunk/app/controllers/api_controller.rb 2013-02-22 09:27:02 UTC (rev 3433)
@@ -4,7 +4,7 @@
# See license.txt for details.
require 'base64'
-require 'lib/rest'
+require 'rest'
class ApiController < ApplicationController
Modified: trunk/app/models/federation_source.rb (3432 => 3433)
--- trunk/app/models/federation_source.rb 2013-02-20 15:43:45 UTC (rev 3432)
+++ trunk/app/models/federation_source.rb 2013-02-22 09:27:02 UTC (rev 3433)
@@ -3,8 +3,8 @@
# Copyright (c) 2007 University of Manchester and the University of Southampton.
# See license.txt for details.
-require 'lib/acts_as_site_entity'
-require 'lib/acts_as_contributor'
+require 'acts_as_site_entity'
+require 'acts_as_contributor'
class FederationSource < ActiveRecord::Base
acts_as_site_entity
Modified: trunk/app/models/service.rb (3432 => 3433)
--- trunk/app/models/service.rb 2013-02-20 15:43:45 UTC (rev 3432)
+++ trunk/app/models/service.rb 2013-02-22 09:27:02 UTC (rev 3433)
@@ -3,8 +3,8 @@
# Copyright (c) 2007 University of Manchester and the University of Southampton.
# See license.txt for details.
-require 'lib/acts_as_site_entity'
-require 'lib/acts_as_contributable'
+require 'acts_as_site_entity'
+require 'acts_as_contributable'
class Service < ActiveRecord::Base
acts_as_site_entity
Modified: trunk/app/models/workflow.rb (3432 => 3433)
--- trunk/app/models/workflow.rb 2013-02-20 15:43:45 UTC (rev 3432)
+++ trunk/app/models/workflow.rb 2013-02-22 09:27:02 UTC (rev 3433)
@@ -10,7 +10,7 @@
require 'acts_as_attributable'
require 'acts_as_reviewable'
require 'acts_as_runnable'
-require 'lib/previews'
+require 'previews'
require 'scufl/model'
require 'scufl/parser'
Modified: trunk/app/models/workflow_version.rb (3432 => 3433)
--- trunk/app/models/workflow_version.rb 2013-02-20 15:43:45 UTC (rev 3432)
+++ trunk/app/models/workflow_version.rb 2013-02-22 09:27:02 UTC (rev 3433)
@@ -3,7 +3,7 @@
# Copyright (c) 2012 University of Manchester and the University of Southampton.
# See license.txt for details.
-require 'lib/previews'
+require 'previews'
class WorkflowVersion < ActiveRecord::Base
Modified: trunk/config/environment.rb (3432 => 3433)
--- trunk/config/environment.rb 2013-02-20 15:43:45 UTC (rev 3432)
+++ trunk/config/environment.rb 2013-02-22 09:27:02 UTC (rev 3433)
@@ -71,8 +71,6 @@
# Include your application configuration below
-require 'lib/conf'
-
# SMTP configuration
require 'smtp_tls'
Modified: trunk/config/routes.rb (3432 => 3433)
--- trunk/config/routes.rb 2013-02-20 15:43:45 UTC (rev 3432)
+++ trunk/config/routes.rb 2013-02-22 09:27:02 UTC (rev 3433)
@@ -1,4 +1,4 @@
-require 'lib/rest'
+require 'rest'
ActionController::Routing::Routes.draw do |map|
Modified: trunk/lib/rest.rb (3432 => 3433)
--- trunk/lib/rest.rb 2013-02-20 15:43:45 UTC (rev 3432)
+++ trunk/lib/rest.rb 2013-02-22 09:27:02 UTC (rev 3433)
@@ -3,8 +3,8 @@
# Copyright (c) 2007 University of Manchester and the University of Southampton.
# See license.txt for details.
-require 'lib/conf'
-require 'lib/excel_xml'
+require 'conf'
+require 'excel_xml'
require 'xml/libxml'
require 'uri'
require 'pivoting'
Modified: trunk/lib/workflow_types_handler.rb (3432 => 3433)
--- trunk/lib/workflow_types_handler.rb 2013-02-20 15:43:45 UTC (rev 3432)
+++ trunk/lib/workflow_types_handler.rb 2013-02-22 09:27:02 UTC (rev 3433)
@@ -6,7 +6,7 @@
# Helper class to deal with Workflow types and processors.
# Note that workflow types can exist that don't have corresponding processors.
-require 'lib/workflow_processors/interface'
+require 'workflow_processors/interface'
class WorkflowTypesHandler
Modified: trunk/test/functional/api_controller_test.rb (3432 => 3433)
--- trunk/test/functional/api_controller_test.rb 2013-02-20 15:43:45 UTC (rev 3432)
+++ trunk/test/functional/api_controller_test.rb 2013-02-22 09:27:02 UTC (rev 3433)
@@ -1,7 +1,7 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'api_controller'
require 'xml/libxml'
-require 'lib/rest'
+require 'rest'
include ActionView::Helpers::UrlHelper
include ActionController::UrlWriter