This closes #665
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fc575d77 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fc575d77 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/fc575d77 Branch: refs/heads/master Commit: fc575d77b4aaa7141ca273353fa751b2492e76df Parents: 48933eb e0feddb Author: Duncan Godwin <[email protected]> Authored: Mon May 8 12:56:02 2017 +0100 Committer: Duncan Godwin <[email protected]> Committed: Mon May 8 12:56:02 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/catalog/CatalogItem.java | 2 - .../catalog/AbstractCatalogXmlTest.java | 108 ---------- .../camp/brooklyn/catalog/CatalogScanTest.java | 198 ++++++++++++++++++ .../brooklyn/catalog/CatalogXmlOsgiTest.java | 37 ---- .../brooklyn/catalog/CatalogXmlVersionTest.java | 57 ------ .../brooklyn/test/lite/CampYamlLiteTest.java | 24 --- .../src/test/resources/osgi-catalog.xml | 29 --- .../src/test/resources/simple-catalog.xml | 47 ----- .../core/catalog/CatalogPredicates.java | 63 +++++- .../catalog/internal/BasicBrooklynCatalog.java | 12 -- .../internal/CatalogBundleConverter.java | 63 ------ .../catalog/internal/CatalogClasspathDo.java | 5 +- .../core/catalog/internal/CatalogDo.java | 14 -- .../core/catalog/internal/CatalogDto.java | 90 +-------- .../core/catalog/internal/CatalogDtoUtils.java | 66 ------ .../catalog/internal/CatalogInitialization.java | 87 ++------ .../core/catalog/internal/CatalogItemDo.java | 5 - .../internal/CatalogItemDtoAbstract.java | 18 -- .../catalog/internal/CatalogXmlSerializer.java | 77 ------- .../internal/JavaCatalogToSpecTransformer.java | 9 +- .../core/server/BrooklynServerConfig.java | 2 +- .../main/resources/brooklyn-catalog-empty.xml | 20 -- .../core/catalog/internal/CatalogDtoTest.java | 36 +--- .../core/catalog/internal/CatalogLoadTest.java | 79 -------- .../core/catalog/internal/CatalogScanTest.java | 199 ------------------- .../core/mgmt/rebind/RebindCatalogItemTest.java | 84 ++++++-- ...talogWhenCatalogPersistenceDisabledTest.java | 49 +++-- .../core/test/BrooklynAppLiveTestSupport.java | 3 +- .../brooklyn/catalog/internal/osgi-catalog.xml | 31 --- .../rebind/rebind-catalog-item-test-catalog.xml | 28 --- .../apache/brooklyn/rest/api/CatalogApi.java | 11 - .../rest/resources/CatalogResource.java | 22 +- .../rest/resources/CatalogResetTest.java | 118 ----------- .../src/test/resources/reset-catalog.xml | 37 ---- .../entity/brooklynnode/BrooklynNode.java | 19 -- .../brooklynnode/BrooklynNodeSshDriver.java | 14 -- .../BrooklynNodeIntegrationTest.java | 24 --- 37 files changed, 389 insertions(+), 1398 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fc575d77/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java ----------------------------------------------------------------------
