deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lut...@apache.org
Subject [2/6] git commit: CIMI Webapp (init): we need to require json/pure
Date Mon, 25 Feb 2013 21:08:27 GMT
CIMI Webapp (init): we need to require json/pure

It's actually a problem with the fact that CIMI::Model is not suitable as a
client. Those classes need to be split into a client proper and their
extensions for the server.


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/598bdbca
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/598bdbca
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/598bdbca

Branch: refs/heads/master
Commit: 598bdbca2de0f45fe01e2348c41668bce276ed8e
Parents: aef25e1
Author: David Lutterkort <lutter@redhat.com>
Authored: Mon Feb 25 13:04:39 2013 -0800
Committer: David Lutterkort <lutter@redhat.com>
Committed: Mon Feb 25 13:05:57 2013 -0800

----------------------------------------------------------------------
 clients/cimi/init.rb |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/598bdbca/clients/cimi/init.rb
----------------------------------------------------------------------
diff --git a/clients/cimi/init.rb b/clients/cimi/init.rb
index 92f32d6..37c347a 100644
--- a/clients/cimi/init.rb
+++ b/clients/cimi/init.rb
@@ -28,6 +28,12 @@ require 'entities'
 
 $:.unshift File.join('..', '..','server', 'lib')
 require 'deltacloud/core_ext'
+
+# This is absolutely horrendous, but CIMI::Model::Base triggers
+# Database lookups, which require JSON at some point.
+# FIXME: split out a real client from the CIMI::Model classes
+require 'json/pure'
+
 require 'initializers/mock_initialize'
 require 'initializers/database_initialize'
 require 'cimi/models'


Mime
View raw message