Permalink
Browse files

Merge remote branch 'origin/master' into fileservice

Change-Id: I7c0d0a32caf41b002ddfe051b0ad689c443f721a
  • Loading branch information...
2 parents 100897f + a45c3bb commit 3ae43f53d646b6b34dfcf69174414c65729b67fe felixhoo committed Sep 26, 2012
Showing 500 changed files with 4,490 additions and 689 deletions.
View
@@ -13,3 +13,4 @@ ci-working-dir
.rvmrc
nats-server.pid
base/pkg
+coverage
View
5 README
@@ -36,3 +36,8 @@ pass the unit test. Normally these binaries are required to be installed in
accordance to the path specified in the config file, i.e., the .yml file in
the config directory. The nats information might also need to be updated to match
the configuration of the nats server.
+
+== File a Bug
+
+To file a bug against Cloud Foundry Open Source and its components, sign up and use our
+bug tracking system: http://cloudfoundry.atlassian.net
View
@@ -1,6 +1,6 @@
require 'tmpdir'
-SERVICES_DIR = %w(atmos couchdb elasticsearch filesystem memcached mongodb mysql neo4j postgresql rabbit redis service_broker vblob tools/backup/manager)
+SERVICES_DIR = %w(atmos couchdb echo elasticsearch filesystem memcached mongodb mysql neo4j postgresql rabbit redis service_broker vblob tools/backup/manager marketplace)
desc "Run integration tests."
task "tests" do |t|
View
@@ -11,11 +11,11 @@ gem "sinatra"
gem "thin"
gem "xml-simple"
-gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b7e3508eb9'
+gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1077d35ef7'
-
-gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '84dcc3acb0'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'db367f31'
+gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
+gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
group :test do
gem "rake"
View
@@ -15,26 +15,31 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-common.git
- revision: b7e3508eb96b86162ca385f1f46a13ecfcce359d
- ref: b7e3508eb9
+ revision: fd6b6d91b19c551cf5091c8469595df923dd2612
+ ref: fd6b6d91
specs:
- vcap_common (1.0.14)
+ vcap_common (2.0.7)
+ em-http-request (~> 1.0.0.beta3)
eventmachine
- nats (~> 0.4.22.beta.8)
+ httpclient
+ membrane (~> 0.0.2)
+ mime-types
+ multipart-post
+ nats (~> 0.4.24)
posix-spawn (~> 0.3.6)
- thin (~> 1.3.1)
+ thin
yajl-ruby (~> 0.8.3)
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: 1077d35ef73be675670a8565bc7dca974d4a2ad4
- ref: 1077d35ef7
+ revision: db367f3166b7ee63c8a4b4d40fd948babc407370
+ ref: db367f31
specs:
- vcap_services_base (0.1.11)
+ vcap_services_base (0.1.16)
curb (~> 0.7.16)
datamapper (~> 1.1.0)
do_sqlite3 (~> 0.10.3)
- em-http-request (~> 0.3.0)
+ em-http-request (~> 1.0.0.beta.3)
eventmachine (~> 0.12.11.cloudfoundry.3)
eventmachine_httpserver (~> 0.2.1)
json (~> 1.4.6)
@@ -48,21 +53,25 @@ GIT
uuidtools (~> 2.1.2)
vcap_common (>= 1.0.8)
vcap_logging (>= 1.0.2)
- warden-client (~> 0.0.2)
+ warden-client (~> 0.0.6)
+ warden-protocol (~> 0.0.5)
GIT
remote: git://github.com/cloudfoundry/warden.git
- revision: 84dcc3acb0bc3155c66dbfa972686ad83dcd70a0
- ref: 84dcc3acb0
+ revision: 21f9a32ab501a6485c9a4e7aff4f9b6f40e31e3c
+ ref: 21f9a32ab50
specs:
- warden-client (0.0.2)
- yajl-ruby
+ warden-client (0.0.6)
+ warden-protocol
+ warden-protocol (0.0.5)
+ beefcake
GEM
remote: http://rubygems.org/
specs:
addressable (2.2.8)
bcrypt-ruby (2.1.4)
+ beefcake (0.3.7)
builder (3.0.0)
ci_reporter (1.6.4)
builder (>= 2.1.2)
@@ -114,18 +123,25 @@ GEM
dm-core (~> 1.1.0)
do_sqlite3 (0.10.8)
data_objects (= 0.10.8)
- em-http-request (0.3.0)
- addressable (>= 2.0.0)
- escape_utils
- eventmachine (>= 0.12.9)
- escape_utils (0.2.4)
+ em-http-request (1.0.0.beta.3)
+ addressable (>= 2.2.3)
+ em-socksify
+ eventmachine
+ http_parser.rb (>= 0.5.1)
+ em-socksify (0.1.0)
+ eventmachine
eventmachine_httpserver (0.2.1)
fastercsv (1.5.5)
+ http_parser.rb (0.5.3)
+ httpclient (2.2.7)
json (1.4.6)
json_pure (1.7.3)
macaddr (1.6.1)
systemu (~> 2.5.0)
+ membrane (0.0.2)
+ mime-types (1.19)
multi_json (1.0.4)
+ multipart-post (1.1.5)
nats (0.4.24)
daemons (>= 1.1.5)
eventmachine (>= 0.12.10)
@@ -136,12 +152,12 @@ GEM
rake (0.9.2.2)
rcov (0.9.9)
redis (3.0.1)
- redis-namespace (1.2.0)
+ redis-namespace (1.2.1)
redis (~> 3.0.0)
redisk (0.2.2)
redis (>= 0.1.1)
redis-namespace (>= 0.1.0)
- resque (1.21.0)
+ resque (1.22.0)
multi_json (~> 1.0)
redis-namespace (~> 1.0)
sinatra (>= 0.9.2)
@@ -178,7 +194,7 @@ GEM
tilt (1.3.3)
uuid (2.3.5)
macaddr (~> 1.0)
- uuidtools (2.1.2)
+ uuidtools (2.1.3)
vegas (0.1.11)
rack (>= 1.0.0)
xml-simple (1.0.15)
@@ -207,4 +223,5 @@ DEPENDENCIES
vcap_logging!
vcap_services_base!
warden-client!
+ warden-protocol!
xml-simple
@@ -5,6 +5,7 @@ service:
version: "1.4"
description: 'Atmos object store'
plans: ['free']
+ default_plan: free
tags: ['atmos', 'atmos-1.4', 'object store']
ip_route: localhost
#proxy:
@@ -45,20 +45,13 @@ def provision_service(request, prov_handle=nil, &blk)
shared_secret = @atmos_helper.create_user(token, st_name)
svc = {
- :data => {:subtenant_name => st_name, :subtenant_id => st_id, :host => @host},
- :service_id => st_name,
- :credentials => {:host => @host, :port => @port, :token => token,
- :shared_secret => shared_secret, :subtenant_id => st_id}
- }
- # set 'configuration' instead of 'data' to keep local hash consistent
- svc_local = {
:configuration => {"subtenant_name" => st_name, "subtenant_id" => st_id, "host" => @host},
:service_id => st_name,
:credentials => {"host" => @host, "port" => @port, "token" => token,
"shared_secret" => shared_secret, "subtenant_id" => st_id}
}
@logger.debug("Service provisioned: #{svc.inspect}")
- @prov_svcs[svc[:service_id]] = svc_local
+ @prov_svcs[svc[:service_id]] = svc
blk.call(success(svc))
rescue => e
# roll back work
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -1,6 +1,6 @@
source :rubygems
-gem "eventmachine"
+gem 'eventmachine', :git => 'git://github.com/cloudfoundry/eventmachine.git', :branch => 'release-0.12.11-cf'
gem "em-http-request"
gem "nats", '>= 0.4.8'
gem "ruby-hmac"
@@ -12,10 +12,11 @@ gem "sinatra"
gem "thin"
gem "couchrest"
-gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b7e3508eb9'
+gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1077d35ef7'
-gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '84dcc3acb0'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'db367f31'
+gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
+gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
group :test do
gem "rake"
View
@@ -6,28 +6,40 @@ GIT
vcap_logging (1.0.2)
rake
+GIT
+ remote: git://github.com/cloudfoundry/eventmachine.git
+ revision: 2806c630d8631d5dcf9fb2555f665b829052aabe
+ branch: release-0.12.11-cf
+ specs:
+ eventmachine (0.12.11.cloudfoundry.3)
+
GIT
remote: git://github.com/cloudfoundry/vcap-common.git
- revision: b7e3508eb96b86162ca385f1f46a13ecfcce359d
- ref: b7e3508eb9
+ revision: fd6b6d91b19c551cf5091c8469595df923dd2612
+ ref: fd6b6d91
specs:
- vcap_common (1.0.14)
+ vcap_common (2.0.7)
+ em-http-request (~> 1.0.0.beta3)
eventmachine
- nats (~> 0.4.22.beta.8)
+ httpclient
+ membrane (~> 0.0.2)
+ mime-types
+ multipart-post
+ nats (~> 0.4.24)
posix-spawn (~> 0.3.6)
- thin (~> 1.3.1)
+ thin
yajl-ruby (~> 0.8.3)
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: 1077d35ef73be675670a8565bc7dca974d4a2ad4
- ref: 1077d35ef7
+ revision: db367f3166b7ee63c8a4b4d40fd948babc407370
+ ref: db367f31
specs:
- vcap_services_base (0.1.11)
+ vcap_services_base (0.1.16)
curb (~> 0.7.16)
datamapper (~> 1.1.0)
do_sqlite3 (~> 0.10.3)
- em-http-request (~> 0.3.0)
+ em-http-request (~> 1.0.0.beta.3)
eventmachine (~> 0.12.11.cloudfoundry.3)
eventmachine_httpserver (~> 0.2.1)
json (~> 1.4.6)
@@ -41,21 +53,25 @@ GIT
uuidtools (~> 2.1.2)
vcap_common (>= 1.0.8)
vcap_logging (>= 1.0.2)
- warden-client (~> 0.0.2)
+ warden-client (~> 0.0.6)
+ warden-protocol (~> 0.0.5)
GIT
remote: git://github.com/cloudfoundry/warden.git
- revision: 84dcc3acb0bc3155c66dbfa972686ad83dcd70a0
- ref: 84dcc3acb0
+ revision: 21f9a32ab501a6485c9a4e7aff4f9b6f40e31e3c
+ ref: 21f9a32ab50
specs:
- warden-client (0.0.2)
- yajl-ruby
+ warden-client (0.0.6)
+ warden-protocol
+ warden-protocol (0.0.5)
+ beefcake
GEM
remote: http://rubygems.org/
specs:
addressable (2.2.8)
bcrypt-ruby (2.1.4)
+ beefcake (0.3.7)
builder (3.0.0)
ci_reporter (1.7.0)
builder (>= 2.1.2)
@@ -111,20 +127,25 @@ GEM
dm-core (~> 1.1.0)
do_sqlite3 (0.10.8)
data_objects (= 0.10.8)
- em-http-request (0.3.0)
- addressable (>= 2.0.0)
- escape_utils
- eventmachine (>= 0.12.9)
- escape_utils (0.2.4)
- eventmachine (0.12.11.cloudfoundry.3)
+ em-http-request (1.0.0.beta.3)
+ addressable (>= 2.2.3)
+ em-socksify
+ eventmachine
+ http_parser.rb (>= 0.5.1)
+ em-socksify (0.1.0)
+ eventmachine
eventmachine_httpserver (0.2.1)
fastercsv (1.5.5)
+ http_parser.rb (0.5.3)
+ httpclient (2.2.7)
json (1.4.6)
json_pure (1.7.3)
macaddr (1.6.1)
systemu (~> 2.5.0)
+ membrane (0.0.2)
mime-types (1.18)
multi_json (1.3.6)
+ multipart-post (1.1.5)
nats (0.4.24)
daemons (>= 1.1.5)
eventmachine (>= 0.12.10)
@@ -134,12 +155,12 @@ GEM
rack (1.4.1)
rake (0.9.2.2)
redis (3.0.1)
- redis-namespace (1.2.0)
+ redis-namespace (1.2.1)
redis (~> 3.0.0)
redisk (0.2.2)
redis (>= 0.1.1)
redis-namespace (>= 0.1.0)
- resque (1.21.0)
+ resque (1.22.0)
multi_json (~> 1.0)
redis-namespace (~> 1.0)
sinatra (>= 0.9.2)
@@ -178,7 +199,7 @@ GEM
tilt (1.3.3)
uuid (2.3.5)
macaddr (~> 1.0)
- uuidtools (2.1.2)
+ uuidtools (2.1.3)
vegas (0.1.11)
rack (>= 1.0.0)
yajl-ruby (0.8.3)
@@ -193,7 +214,7 @@ DEPENDENCIES
dm-sqlite-adapter
do_sqlite3
em-http-request
- eventmachine
+ eventmachine!
nats (>= 0.4.8)
rake
rspec
@@ -207,3 +228,4 @@ DEPENDENCIES
vcap_logging!
vcap_services_base!
warden-client!
+ warden-protocol!
@@ -5,6 +5,7 @@ service:
version: "0.11.0"
description: 'CouchDB NoSQL store'
plans: ['free']
+ default_plan: free
tags: ['couchdb', 'couchdb-0.11.0', 'nosql']
ip_route: localhost
#proxy:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -11,10 +11,11 @@ gem "do_sqlite3"
gem "sinatra", "~> 1.2.3"
gem "thin"
-gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b7e3508eb9'
+gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1077d35ef7'
-gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '84dcc3acb0'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'db367f31'
+gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
+gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
group :test do
gem "rake"
Oops, something went wrong.

0 comments on commit 3ae43f5

Please sign in to comment.