You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/11/25 02:55:25 UTC
[15/21] incubator-brooklyn git commit: Sync with branch 'master'
Sync with branch 'master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/640a0b28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/640a0b28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/640a0b28
Branch: refs/heads/master
Commit: 640a0b28da2f1279ea96400a9f09183a20f66350
Parents: 9602cae 10e9a3c
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Sun Nov 22 02:38:17 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Sun Nov 22 02:38:17 2015 +0200
----------------------------------------------------------------------
.../brooklyn/api/catalog/CatalogItem.java | 28 +-
.../apache/brooklyn/api/entity/EntitySpec.java | 93 --
.../internal/AbstractBrooklynObjectSpec.java | 100 +-
.../apache/brooklyn/api/location/Location.java | 3 +-
.../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 +
.../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 +-
.../apache/brooklyn/core/config/ConfigKeys.java | 8 +
.../vault/VaultExternalConfigSupplier.java | 22 +-
.../core/entity/BrooklynConfigKeys.java | 12 +-
.../org/apache/brooklyn/core/feed/Poller.java | 9 +-
.../core/location/AbstractLocation.java | 2 -
.../AggregatingMachineProvisioningLocation.java | 2 -
.../core/location/CatalogLocationResolver.java | 3 +-
.../access/PortForwardManagerClient.java | 2 -
.../core/mgmt/EntityManagementUtils.java | 17 +-
.../AbstractBrooklynClassLoadingContext.java | 5 +-
.../BrooklynClassLoadingContext.java | 30 +-
.../BrooklynClassLoadingContextSequential.java | 1 +
...ssLoaderFromBrooklynClassLoadingContext.java | 2 +
.../mgmt/ha/HighAvailabilityManagerImpl.java | 19 +-
.../internal/AbstractManagementContext.java | 2 +-
.../mgmt/internal/EntityManagementSupport.java | 10 +-
.../persist/FileBasedStoreObjectAccessor.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 +-
.../brooklyn/core/sensor/AttributeMap.java | 5 +-
...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 +
.../entity/stock/EffectorStartableImpl.java | 2 -
.../byon/SingleMachineProvisioningLocation.java | 1 -
.../LocalhostMachineProvisioningLocation.java | 6 +-
.../brooklyn/location/multi/MultiLocation.java | 2 -
.../location/ssh/SshMachineLocation.java | 122 +-
.../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/internal/ssh/SshTool.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 +
.../brooklyn/core/config/ConfigKeysTest.java | 21 +-
.../apache/brooklyn/core/feed/PollerTest.java | 191 ++-
.../core/location/AbstractLocationTest.java | 1 -
.../core/location/LocationExtensionsTest.java | 2 -
.../core/location/SimulatedLocation.java | 2 -
.../FileBasedStoreObjectAccessorWriterTest.java | 32 +-
.../core/mgmt/rebind/RebindLocationTest.java | 8 -
.../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 ++
.../SshMachineLocationReuseIntegrationTest.java | 11 +-
.../ssh/SshMachineLocationSshToolTest.java | 131 ++
.../location/ssh/SshMachineLocationTest.java | 27 +-
.../core/internal/ssh/RecordingSshTool.java | 7 +
.../core/task/DynamicSequentialTaskTest.java | 41 +-
.../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 +-
.../location/jclouds/BrooklynImageChooser.java | 2 +-
.../location/jclouds/JcloudsLocation.java | 226 +--
.../jclouds/JcloudsSshMachineLocation.java | 1 -
.../brooklyn/location/jclouds/JcloudsUtil.java | 50 +-
.../BlobStorePersistencePerformanceTest.java | 39 +-
.../jclouds/AbstractJcloudsLiveTest.java | 4 +
.../jclouds/BailOutJcloudsLocation.java | 3 -
.../location/jclouds/JcloudsLoginLiveTest.java | 126 +-
.../policy/jclouds/os/CreateUserPolicyTest.java | 2 -
pom.xml | 4 +-
.../entity/machine/pool/ServerPoolLocation.java | 2 -
.../entity/resolve/ChefEntitySpecResolver.java | 2 +-
.../HardcodedCatalogEntitySpecResolver.java | 2 +-
.../base/AbstractSoftwareProcessDriver.java | 2 +-
.../brooklyn/entity/java/JavaOptsTest.java | 21 +-
.../entity/software/base/EntitySshToolTest.java | 107 ++
.../base/SoftwareProcessEntityRebindTest.java | 2 -
.../base/SoftwareProcessEntityTest.java | 2 -
.../base/lifecycle/StartStopSshDriverTest.java | 4 +-
.../mgmt/usage/LocationUsageTrackingTest.java | 2 -
.../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 +-
.../nginx/NginxRebindWithHaIntegrationTest.java | 9 +-
usage/all/pom.xml | 6 +
.../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 | 318 ----
.../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 +
.../org/apache/brooklyn/rest/api/ServerApi.java | 4 +-
usage/rest-client/pom.xml | 57 +-
.../brooklyn/rest/filter/SwaggerFilter.java | 66 +-
.../rest/resources/ApplicationResource.java | 14 +-
.../rest/resources/CatalogResource.java | 5 +-
.../rest/transform/CatalogTransformer.java | 5 +-
.../rest/util/BrooklynRestResourceUtils.java | 2 +-
.../rest/resources/UsageResourceTest.java | 2 -
usage/test-framework/pom.xml | 90 ++
.../brooklyn/test/framework/AbstractTest.java | 67 +
.../brooklyn/test/framework/BaseTest.java | 63 +
.../test/framework/ParallelTestCase.java | 32 +
.../test/framework/ParallelTestCaseImpl.java | 142 ++
.../brooklyn/test/framework/TestCase.java | 30 +
.../brooklyn/test/framework/TestCaseImpl.java | 79 +
.../brooklyn/test/framework/TestEffector.java | 47 +
.../test/framework/TestEffectorImpl.java | 96 ++
.../brooklyn/test/framework/TestHttpCall.java | 37 +
.../test/framework/TestHttpCallImpl.java | 124 ++
.../brooklyn/test/framework/TestSensor.java | 37 +
.../brooklyn/test/framework/TestSensorImpl.java | 155 ++
.../test/framework/TestEffectorTest.java | 125 ++
.../brooklyn/test/framework/TestSensorTest.java | 286 ++++
.../test/framework/entity/TestEntity.java | 74 +
.../test/framework/entity/TestEntityImpl.java | 59 +
.../resources/test-framework-examples/README.md | 28 +
.../example-catalog-test.bom | 40 +
.../test-framework-examples/example-catalog.bom | 33 +
.../nginx-test-examples.yml | 116 ++
.../testhttpcall-examples.yml | 142 ++
.../tomcat-test-examples.yml | 63 +
.../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 ++
.../brooklyn/util/JavaGroovyEquivalents.java | 9 +-
.../brooklyn/util/exceptions/Exceptions.java | 29 +-
.../exceptions/PropagatedRuntimeException.java | 6 +
.../org/apache/brooklyn/util/io/FileUtil.java | 18 +-
.../apache/brooklyn/util/net/Networking.java | 7 +
.../util/net/ReachableSocketFinder.java | 154 ++
.../apache/brooklyn/util/text/Identifiers.java | 13 +-
.../util/exceptions/ExceptionsTest.java | 22 +
.../brooklyn/util/maven/MavenArtifactTest.java | 10 +-
.../brooklyn/util/net/NetworkingUtilsTest.java | 9 +-
.../util/net/ReachableSocketFinderTest.java | 165 ++
.../brooklyn/util/ssh/IptablesCommandsTest.java | 2 +-
.../brooklyn/util/text/IdentifiersTest.java | 13 +
.../rest/apidoc/RestApiResourceScanner.java | 18 +-
.../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
utils/swagger-annotations/pom.xml | 44 -
.../brooklyn/swagger/annotations/Apidoc.java | 33 -
.../TestResourceUnavailableException.java | 3 +-
288 files changed, 14060 insertions(+), 5252 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java
index ec3f669,002c6b5..0bfa4de
--- a/core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java
+++ b/core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java
@@@ -66,10 -92,10 +92,10 @@@ public class PlanToSpecFactory
}
}
} else {
- result.addAll(getAll());
+ result.addAll(getAll(includeSuperseded));
}
for(PlanToSpecTransformer t : result) {
- t.injectManagementContext(mgmt);
+ t.setManagementContext(mgmt);
}
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/core/src/main/java/org/apache/brooklyn/core/resolve/entity/AbstractEntitySpecResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/core/src/test/java/org/apache/brooklyn/core/plan/XmlPlanToSpecTransformer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampToSpecTransformer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/UrlServiceSpecResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/usage/jsgui/pom.xml
----------------------------------------------------------------------