Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: cloudfoundry-attic/vcap
...
head fork: cloudfoundry-attic/vcap
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 68 files changed
  • 0 commit comments
  • 3 contributors
Commits on Mar 27, 2012
@daleolds daleolds correct uaa gem
The correct gem has md5 be21bd197751e057a93b47b715fb729b.

Change-Id: Ic57570492ab7b02b83f43c7e91482dfee26ce644
4a6c088
@d d Remove logging gem
  Remove stale dependency that causes recent headaches

  Test plan: pass unit tests, deploy on BOSH and pass BVTs

Change-Id: I9a42b7136319532395ab288b312b2f53a1a9a7ac
e7935fe
Commits on Mar 28, 2012
Patrick Bozeman bump tests submodule to uaa passwd test
Change-Id: Ib8a838efba459a916bf2dc800062d3dcf5a1e917
0f0b624
Commits on Mar 30, 2012
Patrick Bozeman Revert "Update to Tomcat7 (replacing Tomcat6)"
This reverts commit 6d9a9d8.

Note: I bumped the versions of the staging and stager gems
beyond what is on master to avoid gem version confusion.

Conflicts:

	cloud_controller/Gemfile.lock
	cloud_controller/vendor/cache/vcap_staging-0.1.47.gem
	stager/Gemfile.lock
	stager/vendor/cache/vcap_staging-0.1.47.gem
	staging/Gemfile.lock
	staging/lib/vcap/staging/version.rb
	tests

Change-Id: I489aeaed6ec12e9feaf3d8a47d28e2b9ad96aa7d
3c83727
Commits on Apr 02, 2012
@d d Vendor vcap_logging
  Revendored vcap_logging 1.0.0 gem in CC, DEA, HM, router, stager,
package_cache (and client), and warden.

Change-Id: Ib48ba5ca0727c919c31c281ac6524ffe66ddf814
ac6d595
Showing with 82 additions and 60 deletions.
  1. +2 −4 cloud_controller/Gemfile
  2. +6 −9 cloud_controller/Gemfile.lock
  3. BIN  cloud_controller/vendor/cache/cf-uaa-client-0.0.5.gem
  4. BIN  cloud_controller/vendor/cache/little-plugger-1.1.3.gem
  5. BIN  cloud_controller/vendor/cache/logging-1.6.2.gem
  6. BIN  cloud_controller/vendor/cache/vcap_common-1.0.9.gem
  7. BIN  cloud_controller/vendor/cache/vcap_logging-0.1.3.gem
  8. BIN  cloud_controller/vendor/cache/vcap_logging-1.0.0.gem
  9. BIN  cloud_controller/vendor/cache/{vcap_stager-0.1.11.gem → vcap_stager-0.1.13.gem}
  10. BIN  cloud_controller/vendor/cache/vcap_staging-0.1.47.gem
  11. BIN  cloud_controller/vendor/cache/vcap_staging-0.1.49.gem
  12. +0 −1  dea/Gemfile
  13. +2 −5 dea/Gemfile.lock
  14. +38 −2 dea/lib/dea/agent.rb
  15. BIN  dea/vendor/cache/little-plugger-1.1.3.gem
  16. BIN  dea/vendor/cache/logging-1.6.2.gem
  17. BIN  dea/vendor/cache/vcap_logging-0.1.3.gem
  18. BIN  dea/vendor/cache/vcap_logging-1.0.0.gem
  19. +0 −1  health_manager/Gemfile
  20. +2 −5 health_manager/Gemfile.lock
  21. BIN  health_manager/vendor/cache/cf-uaa-client-0.0.5.gem
  22. BIN  health_manager/vendor/cache/little-plugger-1.1.3.gem
  23. BIN  health_manager/vendor/cache/logging-1.6.2.gem
  24. BIN  health_manager/vendor/cache/vcap_logging-0.1.3.gem
  25. BIN  health_manager/vendor/cache/vcap_logging-1.0.0.gem
  26. +1 −1  java
  27. +1 −1  package_cache/Gemfile.lock
  28. BIN  package_cache/vendor/cache/vcap_logging-0.1.4.gem
  29. BIN  package_cache/vendor/cache/vcap_logging-1.0.0.gem
  30. +11 −14 package_cache_client/Gemfile.lock
  31. BIN  package_cache_client/vendor/cache/daemons-1.1.5.gem
  32. BIN  package_cache_client/vendor/cache/daemons-1.1.8.gem
  33. BIN  package_cache_client/vendor/cache/json_pure-1.6.4.gem
  34. BIN  package_cache_client/vendor/cache/json_pure-1.6.6.gem
  35. BIN  package_cache_client/vendor/cache/little-plugger-1.1.3.gem
  36. BIN  package_cache_client/vendor/cache/logging-1.6.2.gem
  37. BIN  package_cache_client/vendor/cache/mime-types-1.17.2.gem
  38. BIN  package_cache_client/vendor/cache/mime-types-1.18.gem
  39. BIN  package_cache_client/vendor/cache/nats-0.4.22.beta.4.gem
  40. BIN  package_cache_client/vendor/cache/nats-0.4.22.gem
  41. BIN  package_cache_client/vendor/cache/rack-1.4.0.gem
  42. BIN  package_cache_client/vendor/cache/rack-1.4.1.gem
  43. BIN  package_cache_client/vendor/cache/vcap_common-1.0.10.gem
  44. BIN  package_cache_client/vendor/cache/vcap_common-1.0.6.gem
  45. BIN  package_cache_client/vendor/cache/vcap_logging-0.1.3.gem
  46. BIN  package_cache_client/vendor/cache/vcap_logging-1.0.0.gem
  47. +2 −1  router/Gemfile.lock
  48. BIN  router/vendor/cache/vcap_logging-0.1.3.gem
  49. BIN  router/vendor/cache/vcap_logging-1.0.0.gem
  50. +1 −2  stager/Gemfile
  51. +4 −7 stager/Gemfile.lock
  52. +1 −1  stager/lib/vcap/stager/version.rb
  53. BIN  stager/vendor/cache/little-plugger-1.1.3.gem
  54. BIN  stager/vendor/cache/logging-1.5.2.gem
  55. BIN  stager/vendor/cache/vcap_logging-0.1.3.gem
  56. BIN  stager/vendor/cache/vcap_logging-1.0.0.gem
  57. BIN  stager/vendor/cache/vcap_staging-0.1.47.gem
  58. BIN  stager/vendor/cache/vcap_staging-0.1.49.gem
  59. +1 −1  staging/Gemfile.lock
  60. +2 −0  staging/lib/vcap/staging/plugin/java_web/resources/droplet.yaml
  61. +4 −2 staging/lib/vcap/staging/plugin/java_web/resources/generate_server_xml
  62. BIN  staging/lib/vcap/staging/plugin/java_web/resources/tomcat.zip
  63. +1 −0  staging/lib/vcap/staging/plugin/java_web/tomcat.rb
  64. +1 −1  staging/lib/vcap/staging/version.rb
  65. +1 −1  tests
  66. +1 −1  warden/Gemfile.lock
  67. BIN  warden/vendor/cache/vcap_logging-0.1.5.gem
  68. BIN  warden/vendor/cache/vcap_logging-1.0.0.gem
View
6 cloud_controller/Gemfile
@@ -5,17 +5,15 @@ gem 'rails', '~> 3.0.5'
# Message bus
gem 'nats', :require => 'nats/client'
-gem 'logging', '>= 1.5.0'
-
# VCAP common components
gem 'vcap_common', :require => ['vcap/common', 'vcap/component']
gem 'vcap_logging', :require => ['vcap/logging']
-gem 'vcap_staging'
+gem 'vcap_staging', '~> 0.1.49'
gem 'cf-uaa-client', '>= 0.0.5'
# For queuing staging tasks
gem 'em-hiredis'
-gem 'vcap_stager', '~> 0.1.11'
+gem 'vcap_stager', '~> 0.1.13'
# Databases
gem 'sqlite3'
View
15 cloud_controller/Gemfile.lock
@@ -63,9 +63,6 @@ GEM
http_parser.rb (0.5.1)
i18n (0.5.0)
json_pure (1.6.5)
- little-plugger (1.1.3)
- logging (1.6.2)
- little-plugger (>= 1.1.3)
mail (2.2.15)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
@@ -140,9 +137,10 @@ GEM
posix-spawn (~> 0.3.6)
thin (~> 1.3.1)
yajl-ruby (~> 0.8.3)
- vcap_logging (0.1.3)
- vcap_stager (0.1.11)
- vcap_staging (0.1.47)
+ vcap_logging (1.0.0)
+ rake
+ vcap_stager (0.1.13)
+ vcap_staging (0.1.49)
nokogiri (>= 1.4.4)
rake
rspec
@@ -164,7 +162,6 @@ DEPENDENCIES
em-http-request (~> 1.0.0.beta.3)
em-redis (~> 0.3.0)
eventmachine
- logging (>= 1.5.0)
mocha
mysql2 (>= 0.2.6)
nats
@@ -183,6 +180,6 @@ DEPENDENCIES
uuidtools (~> 2.1.2)
vcap_common
vcap_logging
- vcap_stager (~> 0.1.11)
- vcap_staging
+ vcap_stager (~> 0.1.13)
+ vcap_staging (~> 0.1.49)
yajl-ruby (~> 0.8.3)
View
BIN  cloud_controller/vendor/cache/cf-uaa-client-0.0.5.gem
Binary file not shown
View
BIN  cloud_controller/vendor/cache/little-plugger-1.1.3.gem
Binary file not shown
View
BIN  cloud_controller/vendor/cache/logging-1.6.2.gem
Binary file not shown
View
BIN  cloud_controller/vendor/cache/vcap_common-1.0.9.gem
Binary file not shown
View
BIN  cloud_controller/vendor/cache/vcap_logging-0.1.3.gem
Binary file not shown
View
BIN  cloud_controller/vendor/cache/vcap_logging-1.0.0.gem
Binary file not shown
View
BIN  ...oller/vendor/cache/vcap_stager-0.1.11.gem → ...oller/vendor/cache/vcap_stager-0.1.13.gem
Binary file not shown
View
BIN  cloud_controller/vendor/cache/vcap_staging-0.1.47.gem
Binary file not shown
View
BIN  cloud_controller/vendor/cache/vcap_staging-0.1.49.gem
Binary file not shown
View
1  dea/Gemfile
@@ -9,7 +9,6 @@ gem 'rack', :require => ["rack/utils", "rack/mime"]
gem 'rake'
gem 'thin'
gem 'yajl-ruby', :require => ['yajl', 'yajl/json_gem']
-gem 'logging', '>= 1.5.0'
gem 'vcap_common', '~> 1.0.8'
gem 'vcap_logging', :require => ['vcap/logging']
View
7 dea/Gemfile.lock
@@ -17,9 +17,6 @@ GEM
eventmachine (0.12.11.cloudfoundry.3)
http_parser.rb (0.5.1)
json_pure (1.6.5)
- little-plugger (1.1.3)
- logging (1.6.2)
- little-plugger (>= 1.1.3)
nats (0.4.22.beta.8)
daemons (>= 1.1.4)
eventmachine (>= 0.12.10)
@@ -47,7 +44,8 @@ GEM
posix-spawn (~> 0.3.6)
thin (~> 1.3.1)
yajl-ruby (~> 0.8.3)
- vcap_logging (0.1.3)
+ vcap_logging (1.0.0)
+ rake
yajl-ruby (0.8.3)
PLATFORMS
@@ -58,7 +56,6 @@ DEPENDENCIES
ci_reporter
em-http-request (~> 1.0.0.beta.3)
eventmachine
- logging (>= 1.5.0)
nats
rack
rake
View
40 dea/lib/dea/agent.rb
@@ -10,7 +10,6 @@
require 'fcntl'
require 'logger'
-require 'logging'
require 'pp'
require 'set'
require 'socket'
@@ -659,6 +658,10 @@ def process_dea_start(message)
@logger.debug("Clients: #{@num_clients}")
@logger.debug("Reserved Memory Usage: #{@reserved_mem} MB of #{@max_memory} MB TOTAL")
+ manifest_file = File.join(instance[:dir], 'droplet.yaml')
+ manifest = {}
+ manifest = File.open(manifest_file) { |f| YAML.load(f) } if File.file?(manifest_file)
+
prepare_script = File.join(instance_dir, 'prepare')
# once EM allows proper close_on_exec we can remove
FileUtils.cp(File.expand_path("../../../bin/close_fds", __FILE__), prepare_script)
@@ -729,7 +732,7 @@ def process_dea_start(message)
# Send the start message, which will bind the router, when we have established the
# connection..
- detect_port_ready(instance) do |detected|
+ detect_app_ready(instance, manifest) do |detected|
if detected and not instance[:stop_processed]
@logger.info("Instance #{instance[:log_id]} is ready for connections, notifying system of status")
instance[:state] = :RUNNING
@@ -916,6 +919,39 @@ def grab_port
VCAP.grab_ephemeral_port
end
+ def detect_app_ready(instance, manifest, &block)
+ state_file = manifest['state_file']
+ if state_file
+ state_file = File.join(instance[:dir], state_file)
+ detect_state_ready(instance, state_file, &block)
+ else
+ detect_port_ready(instance, &block)
+ end
+ end
+
+ def detect_state_ready(instance, state_file, &block)
+ attempts = 0
+ timer = EM.add_periodic_timer(0.5) do
+ state = nil
+ begin
+ if File.file?(state_file)
+ state = File.open(state_file) { |f| JSON.parse(f.read) }
+ end
+ rescue
+ end
+ if state && state['state'] == 'RUNNING'
+ block.call(true)
+ timer.cancel
+ elsif instance[:debug_mode] != "suspend"
+ attempts += 1
+ if attempts > 600 || instance[:state] != :STARTING # 5 minutes or instance was stopped
+ block.call(false)
+ timer.cancel
+ end
+ end
+ end
+ end
+
def detect_port_ready(instance, &block)
port = instance[:port]
attempts = 0
View
BIN  dea/vendor/cache/little-plugger-1.1.3.gem
Binary file not shown
View
BIN  dea/vendor/cache/logging-1.6.2.gem
Binary file not shown
View
BIN  dea/vendor/cache/vcap_logging-0.1.3.gem
Binary file not shown
View
BIN  dea/vendor/cache/vcap_logging-1.0.0.gem
Binary file not shown
View
1  health_manager/Gemfile
@@ -9,7 +9,6 @@ gem 'rack', :require => ["rack/utils", "rack/mime"]
gem 'rake'
gem 'thin'
gem 'yajl-ruby', :require => ['yajl', 'yajl/json_gem']
-gem 'logging', '>= 1.5.0'
gem 'vcap_common', '>= 1.0.6'
gem 'vcap_logging', :require => ['vcap/logging']
View
7 health_manager/Gemfile.lock
@@ -22,9 +22,6 @@ GEM
eventmachine (0.12.11.cloudfoundry.3)
http_parser.rb (0.5.3)
json_pure (1.6.5)
- little-plugger (1.1.3)
- logging (1.6.2)
- little-plugger (>= 1.1.3)
mime-types (1.17.2)
nats (0.4.22.beta.8)
daemons (>= 1.1.4)
@@ -55,7 +52,8 @@ GEM
posix-spawn (~> 0.3.6)
thin (~> 1.3.1)
yajl-ruby (~> 0.8.3)
- vcap_logging (0.1.3)
+ vcap_logging (1.0.0)
+ rake
yajl-ruby (0.8.3)
PLATFORMS
@@ -67,7 +65,6 @@ DEPENDENCIES
ci_reporter
em-http-request (~> 1.0.0.beta.3)
eventmachine
- logging (>= 1.5.0)
nats
rack
rake
View
BIN  health_manager/vendor/cache/cf-uaa-client-0.0.5.gem
Binary file not shown
View
BIN  health_manager/vendor/cache/little-plugger-1.1.3.gem
Binary file not shown
View
BIN  health_manager/vendor/cache/logging-1.6.2.gem
Binary file not shown
View
BIN  health_manager/vendor/cache/vcap_logging-0.1.3.gem
Binary file not shown
View
BIN  health_manager/vendor/cache/vcap_logging-1.0.0.gem
Binary file not shown
2  java
@@ -1 +1 @@
-Subproject commit 332dff57bffa117482d1163b16238b1071973df2
+Subproject commit fc9b9a4c1ee2509a3f53945c9fd439da88bececc
View
2  package_cache/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
posix-spawn (~> 0.3.6)
thin (~> 1.3.1)
yajl-ruby (~> 0.8.3)
- vcap_logging (0.1.4)
+ vcap_logging (1.0.0)
rake
vcap_package_cache_client (0.1.8)
rake (= 0.9.2.2)
View
BIN  package_cache/vendor/cache/vcap_logging-0.1.4.gem
Binary file not shown
View
BIN  package_cache/vendor/cache/vcap_logging-1.0.0.gem
Binary file not shown
View
25 package_cache_client/Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- vcap_package_cache-client (0.1.8)
+ vcap_package_cache_client (0.1.8)
rake (= 0.9.2.2)
rest-client (= 1.6.3)
vcap_common (~> 1.0.6)
@@ -10,21 +10,18 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- daemons (1.1.5)
+ daemons (1.1.8)
diff-lcs (1.1.3)
eventmachine (0.12.11.cloudfoundry.3)
- json_pure (1.6.4)
- little-plugger (1.1.3)
- logging (1.6.2)
- little-plugger (>= 1.1.3)
- mime-types (1.17.2)
- nats (0.4.22.beta.4)
+ json_pure (1.6.6)
+ mime-types (1.18)
+ nats (0.4.22)
daemons (>= 1.1.4)
eventmachine (>= 0.12.10)
json_pure (>= 1.6.1)
thin (>= 1.3.1)
posix-spawn (0.3.6)
- rack (1.4.0)
+ rack (1.4.1)
rake (0.9.2.2)
rest-client (1.6.3)
mime-types (>= 1.16)
@@ -40,14 +37,14 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- vcap_common (1.0.6)
+ vcap_common (1.0.10)
eventmachine (~> 0.12.11.cloudfoundry.3)
- logging (>= 1.5.0)
- nats (~> 0.4.22.beta.4)
+ nats (~> 0.4.22.beta.8)
posix-spawn (~> 0.3.6)
thin (~> 1.3.1)
yajl-ruby (~> 0.8.3)
- vcap_logging (0.1.3)
+ vcap_logging (1.0.0)
+ rake
yajl-ruby (0.8.3)
PLATFORMS
@@ -55,4 +52,4 @@ PLATFORMS
DEPENDENCIES
rspec
- vcap_package_cache-client!
+ vcap_package_cache_client!
View
BIN  package_cache_client/vendor/cache/daemons-1.1.5.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/daemons-1.1.8.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/json_pure-1.6.4.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/json_pure-1.6.6.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/little-plugger-1.1.3.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/logging-1.6.2.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/mime-types-1.17.2.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/mime-types-1.18.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/nats-0.4.22.beta.4.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/nats-0.4.22.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/rack-1.4.0.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/rack-1.4.1.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/vcap_common-1.0.10.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/vcap_common-1.0.6.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/vcap_logging-0.1.3.gem
Binary file not shown
View
BIN  package_cache_client/vendor/cache/vcap_logging-1.0.0.gem
Binary file not shown
View
3  router/Gemfile.lock
@@ -36,7 +36,8 @@ GEM
posix-spawn (~> 0.3.6)
thin (~> 1.3.1)
yajl-ruby (~> 0.8.3)
- vcap_logging (0.1.3)
+ vcap_logging (1.0.0)
+ rake
yajl-ruby (0.8.3)
PLATFORMS
View
BIN  router/vendor/cache/vcap_logging-0.1.3.gem
Binary file not shown
View
BIN  router/vendor/cache/vcap_logging-1.0.0.gem
Binary file not shown
View
3  stager/Gemfile
@@ -3,12 +3,11 @@ source :rubygems
gem 'eventmachine'
gem 'nats'
gem 'rake'
-gem 'logging', '= 1.5.2'
gem 'yajl-ruby', '>= 0.7.9'
gem 'vcap_common', '~> 1.0.8'
gem 'vcap_logging', '>= 0.1.3'
-gem 'vcap_staging', '~> 0.1.45'
+gem 'vcap_staging', '~> 0.1.49'
group :test do
gem 'rspec'
View
11 stager/Gemfile.lock
@@ -10,9 +10,6 @@ GEM
diff-lcs (1.1.3)
eventmachine (0.12.11.cloudfoundry.3)
json_pure (1.6.5)
- little-plugger (1.1.3)
- logging (1.5.2)
- little-plugger (>= 1.1.2)
nats (0.4.22)
daemons (>= 1.1.4)
eventmachine (>= 0.12.10)
@@ -45,8 +42,9 @@ GEM
posix-spawn (~> 0.3.6)
thin (~> 1.3.1)
yajl-ruby (~> 0.8.3)
- vcap_logging (0.1.3)
- vcap_staging (0.1.47)
+ vcap_logging (1.0.0)
+ rake
+ vcap_staging (0.1.49)
nokogiri (>= 1.4.4)
rake
rspec
@@ -64,13 +62,12 @@ PLATFORMS
DEPENDENCIES
ci_reporter
eventmachine
- logging (= 1.5.2)
nats
rake
rspec
sinatra
vcap_common (~> 1.0.8)
vcap_logging (>= 0.1.3)
- vcap_staging (~> 0.1.45)
+ vcap_staging (~> 0.1.49)
webmock
yajl-ruby (>= 0.7.9)
View
2  stager/lib/vcap/stager/version.rb
@@ -1,5 +1,5 @@
module VCAP
module Stager
- VERSION = '0.1.11'
+ VERSION = '0.1.13'
end
end
View
BIN  stager/vendor/cache/little-plugger-1.1.3.gem
Binary file not shown
View
BIN  stager/vendor/cache/logging-1.5.2.gem
Binary file not shown
View
BIN  stager/vendor/cache/vcap_logging-0.1.3.gem
Binary file not shown
View
BIN  stager/vendor/cache/vcap_logging-1.0.0.gem
Binary file not shown
View
BIN  stager/vendor/cache/vcap_staging-0.1.47.gem
Binary file not shown
View
BIN  stager/vendor/cache/vcap_staging-0.1.49.gem
Binary file not shown
View
2  staging/Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- vcap_staging (0.1.47)
+ vcap_staging (0.1.49)
nokogiri (>= 1.4.4)
rake
rspec
View
2  staging/lib/vcap/staging/plugin/java_web/resources/droplet.yaml
@@ -0,0 +1,2 @@
+---
+state_file: tomcat.state
View
6 staging/lib/vcap/staging/plugin/java_web/resources/generate_server_xml
@@ -35,17 +35,19 @@ TEMPLATE = <<-ERB
<Listener className="org.apache.catalina.core.JasperListener" />
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+ <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
<Service name="Catalina">
<Connector port="<%= tomcat_port %>" protocol="HTTP/1.1"
- connectionTimeout="20000" bindOnInit="false" />
+ connectionTimeout="20000" />
<Engine name="Catalina" defaultHost="localhost">
<Host name="localhost" appBase="webapps"
- unpackWARs="true" autoDeploy="true">
+ unpackWARs="true" autoDeploy="true"
+ xmlValidation="false" xmlNamespaceAware="false">
</Host>
</Engine>
</Service>
View
BIN  staging/lib/vcap/staging/plugin/java_web/resources/tomcat.zip
Binary file not shown
View
1  staging/lib/vcap/staging/plugin/java_web/tomcat.rb
@@ -22,6 +22,7 @@ def self.prepare(dir)
server_xml = File.join(dir, "tomcat", "conf", "server.xml")
FileUtils.rm_f(server_xml)
FileUtils.rm(File.join(dir, "resources", "tomcat.zip"))
+ FileUtils.mv(File.join(dir, "resources", "droplet.yaml"), dir)
FileUtils.mkdir_p(webapp_path)
webapp_path
end
View
2  staging/lib/vcap/staging/version.rb
@@ -1,5 +1,5 @@
module VCAP
module Staging
- VERSION = '0.1.47'
+ VERSION = '0.1.49'
end
end
2  tests
@@ -1 +1 @@
-Subproject commit a098422b06b356e3dae73813fda1a7b863a50b11
+Subproject commit a12c6dd6646b85eff52360772853b7239dcbaf90
View
2  warden/Gemfile.lock
@@ -39,7 +39,7 @@ GEM
thin (~> 1.3.1)
vcap_logging
yajl-ruby (~> 0.8.3)
- vcap_logging (0.1.5)
+ vcap_logging (1.0.0)
rake
warden-client (0.0.1)
yajl-ruby
View
BIN  warden/vendor/cache/vcap_logging-0.1.5.gem
Binary file not shown
View
BIN  warden/vendor/cache/vcap_logging-1.0.0.gem
Binary file not shown

No commit comments for this range

Something went wrong with that request. Please try again.