Merge branch 'master' into api-tags-support # Conflicts: # usage/rest-server/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d6eada11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d6eada11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d6eada11 Branch: refs/heads/master Commit: d6eada11975190d44c116bbcc16329aaadae7cca Parents: d611588 7087b1a Author: Sam Corbett <[email protected]> Authored: Tue Nov 24 12:10:46 2015 +0000 Committer: Sam Corbett <[email protected]> Committed: Tue Nov 24 12:10:46 2015 +0000 ---------------------------------------------------------------------- DISCLAIMER | 8 - README.md | 6 +- .../apache/brooklyn/api/entity/EntitySpec.java | 13 +- camp/camp-server/pom.xml | 6 - .../server/dto/ApplicationComponentDto.java | 4 - .../dto/ApplicationComponentTemplateDto.java | 4 - .../brooklyn/camp/server/dto/AssemblyDto.java | 4 - .../camp/server/dto/AssemblyTemplateDto.java | 4 - .../camp/server/dto/PlatformComponentDto.java | 4 - .../dto/PlatformComponentTemplateDto.java | 4 - .../brooklyn/camp/server/dto/PlatformDto.java | 4 - .../camp/server/rest/CampRestResources.java | 10 +- .../rest/resource/ApidocRestResource.java | 6 +- .../ApplicationComponentRestResource.java | 10 +- ...pplicationComponentTemplateRestResource.java | 10 +- .../rest/resource/AssemblyRestResource.java | 10 +- .../resource/AssemblyTemplateRestResource.java | 10 +- .../resource/PlatformComponentRestResource.java | 10 +- .../PlatformComponentTemplateRestResource.java | 10 +- .../rest/resource/PlatformRestResource.java | 8 +- .../org/apache/brooklyn/core/feed/Poller.java | 9 +- .../core/internal/BrooklynProperties.java | 3 +- .../brooklyn/core/location/PortRanges.java | 28 +- .../mgmt/ha/HighAvailabilityManagerImpl.java | 2 +- .../mgmt/internal/EntityManagementSupport.java | 10 +- .../location/ssh/SshMachineLocation.java | 41 +- .../brooklyn/util/core/ResourcePredicates.java | 11 + .../brooklyn/util/core/ResourceUtils.java | 3 +- .../brooklyn/util/core/http/HttpTool.java | 63 +- .../util/core/http/HttpToolResponse.java | 14 +- .../util/core/task/BasicExecutionManager.java | 50 +- .../brooklyn/util/core/task/ScheduledTask.java | 54 +- .../brooklyn/util/core/task/ssh/SshTasks.java | 5 + .../brooklyn/core/entity/EntitySpecTest.java | 69 +- .../apache/brooklyn/core/feed/PollerTest.java | 191 ++- .../brooklyn/core/location/PortRangesTest.java | 4 +- .../RebindManagerExceptionHandlerTest.java | 86 ++ .../ssh/SshMachineLocationSshToolTest.java | 47 +- .../location/ssh/SshMachineLocationTest.java | 4 +- .../core/internal/ssh/RecordingSshTool.java | 7 + .../util/core/task/ScheduledExecutionTest.java | 48 +- docs/README.md | 6 +- docs/_build/config-production.yml | 4 +- docs/_includes/footer.html | 6 +- docs/_layouts/website-landing.html | 7 - docs/guide/dev/index.md | 2 +- docs/guide/misc/release-notes.md | 51 +- docs/guide/start/_my-web-cluster.yaml | 5 +- docs/guide/start/concept-quickstart.md | 5 +- docs/guide/start/index.md | 3 +- docs/guide/start/running.md | 2 + docs/guide/yaml/index.md | 1 + .../entities/paralleltestcase-entity.yaml | 6 + .../example_yaml/entities/testcase-entity.yaml | 6 + .../entities/testeffector-entity.yaml | 8 + .../entities/testhttpcall-entity.yaml | 7 + .../entities/testsensor-entity.yaml | 7 + .../testcases/effector-test-snippet.yaml | 28 + .../testcases/getting-started-test-example.yaml | 71 + .../testcases/http-test-snippet.yaml | 20 + .../testcases/sensor-test-snippet.yaml | 7 + .../getting-started-blueprint-test-large.png | Bin 0 -> 156553 bytes .../images/getting-started-blueprint-test.png | Bin 0 -> 84906 bytes docs/guide/yaml/test/index.md | 24 + docs/guide/yaml/test/test-entities.md | 85 ++ docs/guide/yaml/test/usage-examples.md | 58 + .../website/community/how-to-contribute-docs.md | 4 +- .../committers/release-process/announce.md | 8 +- docs/website/index.md | 2 +- docs/website/learnmore/catalog/index.html | 2 +- .../demo/WebClusterDatabaseExampleApp.java | 18 +- .../features/src/main/history/dependencies.xml | 6 +- .../location/jclouds/BrooklynImageChooser.java | 2 +- .../location/jclouds/JcloudsLocation.java | 64 +- .../location/jclouds/JcloudsLocationTest.java | 140 +- parent/pom.xml | 40 +- pom.xml | 7 +- .../base/AbstractSoftwareProcessDriver.java | 2 +- .../brooklyn/entity/java/JavaOptsTest.java | 4 +- .../entity/software/base/EntitySshToolTest.java | 8 +- .../nosql/couchbase/CouchbaseNodeImpl.java | 3 +- .../nosql/elasticsearch/ElasticSearchNode.java | 29 +- .../nosql/mongodb/AbstractMongoDBServer.java | 14 +- .../brooklyn/entity/nosql/redis/RedisStore.java | 10 +- .../entity/nosql/redis/RedisStoreImpl.java | 2 +- .../entity/webapp/jboss/JBoss7Server.java | 14 +- .../entity/webapp/tomcat/TomcatServer.java | 19 +- .../camp/brooklyn/DslAndRebindYamlTest.java | 3 +- usage/dist/licensing/overrides.yaml | 52 +- usage/jsgui/pom.xml | 9 +- usage/jsgui/src/main/license/files/LICENSE | 54 +- .../src/main/license/source-inclusions.yaml | 1 + .../src/main/webapp/assets/html/swagger-ui.html | 78 + .../main/webapp/assets/js/libs/swagger-ui.js | 1410 ------------------ .../src/main/webapp/assets/js/libs/swagger.js | 708 --------- usage/jsgui/src/main/webapp/assets/js/router.js | 16 +- .../src/main/webapp/assets/js/view/apidoc.js | 82 - .../webapp/assets/js/view/entity-details.js | 2 +- .../main/webapp/assets/swagger-ui/css/print.css | 1195 +++++++++++++++ .../main/webapp/assets/swagger-ui/css/reset.css | 144 ++ .../webapp/assets/swagger-ui/css/screen.css | 1301 ++++++++++++++++ .../main/webapp/assets/swagger-ui/css/style.css | 269 ++++ .../webapp/assets/swagger-ui/css/typography.css | 45 + .../fonts/droid-sans-v6-latin-700.eot | Bin 0 -> 22922 bytes .../fonts/droid-sans-v6-latin-700.svg | 411 +++++ .../fonts/droid-sans-v6-latin-700.ttf | Bin 0 -> 40513 bytes .../fonts/droid-sans-v6-latin-700.woff | Bin 0 -> 25992 bytes .../fonts/droid-sans-v6-latin-700.woff2 | Bin 0 -> 11480 bytes .../fonts/droid-sans-v6-latin-regular.eot | Bin 0 -> 22008 bytes .../fonts/droid-sans-v6-latin-regular.svg | 403 +++++ .../fonts/droid-sans-v6-latin-regular.ttf | Bin 0 -> 39069 bytes .../fonts/droid-sans-v6-latin-regular.woff | Bin 0 -> 24868 bytes .../fonts/droid-sans-v6-latin-regular.woff2 | Bin 0 -> 11304 bytes .../assets/swagger-ui/images/explorer_icons.png | Bin 0 -> 5763 bytes .../assets/swagger-ui/images/pet_store_api.png | Bin 0 -> 824 bytes .../assets/swagger-ui/images/throbber.gif | Bin 0 -> 9257 bytes .../assets/swagger-ui/images/wordnik_api.png | Bin 0 -> 980 bytes .../assets/swagger-ui/lib/backbone-min.js | 34 + .../assets/swagger-ui/lib/handlebars-2.0.0.js | 20 + .../assets/swagger-ui/lib/jquery-1.8.0.min.js | 21 + .../assets/swagger-ui/lib/jquery.ba-bbq.min.js | 29 + .../assets/swagger-ui/lib/jquery.wiggle.min.js | 27 + .../main/webapp/assets/swagger-ui/lib/marked.js | 1285 ++++++++++++++++ .../assets/swagger-ui/lib/swagger-ui.min.js | 37 + .../assets/swagger-ui/lib/underscore-min.js | 25 + .../assets/swagger-ui/lib/underscore-min.map | 1 + usage/jsgui/src/main/webapp/index.html | 32 +- .../jsgui/BrooklynJavascriptGuiLauncher.java | 2 +- usage/launcher/pom.xml | 4 + .../brooklyn/launcher/BrooklynWebServer.java | 2 + usage/rest-api/pom.xml | 9 +- .../org/apache/brooklyn/rest/api/AccessApi.java | 10 +- .../apache/brooklyn/rest/api/ActivityApi.java | 26 +- .../brooklyn/rest/api/ApplicationApi.java | 68 +- .../apache/brooklyn/rest/api/CatalogApi.java | 132 +- .../apache/brooklyn/rest/api/EffectorApi.java | 24 +- .../org/apache/brooklyn/rest/api/EntityApi.java | 72 +- .../brooklyn/rest/api/EntityConfigApi.java | 40 +- .../apache/brooklyn/rest/api/LocationApi.java | 18 +- .../org/apache/brooklyn/rest/api/PolicyApi.java | 42 +- .../brooklyn/rest/api/PolicyConfigApi.java | 34 +- .../org/apache/brooklyn/rest/api/ScriptApi.java | 10 +- .../org/apache/brooklyn/rest/api/SensorApi.java | 44 +- .../org/apache/brooklyn/rest/api/ServerApi.java | 31 +- .../org/apache/brooklyn/rest/api/UsageApi.java | 34 +- .../apache/brooklyn/rest/api/VersionApi.java | 9 +- usage/rest-api/src/main/webapp/WEB-INF/web.xml | 10 +- usage/rest-client/pom.xml | 57 +- .../brooklyn/rest/client/BrooklynApi.java | 5 +- usage/rest-server/pom.xml | 8 +- .../apache/brooklyn/rest/BrooklynRestApi.java | 4 +- .../brooklyn/rest/filter/SwaggerFilter.java | 76 + .../brooklyn/rest/resources/ApidocResource.java | 10 +- .../rest-server/src/main/webapp/WEB-INF/web.xml | 13 +- .../brooklyn/rest/BrooklynRestApiLauncher.java | 4 +- .../rest/resources/ApiDocResourceTest.java | 138 -- .../rest/resources/ApidocResourceTest.java | 177 +++ .../rest/testing/BrooklynRestApiTest.java | 31 +- .../rest/util/NullServletConfigProvider.java | 5 + usage/test-framework/pom.xml | 6 + .../brooklyn/test/framework/AbstractTest.java | 28 +- .../brooklyn/test/framework/BaseTest.java | 10 +- .../test/framework/SimpleShellCommandTest.java | 107 ++ .../framework/SimpleShellCommandTestImpl.java | 316 ++++ .../brooklyn/test/framework/TestEffector.java | 1 + .../test/framework/TestFrameworkAssertions.java | 160 ++ .../brooklyn/test/framework/TestHttpCall.java | 16 + .../test/framework/TestHttpCallImpl.java | 74 +- .../brooklyn/test/framework/TestSensorImpl.java | 75 +- .../SimpleShellCommandIntegrationTest.java | 211 +++ .../test/framework/TestEffectorTest.java | 3 +- .../framework/TestFrameworkAssertionsTest.java | 135 ++ .../test/framework/TestHttpCallTest.java | 121 ++ .../brooklyn/test/framework/TestSensorTest.java | 48 +- .../example-catalog-test.bom | 2 +- .../nginx-test-examples.yml | 21 +- .../testhttpcall-examples.yml | 27 +- .../tomcat-test-examples.yml | 8 +- .../brooklyn/util/text/StringEscapes.java | 2 +- utils/rest-swagger/pom.xml | 33 +- .../rest/apidoc/ApiListingResource.java | 259 ++++ .../org/apache/brooklyn/rest/apidoc/Apidoc.java | 33 - .../brooklyn/rest/apidoc/ApidocEndpoint.java | 54 - .../apidoc/ApidocHelpMessageBodyWriter.java | 28 - .../brooklyn/rest/apidoc/ApidocResource.java | 291 ---- .../apache/brooklyn/rest/apidoc/ApidocRoot.java | 47 - .../rest/apidoc/RestApiResourceScanner.java | 81 + 187 files changed, 8867 insertions(+), 3884 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d6eada11/usage/rest-server/pom.xml ---------------------------------------------------------------------- diff --cc usage/rest-server/pom.xml index d021f13,251c6fb..9028007 --- a/usage/rest-server/pom.xml +++ b/usage/rest-server/pom.xml @@@ -232,10 -228,8 +228,14 @@@ <scope>test</scope> </dependency> <dependency> + <groupId>com.sun.jersey.jersey-test-framework</groupId> + <artifactId>jersey-test-framework-grizzly2</artifactId> ++ </dependency> ++ <dependency> + <groupId>org.apache.brooklyn</groupId> + <artifactId>brooklyn-rt-osgi</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> <scope>test</scope> </dependency> </dependencies>
