brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [9/9] incubator-brooklyn git commit: This closes #373
Date Mon, 15 Dec 2014 16:57:36 GMT
This closes #373


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

Branch: refs/heads/master
Commit: b3cea88cf693c6ed77afd82050e9ae3cf9ec588c
Parents: dd716b3 0b40243
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Mon Dec 15 16:57:13 2014 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Mon Dec 15 16:57:13 2014 +0000

----------------------------------------------------------------------
 .../brooklyn/entity/proxying/EntitySpec.java    |  4 +-
 .../brooklyn/entity/basic/AbstractEntity.java   |  5 +-
 .../brooklyn/entity/basic/EntityPredicates.java |  2 +-
 .../entity/proxying/InternalEntityFactory.java  |  7 --
 .../event/feed/AttributePollHandler.java        | 12 ++-
 .../main/java/brooklyn/event/feed/Poller.java   |  2 -
 .../java/brooklyn/event/feed/http/HttpFeed.java |  2 +-
 .../event/feed/http/HttpPollConfig.java         | 15 +---
 .../java/brooklyn/util/flags/FlagUtils.java     |  7 +-
 .../main/java/brooklyn/util/http/HttpTool.java  | 17 ++++
 .../entity/proxy/AbstractController.java        |  2 +-
 .../entity/proxy/AbstractControllerImpl.java    | 21 +++--
 .../brooklyn/entity/proxy/LoadBalancer.java     |  9 +-
 .../brooklyn/entity/proxy/ProxySslConfig.java   | 28 ++++--
 .../entity/proxy/nginx/NginxController.java     |  5 ++
 .../entity/proxy/nginx/NginxControllerImpl.java | 45 ++++++++--
 .../entity/proxy/nginx/NginxSshDriver.java      | 31 +++++--
 .../brooklyn/entity/proxy/nginx/UrlMapping.java |  1 -
 .../entity/proxy/ProxySslConfigTest.java        | 60 +++++++++++++
 .../nginx/NginxHttpsSslIntegrationTest.java     | 60 ++++++++++++-
 .../camp/brooklyn/BrooklynCampPlatform.java     |  1 +
 .../lookup/AbstractTemplateBrooklynLookup.java  |  1 -
 .../camp/brooklyn/MapReferenceYamlTest.java     |  6 +-
 .../brooklyn/camp/brooklyn/ObjectsYamlTest.java |  6 +-
 usage/launcher/src/test/resources/nginx.yaml    | 27 ++++++
 usage/launcher/src/test/resources/web.yaml      |  2 +-
 .../qa/load/SimulatedNginxControllerImpl.java   |  5 +-
 .../java/brooklyn/rest/api/EntityConfigApi.java | 19 +++-
 .../main/java/brooklyn/rest/api/SensorApi.java  | 15 ++++
 .../rest/resources/EntityConfigResource.java    | 27 +++++-
 .../brooklyn/rest/resources/SensorResource.java | 21 +++++
 .../resources/EntityConfigResourceTest.java     | 93 ++++++++++++++++----
 .../rest/resources/SensorResourceTest.java      | 16 ++++
 33 files changed, 469 insertions(+), 105 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b3cea88c/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b3cea88c/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
----------------------------------------------------------------------


Mime
View raw message