deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject svn commit: r1208436 - in /deltacloud/trunk/server/lib/cimi: dependencies.rb helpers/cmwgapp_helper.rb helpers/dmtfdep.rb server.rb
Date Wed, 30 Nov 2011 13:58:32 GMT
Author: mfojtik
Date: Wed Nov 30 13:58:31 2011
New Revision: 1208436

URL: http://svn.apache.org/viewvc?rev=1208436&view=rev
Log:
CIMI: Removed obsoleted helpers. Consolidated dependencies.

Added:
    deltacloud/trunk/server/lib/cimi/dependencies.rb   (contents, props changed)
      - copied, changed from r1207924, deltacloud/trunk/server/lib/cimi/helpers/dmtfdep.rb
Removed:
    deltacloud/trunk/server/lib/cimi/helpers/cmwgapp_helper.rb
    deltacloud/trunk/server/lib/cimi/helpers/dmtfdep.rb
Modified:
    deltacloud/trunk/server/lib/cimi/server.rb

Copied: deltacloud/trunk/server/lib/cimi/dependencies.rb (from r1207924, deltacloud/trunk/server/lib/cimi/helpers/dmtfdep.rb)
URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/lib/cimi/dependencies.rb?p2=deltacloud/trunk/server/lib/cimi/dependencies.rb&p1=deltacloud/trunk/server/lib/cimi/helpers/dmtfdep.rb&r1=1207924&r2=1208436&rev=1208436&view=diff
==============================================================================
--- deltacloud/trunk/server/lib/cimi/helpers/dmtfdep.rb (original)
+++ deltacloud/trunk/server/lib/cimi/dependencies.rb Wed Nov 30 13:58:31 2011
@@ -19,9 +19,7 @@
 
 require 'sinatra'
 require 'deltacloud/drivers'
-require 'deltacloud/core_ext/integer'
-require 'deltacloud/core_ext/hash'
-require 'deltacloud/core_ext/string'
+require 'deltacloud/core_ext'
 require 'deltacloud/base_driver'
 require 'deltacloud/hardware_profile'
 require 'deltacloud/state_machine'

Propchange: deltacloud/trunk/server/lib/cimi/dependencies.rb
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: deltacloud/trunk/server/lib/cimi/server.rb
URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/lib/cimi/server.rb?rev=1208436&r1=1208435&r2=1208436&view=diff
==============================================================================
--- deltacloud/trunk/server/lib/cimi/server.rb (original)
+++ deltacloud/trunk/server/lib/cimi/server.rb Wed Nov 30 13:58:31 2011
@@ -13,20 +13,17 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-
-require 'cimi/helpers/dmtfdep'
-require 'cimi/helpers/cmwgapp_helper'
+require 'cimi/dependencies'
 require 'cimi/helpers/cimi_helper'
-require 'deltacloud/core_ext'
 require 'cimi/model'
 
 set :version, '0.1.0'
 
 include Deltacloud::Drivers
 include CIMI::Model
+
 set :drivers, Proc.new { driver_config }
 
-STOREROOT = File.join($top_srcdir, 'lib', 'cimi', 'data')
 Sinatra::Application.register Rack::RespondTo
 
 use Rack::ETag
@@ -39,12 +36,8 @@ use Rack::Date
 configure do
   set :root_url, "/cimi"
   set :views, File::join($top_srcdir, 'views', 'cimi')
-  # NOTE: Change :public to :public_folder once we update sinatra to 1.3
-  # set :public_folder, File::join($top_srcdir, 'public')
   set :public_folder, File::join($top_srcdir, 'public')
-  # Try to load the driver on startup to fail early if there are issues
   driver
-  set :store, STOREROOT
 end
 
 configure :production do
@@ -77,7 +70,7 @@ end
 
 get "#{settings.root_url}\/?" do
   halt 401 if params[:force_auth] and not driver.valid_credentials?(credentials)
-  redirect "#{settings.root_url}/cloudEntryPoint", 301
+  redirect cloudEntryPoint_url, 301
 end
 
 global_collection  :cloudEntryPoint do



Mime
View raw message