This closes #789
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f9684737 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f9684737 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f9684737 Branch: refs/heads/master Commit: f968473749e130378039da1b3c36d9fb4620e2fe Parents: a0aaf3c 7023285 Author: Aled Sage <[email protected]> Authored: Wed Aug 5 12:16:43 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Wed Aug 5 12:16:43 2015 +0100 ---------------------------------------------------------------------- .../java/brooklyn/catalog/BrooklynCatalog.java | 158 ------------------- api/src/main/java/brooklyn/catalog/Catalog.java | 42 ----- .../java/brooklyn/catalog/CatalogConfig.java | 38 ----- .../main/java/brooklyn/catalog/CatalogItem.java | 107 ------------- .../entity/rebind/BrooklynObjectType.java | 2 +- .../entity/rebind/RebindExceptionHandler.java | 2 +- .../brooklyn/management/ManagementContext.java | 2 +- .../mementos/BrooklynMementoPersister.java | 2 +- .../brooklyn/mementos/CatalogItemMemento.java | 2 +- .../brooklyn/catalog/BrooklynCatalog.java | 158 +++++++++++++++++++ .../org/apache/brooklyn/catalog/Catalog.java | 42 +++++ .../apache/brooklyn/catalog/CatalogConfig.java | 38 +++++ .../apache/brooklyn/catalog/CatalogItem.java | 107 +++++++++++++ .../src/main/java/brooklyn/BrooklynVersion.java | 2 +- .../brooklyn/catalog/CatalogPredicates.java | 4 +- .../catalog/internal/BasicBrooklynCatalog.java | 8 +- .../catalog/internal/CatalogBundleDto.java | 2 +- .../catalog/internal/CatalogClasspathDo.java | 4 +- .../brooklyn/catalog/internal/CatalogDto.java | 2 +- .../catalog/internal/CatalogInitialization.java | 2 +- .../catalog/internal/CatalogItemBuilder.java | 2 +- .../catalog/internal/CatalogItemComparator.java | 2 +- .../catalog/internal/CatalogItemDo.java | 2 +- .../internal/CatalogItemDtoAbstract.java | 2 +- .../catalog/internal/CatalogLibrariesDo.java | 2 +- .../catalog/internal/CatalogLibrariesDto.java | 2 +- .../brooklyn/catalog/internal/CatalogUtils.java | 6 +- .../rebind/ImmediateDeltaChangeListener.java | 2 +- .../rebind/PeriodicDeltaChangeListener.java | 2 +- .../entity/rebind/RebindContextImpl.java | 2 +- .../rebind/RebindContextLookupContext.java | 2 +- .../rebind/RebindExceptionHandlerImpl.java | 2 +- .../brooklyn/entity/rebind/RebindIteration.java | 4 +- .../rebind/dto/BasicCatalogItemMemento.java | 2 +- .../entity/rebind/dto/MementosGenerators.java | 2 +- .../BrooklynMementoPersisterToObjectStore.java | 2 +- .../persister/BrooklynPersistenceUtils.java | 2 +- .../CatalogItemLibrariesConverter.java | 4 +- .../rebind/persister/XmlMementoSerializer.java | 2 +- .../location/basic/BasicLocationRegistry.java | 4 +- .../location/basic/CatalogLocationResolver.java | 2 +- .../OsgiBrooklynClassLoadingContext.java | 4 +- .../brooklyn/management/ha/OsgiManager.java | 2 +- .../internal/AbstractManagementContext.java | 4 +- .../NonDeploymentManagementContext.java | 2 +- .../src/main/java/brooklyn/util/osgi/Osgis.java | 2 +- .../brooklyn/camp/lite/CampYamlLiteTest.java | 4 +- .../catalog/internal/CatalogDtoTest.java | 2 +- .../internal/CatalogItemComparatorTest.java | 2 +- .../catalog/internal/CatalogLoadTest.java | 2 +- .../catalog/internal/CatalogScanTest.java | 4 +- .../catalog/internal/CatalogTestUtils.java | 2 +- .../catalog/internal/CatalogVersioningTest.java | 4 +- .../catalog/internal/MyCatalogItems.java | 2 +- .../rebind/ActivePartialRebindVersionTest.java | 2 +- .../entity/rebind/RebindCatalogItemTest.java | 4 +- ...talogWhenCatalogPersistenceDisabledTest.java | 2 +- .../entity/rebind/RebindTestFixture.java | 4 +- .../persister/XmlMementoSerializerTest.java | 2 +- .../osgi/OsgiVersionMoreEntityTest.java | 2 +- .../brooklyn/demo/GlobalWebFabricExample.java | 4 +- .../brooklyn/demo/CumulusRDFApplication.java | 4 +- .../demo/HighAvailabilityCassandraCluster.java | 4 +- .../brooklyn/demo/ResilientMongoDbApp.java | 2 +- .../brooklyn/demo/RiakClusterExample.java | 4 +- .../apache/brooklyn/demo/StormSampleApp.java | 2 +- .../brooklyn/demo/WideAreaCassandraCluster.java | 4 +- .../brooklyn/demo/NodeJsTodoApplication.java | 2 +- .../demo/WebClusterDatabaseExampleApp.java | 4 +- .../java/brooklyn/enricher/DeltaEnricher.java | 2 +- .../brooklyn/enricher/RollingMeanEnricher.java | 2 +- .../enricher/TimeFractionDeltaEnricher.java | 2 +- .../policy/autoscaling/AutoScalerPolicy.java | 2 +- .../policy/ha/ConnectionFailureDetector.java | 2 +- .../brooklyn/policy/ha/ServiceReplacer.java | 2 +- .../brooklyn/policy/ha/ServiceRestarter.java | 2 +- .../policy/ha/SshMachineFailureDetector.java | 2 +- .../entity/basic/VanillaSoftwareProcess.java | 2 +- .../brooklynnode/BrooklynEntityMirror.java | 2 +- .../entity/brooklynnode/BrooklynNode.java | 2 +- .../brooklyn/entity/machine/MachineEntity.java | 2 +- .../java/brooklyn/entity/pool/ServerPool.java | 2 +- .../entity/database/mariadb/MariaDbNode.java | 2 +- .../entity/database/mysql/MySqlNode.java | 2 +- .../database/postgresql/PostgreSqlNode.java | 2 +- .../entity/database/rubyrep/RubyRepNode.java | 2 +- .../messaging/activemq/ActiveMQBroker.java | 2 +- .../entity/messaging/kafka/KafkaCluster.java | 2 +- .../entity/messaging/qpid/QpidBroker.java | 2 +- .../entity/messaging/rabbit/RabbitBroker.java | 2 +- .../brooklyn/entity/messaging/storm/Storm.java | 2 +- .../entity/messaging/storm/StormDeployment.java | 2 +- .../entity/zookeeper/ZooKeeperEnsemble.java | 2 +- .../entity/zookeeper/ZooKeeperNode.java | 2 +- .../entity/monitoring/monit/MonitNode.java | 2 +- .../entity/network/bind/BindDnsServer.java | 2 +- .../nosql/cassandra/CassandraDatacenter.java | 2 +- .../entity/nosql/cassandra/CassandraFabric.java | 2 +- .../entity/nosql/cassandra/CassandraNode.java | 2 +- .../nosql/couchbase/CouchbaseCluster.java | 2 +- .../entity/nosql/couchbase/CouchbaseNode.java | 2 +- .../entity/nosql/couchdb/CouchDBNode.java | 2 +- .../elasticsearch/ElasticSearchCluster.java | 2 +- .../nosql/elasticsearch/ElasticSearchNode.java | 2 +- .../entity/nosql/mongodb/MongoDBServer.java | 2 +- .../nosql/mongodb/sharding/MongoDBRouter.java | 2 +- .../sharding/MongoDBShardedDeployment.java | 2 +- .../entity/nosql/redis/RedisCluster.java | 2 +- .../brooklyn/entity/nosql/redis/RedisStore.java | 2 +- .../brooklyn/entity/nosql/riak/RiakCluster.java | 2 +- .../brooklyn/entity/nosql/riak/RiakNode.java | 2 +- .../brooklyn/entity/nosql/solr/SolrServer.java | 2 +- .../entity/osgi/karaf/KarafContainer.java | 2 +- .../entity/proxy/nginx/NginxController.java | 2 +- .../webapp/ControlledDynamicWebAppCluster.java | 2 +- .../entity/webapp/DynamicWebAppCluster.java | 2 +- .../entity/webapp/jboss/JBoss6Server.java | 2 +- .../entity/webapp/jboss/JBoss7Server.java | 2 +- .../entity/webapp/jetty/Jetty6Server.java | 2 +- .../webapp/nodejs/NodeJsWebAppService.java | 2 +- .../entity/webapp/tomcat/Tomcat8Server.java | 2 +- .../entity/webapp/tomcat/TomcatServer.java | 2 +- .../com/acme/sample/brooklyn/SampleMain.java | 2 +- .../app/ClusterWebServerDatabaseSample.java | 4 +- .../BrooklynAssemblyTemplateInstantiator.java | 2 +- .../BrooklynComponentTemplateResolver.java | 2 +- .../BrooklynEntityDecorationResolver.java | 4 +- .../service/BrooklynServiceTypeResolver.java | 2 +- .../service/ChefServiceTypeResolver.java | 2 +- .../creation/service/ServiceTypeResolver.java | 2 +- .../lookup/AbstractTemplateBrooklynLookup.java | 2 +- .../lookup/AssemblyTemplateBrooklynLookup.java | 2 +- ...PlatformComponentTemplateBrooklynLookup.java | 2 +- .../CatalogOsgiVersionMoreEntityTest.java | 12 +- .../brooklyn/catalog/CatalogYamlCombiTest.java | 2 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 4 +- .../catalog/CatalogYamlLocationTest.java | 4 +- .../brooklyn/catalog/CatalogYamlPolicyTest.java | 2 +- .../catalog/CatalogYamlTemplateTest.java | 4 +- .../catalog/CatalogYamlVersioningTest.java | 4 +- .../main/java/brooklyn/cli/AbstractMain.java | 2 +- .../src/main/java/brooklyn/cli/ItemLister.java | 2 +- usage/cli/src/main/java/brooklyn/cli/Main.java | 6 +- .../brooklyn/cli/lister/ItemDescriptors.java | 2 +- .../BrooklynLauncherRebindCatalogTest.java | 4 +- .../rest/resources/CatalogResource.java | 4 +- .../rest/resources/LocationResource.java | 2 +- .../rest/transform/CatalogTransformer.java | 4 +- .../rest/transform/EntityTransformer.java | 2 +- .../rest/util/BrooklynRestResourceUtils.java | 4 +- .../rest/resources/CatalogResetTest.java | 2 +- .../rest/resources/CatalogResourceTest.java | 4 +- .../util/BrooklynRestResourceUtilsTest.java | 2 +- 153 files changed, 532 insertions(+), 530 deletions(-) ----------------------------------------------------------------------
