Граф коммитов

69 Коммитов

Автор SHA1 Сообщение Дата
Jennifer Hickey 1b332085eb Merge "Allow any whitespace between 'require' and 'sinatra' in main Sinatra app file" 2012-05-25 21:01:14 +00:00
Jennifer Hickey cc89d6bf18 Allow any whitespace between 'require' and 'sinatra'
in main Sinatra app file

Change-Id: I430575cde67eb30db059b0ece554434ee01d246f
2012-05-24 14:52:08 -07:00
Jesse Zhang 75863fd73b [router][staging] Add license
In preparation of splitting out router and vcap_staging gem

Change-Id: I360d0c6040c003ed611b89072ff235b388cb7879
2012-05-24 12:56:57 -07:00
Thomas Risberg ddb8f52d22 Java and Spring fixes for javaee namespace and use of AnnotationConfigWebApplicationContext
- Fixing Spring autoconfig fails when app is using AnnotationConfigWebApplicationContext (CF-11)

 - Handle javaee (or other) namespace if present correctly for all Java based plugins.

Change-Id: I738b10fe02217c804defc92801d7021ca2c5d6bb
2012-05-14 13:40:11 -04:00
Jennifer Hickey 16169fa310 Add Play Framework
Change-Id: I57c11bcc01f4ce128f07678be334aa130d9b0460
2012-05-11 15:36:40 -07:00
Maria Shaldybina e852cd9c8f [stager] npm support based on shrinkwrap and config option
Change-Id: Ica5a222abf603f8ffebcdb0f1e6bb0ff0a435f87
2012-05-04 17:27:23 -07:00
Jennifer Hickey ceb5772f0e Add Ruby back to Rails path
- Fixes running tasks like "rake" from rails console

Change-Id: Ibe72db81960758f2f97d4ee05f044d6c2224ff8f
2012-05-04 15:40:01 -07:00
Thomas Risberg b07d8d30ca Updating staging to use new 0.0.3 version of cf-autoconfig gem
Change-Id: Iaaa37f67e5cbc945e10e2943e031f803da0b12fb
2012-05-03 10:49:09 -04:00
Maria Shaldybina a4a71ae9a2 disable npm support
Change-Id: I6c62a856fe6c3562b3bbb95e090363a4122ce85d
2012-04-30 18:13:42 -07:00
Maria Shaldybina ba925b1746 [stager] npm support: use HTTP to connect to registry
+cleanup

Change-Id: If4fcc9bf05a1c847718f58fe7ff8d69d090f5b0e
2012-04-30 12:17:33 -07:00
Maria Shaldybina 8c93adea9c [stager] fix npm support cache (remove unnecessary check)
Change-Id: I4bdb720c0ef7f28627f83bf4d47795248a6b5046
2012-04-26 15:27:52 -07:00
Maria Shaldybina 92d7f606e7 Add npm support
- run npm install on stager to recompile native modules
- provide modules based on package.json dependencies
- install npm on dev setup

Change-Id: I3e95aaf0982aea77fc280b58fcf965d1342b2ecf
2012-04-16 13:48:48 -07:00
Jesse Zhang b554cefd68 [Staging] Rakefile clean up
- `rake spec' no longer installs dependencies
  - no shelling out
  - removed unused code
  - single Rakefile

Change-Id: I538674d0649d9ad24060a950c671fadd01eac148
2012-04-05 09:12:57 -07:00
Patrick Bozeman 54f40e2c51 manually squashed merge of release_64_fixes branch (w/conflicts)
This also contains a race condition fix for the stager
unit test.

Change-Id: Id698909dfb0c26c5fde7d5cef52cce63230f7ad8
2012-04-03 11:43:57 -07:00
Jennifer Hickey e46c15485d Add standalone app support
- Add new standalone framework that supports any runtime

- Allow a framework to not have a default runtime

- Allow sending a start command on app create/update

- Fix cc staging json parsing issue to allow quotes
in start command (EM.system strips escaped backslashes)

- Do not assign a web port if no URLs specified

- Confirm app is started by PID if no web port assigned

Change-Id: Ib4e51abf2495ff72dd586727bae85c0997bac28e
2012-03-28 12:01:49 -07:00
Jesse Zhang 569e9d8de4 Merge "[CI] Pick up runtime versions from env var" 2012-03-26 21:08:18 +00:00
Jennifer Hickey 30bf42f2b1 Redirect Rails Console stdout and stderr
- Update rails plugin to use latest live_console
code, which contains fix to redirect stdout and
stderr to remote IO channel (for commands such as puts)

Change-Id: Ifa7faf959b9450730015ef2544e006acc363605f
2012-03-22 13:52:24 -07:00
Jesse Zhang 89128b3633 [staging] Do not put ruby bin dir on path
We won't need that. Vendoring the staging gem also bumps vcap_common
and nats versions in CC and Stager's bundles.
  This diff also sunsets an ugly fix in 268b4d (Change I4f2f08).

  Test plan:
    - Passed unit tests
    - Passed BVTs on dev instance

Change-Id: Idab1e6e746432342d1ee7964283dca1bbdfe4bf6
2012-03-21 15:12:55 -07:00
Ramnivas Laddad 6d9a9d8850 Update to Tomcat7 (replacing Tomcat6)
- Removed the logic in agent that uses a file to decide if an app is started
  (instead, we use Tomcat7's mechanism that doesn't bind to port until the
  app is started). This makes Java web apps no different than other apps
- Update code to generate server.xml such that the bindOnInit attribute is
  set to false (thus making it wait until the app is ready to bind to the port)
  and remove flags that no longer apply to Tomcat7

Change-Id: If00f30dd636cf50df76fbc3cc99ba3eecb464531
2012-03-21 13:53:43 -07:00
Jesse Zhang 4f7411fa82 [CI] Pick up runtime versions from env var
This follows up commit 268b4d (Change Iee47fcf7) to enable overriding
runtime versions through the environment varialbes
VCAP_RUNTIME_${NAME}_VER when running unit and functional tests of
staging plugins.

Change-Id: I2a5d25358c432b40b70fb0c74d938dafc455213e
2012-03-19 12:18:31 -07:00
Jesse Zhang b13a64b500 [python] Update stock configs
Update example yaml configs to reference Python 2.6 runtime as python2
lieu of Changes I9d5a37af and I513499da. This is more of a documentation
update as these configs are not used by deployed applications.

  Test plan: passed unit tests

Change-Id: Id185299b13dbbb1fdfd4cc3fc67b07b334051798
2012-03-13 12:12:17 -07:00
Jennifer Hickey 380c192a6f Ruby auto-reconfiguration for Rack
Change-Id: I48ec83210e8eb0e50395cbf5fbc1ccdd8e34874d
2012-03-05 14:51:57 -08:00
Jesse Zhang b12b91f5a4 [staging] Remove vendor cache from staging gem
They are not big (compared with spec), but they aren't useful to
rubygems.
  This change doesn't bump the gem version to minimize impact
on other more important in-flight changes on staging.

Change-Id: If5b299823378a85e7bd98f517ee36f6b302602a7
2012-03-05 13:51:43 -08:00
Jesse Zhang 710594bf2a [bugfix] Fix temp dir leak in tests
Properly clean up temporary directories after unit tests.

Change-Id: Iee47fcf7eed35754a5e705c7e1f38de1a93b6af6
2012-03-04 00:48:31 -08:00
Jesse Zhang 268b4d8bcc [CI] Pick Up Runtime for Tests from Environment
Determines the runtime executables from the environment, falling back
to the current behavior of hardcoded paths in manifests when none is
set. This allows developers using different setups to run the unit
tests.

  This patch also includes a interim fix to make the staging unit tests
happy. A more real solution should roll out in a day.

  Test plans: pass unit tests, both locally and (seriously) on jenkins

Change-Id: I4f2f086dbaa9da66cdffd21c5d02d3941b7ec288
2012-03-02 00:35:21 -08:00
Jesse Zhang 3c7b4c40af [staging] CI reports for staging and stager
- Adds ci_reporter to the test group of the two bundles
  - Removes leftover code for gemspec in staging Rakefile
  - Vendors ci_reporter and its dependencies
  - Shortens the env var names it detects

  Test plans: pass unit tests locally and in jenkins

  Next steps: coverage

Change-Id: Ib75994ad4be766a69436116fd6f9fe86373d65ff
2012-03-01 16:01:29 -08:00
Ken Robertson 0f1cdf53b3 Added Rack framework support
Change-Id: If6e06ee705756ae66b13276c2fbc227f2c055ef0
2012-02-29 08:52:23 -08:00
Jesse Zhang 99c8252c5a [staging] Do not assume Sinatra and Rails support
Only check ruby runtimes for Sinatra and Rails when they are
supported. So that we can create a minimal set of staging plugin
manifests in stager functional tests.

Change-Id: I847349a09283fb58d22b52988583911af0d66fe6
2012-02-22 22:28:31 -08:00
Maria Shaldybina 9e397681d4 node debugging mode (Martin Lippert)
Change-Id: I96a793b2ae280a90d51e11532c44b62709606c65
2012-02-28 15:32:35 -08:00
Patrick Bozeman b2c85f5b5a fix for staging gemspecs with utf8 chars in them
Change-Id: I56ebfa5955bc873d05527080a77d0a2bb34243b8
2012-02-24 11:48:49 -08:00
Jennifer Hickey 1d72b48eec Ruby auto-reconfiguration
- Sinatra - At staging, add a wrapper script to user's app that does a
"require cfautoconfig" and then a require of the user's script to
execute as expected.

- Rails - At staging, add a "01-auto_stage.rb" script to config/initializers
(using 01 is the Rails recommended approach for getting your initializer to
run first). This script does a single "require cfautoconfig"
which ensures that Around Alias is introduced before users initialize Mongo,
Redis, etc in additional initializer scripts

- Bundler Support - At staging, add the cf-autoconfig gem to the app's gems
and append the line ("gem cf-autoconfig") to the app's Gemfile.

- Opt-out: Both staging plugins will skip the all autoconfig steps if they
find a file called config/cloudfoundry.yml in user's app,
and it has "autoconfig: false" or if the app Gemfile includes 'cf-runtime'.

Change-Id: I509bd2e200afe460c3f03d70bdc4083a8a69e009
2012-02-22 11:27:37 -08:00
Patrick Bozeman fc759d6fe3 staging gem bumped to 0.1.13 with vcap_common 1.0.8
Change-Id: I2467854b51376fb2964dededee3323dbcbdd4045
2012-02-16 22:02:10 -08:00
Patrick Bozeman cb490470a1 Revert "bump vcap_common to 1.0.7 in the staging gem"
This reverts commit 362cf0b2a8.

Change-Id: Ic969c5acde12905f28d40747f0cd982f63085937
2012-02-06 14:12:14 -08:00
Patrick Bozeman 362cf0b2a8 bump vcap_common to 1.0.7 in the staging gem
Change-Id: I939119535770d5a8c11789dd6186d3978820fe2d
2012-02-06 11:30:41 -08:00
Jennifer Hickey 9dd141ebea Fix rails deployment on new stager
- Add new uuidtools dependency to stager bundle

- Update minimal uuidtools version for consistency with cc

Change-Id: I3c63c6fde3e7ed42b82d0ee1f276f16a568bbea3
2012-02-03 12:12:05 -08:00
Nicholas Kushmerick 122a0b912e Merge branch 'services-r7'
Bump version of vcap_{common,staging} gems

Conflicts:
	cloud_controller/vendor/cache/vcap_common-1.0.4.gem
	health_manager/Gemfile
	health_manager/Gemfile.lock
	health_manager/vendor/cache/vcap_common-1.0.4.gem
	package_cache/Gemfile
	package_cache/Gemfile.lock
	package_cache_client/vendor/cache/vcap_common-1.0.3.gem
	staging/Gemfile.lock
	staging/vcap_staging.gemspec

Change-Id: I965209a184ac06319ac23f490fba9069e5defa8f
2012-02-01 09:47:21 -08:00
Jennifer Hickey 564a744c73 Add rails console support
Change-Id: Icc15b46121f903780673467e195c1cfca88a74f9
2012-01-31 13:26:33 -08:00
Alex Suraci c4bfa24251 bump node to 0.6.8, vcap_staging to 0.1.35
Change-Id: I0ea28c757c23eb800df8700dc9e6ecaeb5e0bcc3
2012-01-25 11:14:07 -08:00
Alex Suraci cafaf70b4e use package.json for determining node startup command
Change-Id: Ibe9c22d24e6e46def1c9bd87c87f1e58c5dbc62a
2012-01-20 14:33:12 -08:00
Alex Suraci fd79088d1d add node06 runtime with Node.js 0.6.7
* add node06 alongside node (0.4.12)
* update node cookbooks to install both, + terminology tweaks
  * nodejs -> node or node04 where appropriate
* bump vcap_staging to 0.1.33

Change-Id: Ifaf0b7233c8f58cea49d15d4bb357a3fc79f612b
2012-01-18 11:29:50 -08:00
felixhoo 8e271367fe Rebuild vcap_common gem for nats update
Change-Id: Iad190ced66d49172a6a1e00b31d8299bb637cf76
2012-01-04 21:16:26 -08:00
Jesse Zhang d0a47d707f Load Erlang path from manifest
Instead of hardcoding it.
  Bumped gem versions and vendored into stager and cc.
  Cascade the bump to stager and vendor that to cc
  Passed the erlang BVT.
  Shorter first-line commit message

Change-Id: I32672737bc23b1266e08cb9d431f53b9ac929b90
2012-01-04 17:11:12 -08:00
Patrick Bozeman 40ed188c3e update staging to latest gems
including:
* vcap_common 1.0.3
* nats 0.4.22.beta.4
* thin 1.3.1

Change-Id: Id84d2e04537ecf096152836295ba386afa6b2b3a
2012-01-04 11:25:20 -08:00
Patrick Bozeman a717f16c36 add .gitignore for the staging gem
Change-Id: Icda7e2052204630f5815866043118cb16f6bd8ed
2012-01-03 14:06:02 -08:00
Alex Suraci 5b5e07f5bf update rails3 staging plugin for rails 3.1
Change-Id: Ia95d93a50eb2ad8f71cec7218e65ccdac56dd027
2011-12-19 16:08:07 -08:00
AB Srinivasan 85e0eabd3b Upgrade Node to v0.4.12.
Change-Id: I7d9d67b30acab80b0b36f221c4f4d1aa65ffff3e
2011-12-16 09:18:13 -08:00
Patrick Bozeman dd3333832e vendor vcap_common in all core components
* stop requring it via :path ../common
* includes a dependency on em.0.12.11.cf.3 with a fixed up
gemspec to avoid the syck::defaultkey issue.
* bump staging and stager gems after taking new dependencies
* lock 3rd party gems to minor versions in the Gemfiles

Change-Id: I92648154036f8771400578a2ac14904c2c179d6c
2011-12-13 15:08:22 -08:00
AB Srinivasan cc1758d124 Update Tomcat to v6.0.35.
Change-Id: I2f5d68d916612e3efde3e6e29923a7bff3367527
2011-12-11 21:09:56 -08:00
Eduardo Aceituno 2b56b7f1e4 homogenize start/stop generator script
Conflicts:
	cloud_controller/app/models/app.rb
	cloud_controller/staging/common.rb
	dea/config/dea.yml
	docs/php.md

Conflicts:
	cloud_controller/Gemfile.lock
	cloud_controller/vendor/cache/vcap_staging-0.1.2.gem
	staging/lib/vcap/staging/plugin/common.rb
	staging/lib/vcap/staging/version.rb
	staging/spec/unit/spring_spec.rb

Change-Id: Ia8a1d138bb5961f501b195f9bb6dcfe26d8ba93d
2011-11-08 11:52:36 -08:00
Jennifer Hickey 91a1d6cf68 Bump auto-reconfiguration version to 0.6.2
- Combines auto-reconfig modules
- Fixes issues resulting from premature instantiation
of FactoryBeans

Change-Id: Ice18882a4d0df146e9456824880ca5e2c6915c7a
2011-10-10 17:15:25 -07:00