You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/08/21 18:02:48 UTC

[5/5] git commit: This closes #121

This closes #121


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8257a4ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8257a4ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8257a4ff

Branch: refs/heads/master
Commit: 8257a4fffa55d50b03a19e22b910ce60afce259c
Parents: cc1915a 2f27923
Author: Aled Sage <al...@gmail.com>
Authored: Thu Aug 21 17:02:07 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Aug 21 17:02:07 2014 +0100

----------------------------------------------------------------------
 .../entity/rebind/RebindTestFixture.java        |  20 +-
 .../brooklyn/entity/rebind/RebindTestUtils.java |  18 +-
 .../brooklyn/entity/proxy/ProxySslConfig.java   |  79 +++
 .../nginx/NginxClusterIntegrationTest.java      |  49 +-
 .../nginx/NginxHttpsSslIntegrationTest.groovy   | 171 ------
 .../nginx/NginxHttpsSslIntegrationTest.java     | 182 +++++++
 .../proxy/nginx/NginxIntegrationTest.groovy     | 432 ---------------
 .../proxy/nginx/NginxIntegrationTest.java       | 449 ++++++++++++++++
 .../proxy/nginx/NginxLightIntegrationTest.java  |  21 +-
 .../proxy/nginx/NginxRebindIntegrationTest.java |  58 +-
 .../nginx/NginxUrlMappingIntegrationTest.groovy | 503 ------------------
 .../nginx/NginxUrlMappingIntegrationTest.java   | 525 +++++++++++++++++++
 .../nginx/NginxWebClusterEc2LiveTest.groovy     | 107 ----
 .../proxy/nginx/NginxWebClusterEc2LiveTest.java | 113 ++++
 .../main/java/brooklyn/test/HttpTestUtils.java  | 123 ++++-
 15 files changed, 1521 insertions(+), 1329 deletions(-)
----------------------------------------------------------------------