Merge branch 'master' into simplecommand
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4a37d079 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4a37d079 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4a37d079 Branch: refs/heads/master Commit: 4a37d07927a292ea6317035c9e450b57bfb6a72a Parents: ad75606 15faad3 Author: Geoff Macartney <[email protected]> Authored: Mon Nov 23 11:55:15 2015 +0000 Committer: Geoff Macartney <[email protected]> Committed: Mon Nov 23 11:55:15 2015 +0000 ---------------------------------------------------------------------- .../brooklyn/api/catalog/CatalogItem.java | 28 +- .../apache/brooklyn/api/entity/EntitySpec.java | 93 -- .../internal/AbstractBrooklynObjectSpec.java | 100 +- .../brooklyn/api/location/LocationSpec.java | 78 +- .../BrooklynClassLoadingContext.java | 50 + .../api/mgmt/rebind/RebindExceptionHandler.java | 4 + .../apache/brooklyn/api/policy/PolicySpec.java | 75 - .../brooklyn/api/sensor/EnricherSpec.java | 75 +- .../api/typereg/BrooklynTypeRegistry.java | 32 +- .../brooklyn/api/typereg/RegisteredType.java | 45 +- .../api/typereg/RegisteredTypeConstraint.java | 45 - .../typereg/RegisteredTypeLoadingContext.java | 50 + 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 +- .../catalog/internal/BasicBrooklynCatalog.java | 73 +- .../catalog/internal/CatalogClasspathDo.java | 8 - .../catalog/internal/CatalogItemBuilder.java | 54 +- .../core/catalog/internal/CatalogItemDo.java | 5 - .../internal/CatalogItemDtoAbstract.java | 24 +- .../core/catalog/internal/CatalogUtils.java | 33 +- .../vault/VaultExternalConfigSupplier.java | 22 +- .../org/apache/brooklyn/core/feed/Poller.java | 9 +- .../core/location/CatalogLocationResolver.java | 3 +- .../core/mgmt/EntityManagementUtils.java | 17 +- .../AbstractBrooklynClassLoadingContext.java | 5 +- .../BrooklynClassLoadingContext.java | 30 +- .../BrooklynClassLoadingContextSequential.java | 1 + ...ssLoaderFromBrooklynClassLoadingContext.java | 2 + .../mgmt/ha/HighAvailabilityManagerImpl.java | 2 +- .../internal/AbstractManagementContext.java | 2 +- .../mgmt/internal/EntityManagementSupport.java | 10 +- .../core/mgmt/persist/XmlMementoSerializer.java | 2 +- .../mgmt/rebind/BasicEntityRebindSupport.java | 9 +- .../mgmt/rebind/RebindExceptionHandlerImpl.java | 27 + .../core/mgmt/rebind/RebindIteration.java | 2 +- .../core/mgmt/rebind/RebindManagerImpl.java | 8 + .../brooklyn/core/objs/BasicSpecParameter.java | 2 +- .../core/plan/PlanNotRecognizedException.java | 5 + .../brooklyn/core/plan/PlanToSpecFactory.java | 40 +- .../core/plan/PlanToSpecTransformer.java | 3 +- .../entity/AbstractEntitySpecResolver.java | 2 +- .../entity/CatalogEntitySpecResolver.java | 6 +- .../entity/DelegatingEntitySpecResolver.java | 4 +- .../core/resolve/entity/EntitySpecResolver.java | 2 +- .../resolve/entity/JavaEntitySpecResolver.java | 2 +- ...actFormatSpecificTypeImplementationPlan.java | 52 + .../typereg/AbstractTypePlanTransformer.java | 142 ++ .../core/typereg/BasicBrooklynTypeRegistry.java | 126 +- .../core/typereg/BasicRegisteredType.java | 135 ++ .../typereg/BasicTypeImplementationPlan.java | 41 + .../typereg/BrooklynTypePlanTransformer.java | 88 ++ .../JavaClassNameTypePlanTransformer.java | 91 ++ .../core/typereg/RegisteredTypeConstraints.java | 156 -- .../core/typereg/RegisteredTypeKindVisitor.java | 45 + .../typereg/RegisteredTypeLoadingContexts.java | 236 +++ .../core/typereg/RegisteredTypePredicates.java | 28 +- .../brooklyn/core/typereg/RegisteredTypes.java | 389 +++-- .../core/typereg/TypePlanTransformers.java | 165 ++ .../typereg/UnsupportedTypePlanException.java | 37 + .../location/ssh/SshMachineLocation.java | 43 +- .../brooklyn/util/core/ResourcePredicates.java | 11 + .../brooklyn/util/core/ResourceUtils.java | 6 +- .../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 +- ...lyn.core.typereg.BrooklynTypePlanTransformer | 19 + .../policy/basic/AbstractEntityAdjunctTest.java | 52 - .../internal/SpecParameterInMetaTest.java | 139 -- .../internal/StaticTypePlanTransformer.java | 124 ++ .../internal/StaticTypePlanTransformerTest.java | 63 + .../catalog/internal/TestToSpecTransformer.java | 118 -- .../apache/brooklyn/core/feed/PollerTest.java | 191 ++- .../FileBasedStoreObjectAccessorWriterTest.java | 18 - .../core/objs/AbstractEntityAdjunctTest.java | 52 + .../objs/BasicSpecParameterFromListTest.java | 2 +- .../core/plan/XmlPlanToSpecTransformer.java | 5 +- .../core/plan/XmlPlanToSpecTransformerTest.java | 2 + .../brooklyn/core/sensor/StaticSensorTest.java | 8 +- .../core/test/BrooklynAppLiveTestSupport.java | 26 +- .../core/test/BrooklynAppUnitTestSupport.java | 38 +- .../core/test/BrooklynMgmtUnitTestSupport.java | 61 + .../core/test/entity/TestEntityImpl.java | 1 - .../qa/performance/AbstractPerformanceTest.java | 47 +- .../qa/performance/EntityPerformanceTest.java | 84 +- .../FilePersistencePerformanceTest.java | 146 +- .../GroovyYardStickPerformanceTest.groovy | 7 +- .../JavaYardStickPerformanceTest.java | 35 +- .../SubscriptionPerformanceTest.java | 58 +- .../qa/performance/TaskPerformanceTest.java | 63 +- .../typereg/ExampleXmlTypePlanTransformer.java | 140 ++ .../ExampleXmlTypePlanTransformerTest.java | 67 + .../JavaClassNameTypePlanTransformerTest.java | 90 ++ .../ssh/SshMachineLocationSshToolTest.java | 47 +- .../location/ssh/SshMachineLocationTest.java | 4 +- .../core/internal/ssh/RecordingSshTool.java | 7 + .../util/core/task/ScheduledExecutionTest.java | 48 +- ...che.brooklyn.core.plan.PlanToSpecTransformer | 19 - docs/guide/index.md | 1 + docs/guide/misc/release-notes.md | 51 +- docs/guide/ops/catalog/index.md | 25 - docs/guide/ops/persistence/index.md | 2 + docs/guide/start/concept-quickstart.md | 5 +- docs/guide/start/index.md | 3 +- docs/guide/start/running.md | 2 + docs/guide/test/entities.md | 143 ++ docs/guide/test/index.md | 8 + docs/guide/yaml/yaml-reference.md | 35 +- docs/website/documentation/faq.md | 28 + docs/website/index.md | 2 +- .../demo/WebClusterDatabaseExampleApp.java | 18 +- .../features/src/main/history/dependencies.xml | 6 +- .../location/jclouds/BrooklynImageChooser.java | 2 +- .../location/jclouds/JcloudsLocation.java | 226 +-- .../brooklyn/location/jclouds/JcloudsUtil.java | 50 +- .../BlobStorePersistencePerformanceTest.java | 39 +- .../jclouds/AbstractJcloudsLiveTest.java | 4 + .../location/jclouds/JcloudsLoginLiveTest.java | 126 +- parent/pom.xml | 34 +- pom.xml | 6 +- .../entity/resolve/ChefEntitySpecResolver.java | 2 +- .../HardcodedCatalogEntitySpecResolver.java | 2 +- .../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 +- .../api/AssemblyTemplateSpecInstantiator.java | 7 +- .../BrooklynAssemblyTemplateInstantiator.java | 13 +- .../BrooklynComponentTemplateResolver.java | 2 +- .../BrooklynEntityDecorationResolver.java | 5 +- .../spi/creation/BrooklynEntityMatcher.java | 2 +- .../creation/BrooklynYamlTypeInstantiator.java | 2 +- .../brooklyn/spi/creation/CampCatalogUtils.java | 54 +- .../spi/creation/CampInternalUtils.java | 247 +++ .../brooklyn/spi/creation/CampResolver.java | 147 ++ .../spi/creation/CampToSpecTransformer.java | 17 +- .../spi/creation/CampTypePlanTransformer.java | 98 ++ .../camp/brooklyn/spi/creation/CampUtils.java | 267 ---- .../service/ServiceTypeResolverAdaptor.java | 2 +- .../service/UrlServiceSpecResolver.java | 20 +- ...lyn.core.typereg.BrooklynTypePlanTransformer | 19 + .../camp/brooklyn/AbstractYamlTest.java | 39 +- .../BrooklynYamlTypeInstantiatorTest.java | 2 +- .../camp/brooklyn/DslAndRebindYamlTest.java | 3 +- .../camp/brooklyn/EntitiesYamlTest.java | 2 + .../camp/brooklyn/LocationsYamlTest.java | 4 +- .../camp/brooklyn/ReferencedYamlTest.java | 1 + .../CatalogOsgiVersionMoreEntityTest.java | 18 +- .../brooklyn/catalog/CatalogParametersTest.java | 317 ---- .../catalog/CatalogYamlLocationTest.java | 3 +- .../catalog/SpecParameterParsingTest.java | 156 ++ .../catalog/SpecParameterUnwrappingTest.java | 379 +++++ .../brooklyn/test/lite/CampYamlLiteTest.java | 6 +- .../test/lite/TestAppAssemblyInstantiator.java | 10 +- usage/dist/licensing/overrides.yaml | 96 +- usage/dist/src/main/license/files/LICENSE | 92 +- 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 - .../assets/js/view/application-add-wizard.js | 11 +- .../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 +- .../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 | 9 +- .../apache/brooklyn/rest/BrooklynRestApi.java | 4 +- .../brooklyn/rest/filter/SwaggerFilter.java | 76 + .../brooklyn/rest/resources/ApidocResource.java | 10 +- .../rest/resources/ApplicationResource.java | 14 +- .../rest/resources/CatalogResource.java | 5 +- .../rest/transform/CatalogTransformer.java | 5 +- .../rest/util/BrooklynRestResourceUtils.java | 2 +- .../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/README.md | 129 -- .../brooklyn/test/framework/BaseTest.java | 8 +- .../test/framework/ParallelTestCaseImpl.java | 41 +- .../test/framework/TestFrameworkAssertions.java | 160 ++ .../brooklyn/test/framework/TestHttpCall.java | 16 + .../test/framework/TestHttpCallImpl.java | 72 +- .../brooklyn/test/framework/TestSensorImpl.java | 73 +- .../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/test/PerformanceTestUtils.java | 82 +- .../test/performance/FilePersister.java | 85 ++ .../brooklyn/test/performance/Histogram.java | 89 ++ .../performance/MeasurementResultPersister.java | 29 + .../test/performance/PerformanceMeasurer.java | 156 ++ .../performance/PerformanceTestDescriptor.java | 208 +++ .../test/performance/PerformanceTestResult.java | 62 + .../test/performance/PerformanceTestUtils.java | 107 ++ .../exceptions/PropagatedRuntimeException.java | 6 + .../apache/brooklyn/util/net/Networking.java | 7 + .../util/net/ReachableSocketFinder.java | 154 ++ .../apache/brooklyn/util/text/Identifiers.java | 13 +- .../brooklyn/util/net/NetworkingUtilsTest.java | 9 +- .../util/net/ReachableSocketFinderTest.java | 165 ++ .../brooklyn/util/text/IdentifiersTest.java | 13 + 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 + .../osgi/more-entities-v2-evil-twin/pom.xml | 2 +- .../dependencies/osgi/more-entities-v2/pom.xml | 4 +- .../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 15745 -> 15646 bytes ...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 13922 -> 13811 bytes 292 files changed, 13212 insertions(+), 6403 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4a37d079/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java ---------------------------------------------------------------------- diff --cc usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java index 4043bcc,f458018..19043e7 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java @@@ -18,9 -18,8 +18,9 @@@ */ package org.apache.brooklyn.test.framework; - import com.google.common.collect.Maps; + import com.google.common.reflect.TypeToken; import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.mgmt.ExecutionContext; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.trait.Startable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4a37d079/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4a37d079/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.java ----------------------------------------------------------------------
