You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2017/06/06 12:25:27 UTC
[07/17] brooklyn-server git commit: Merge branch 'master' into
bundle-uninstall-and-snapshot
Merge branch 'master' into bundle-uninstall-and-snapshot
Removal of XML catalog support caused minor conflicts in imports and tests, easily resolved.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/71ede731
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/71ede731
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/71ede731
Branch: refs/heads/master
Commit: 71ede731aafa3f32ffac62e21c5eaab2fa9d21d7
Parents: abdb13e fc575d7
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon May 8 13:34:04 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon May 8 13:34:04 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 | 27 ---
.../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/internal/storage/DataGrid.java | 52 -----
.../core/internal/storage/DataGridFactory.java | 38 ----
.../storage/impl/BrooklynStorageImpl.java | 18 +-
.../internal/storage/impl/InmemoryDatagrid.java | 86 ++++++++
.../impl/inmemory/InMemoryDataGridFactory.java | 40 ----
.../storage/impl/inmemory/InmemoryDatagrid.java | 93 ---------
.../internal/AbstractManagementContext.java | 49 +----
.../mgmt/internal/LocalManagementContext.java | 28 +--
.../core/server/BrooklynServerConfig.java | 2 +-
.../main/resources/brooklyn-catalog-empty.xml | 20 --
.../deserializingClassRenames.properties | 4 -
.../core/catalog/internal/CatalogDtoTest.java | 36 +---
.../core/catalog/internal/CatalogLoadTest.java | 79 --------
.../core/catalog/internal/CatalogScanTest.java | 199 -------------------
.../storage/impl/BrooklynStorageImplTest.java | 6 +-
.../core/mgmt/rebind/RebindCatalogItemTest.java | 84 ++++++--
...talogWhenCatalogPersistenceDisabledTest.java | 49 +++--
.../core/test/BrooklynAppLiveTestSupport.java | 3 +-
.../longevity/EntityCleanupLongevityTest.java | 2 +-
.../EntityCleanupLongevityTestFixture.java | 48 +++--
.../brooklyn/catalog/internal/osgi-catalog.xml | 31 ---
.../rebind/rebind-catalog-item-test-catalog.xml | 28 ---
pom.xml | 2 -
.../apache/brooklyn/rest/api/CatalogApi.java | 11 -
.../rest/resources/CatalogResource.java | 19 +-
.../rest/resources/CatalogResetTest.java | 118 -----------
.../src/test/resources/reset-catalog.xml | 37 ----
.../entity/brooklynnode/BrooklynNode.java | 19 --
.../brooklynnode/BrooklynNodeSshDriver.java | 14 --
.../BrooklynNodeIntegrationTest.java | 24 ---
storage/hazelcast/pom.xml | 88 --------
.../storage/impl/hazelcast/EntityId.java | 36 ----
.../impl/hazelcast/EntityStreamSerializer.java | 68 -------
.../impl/hazelcast/HazelcastDataGrid.java | 89 ---------
.../hazelcast/HazelcastDataGridFactory.java | 42 ----
.../impl/hazelcast/HazelcastStorageTest.java | 107 ----------
56 files changed, 516 insertions(+), 2167 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/71ede731/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/71ede731/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java
----------------------------------------------------------------------
diff --cc camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java
index 2b1b488,68c7fed..506e838
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java
@@@ -40,8 -40,8 +40,6 @@@ import org.apache.brooklyn.camp.spi.Ass
import org.apache.brooklyn.camp.spi.pdp.PdpYamlTest;
import org.apache.brooklyn.camp.test.mock.web.MockWebPlatform;
import org.apache.brooklyn.core.catalog.CatalogPredicates;
--import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog;
--import org.apache.brooklyn.core.catalog.internal.CatalogDto;
import org.apache.brooklyn.core.catalog.internal.CatalogUtils;
import org.apache.brooklyn.core.config.ConfigKeys;
import org.apache.brooklyn.core.effector.AddChildrenEffector;
@@@ -192,35 -190,8 +190,10 @@@ public class CampYamlLiteTest
assertMgmtHasSampleMyCatalogApp(symbolicName, bundleUrl);
}
-
- @SuppressWarnings("deprecation")
- @Test
- public void testResetXmlWithCustomEntity() throws IOException {
- TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
-
- String symbolicName = "my.catalog.app.id";
- String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;
- String yaml = prepAndGetSampleMyCatalogAppYaml(symbolicName, bundleUrl);
-
- LocalManagementContext mgmt2 = LocalManagementContextForTests.newInstanceWithOsgi();
- try {
- installWithoutCatalogBom(mgmt2, bundleUrl);
- CampPlatformWithJustBrooklynMgmt platform2 = new CampPlatformWithJustBrooklynMgmt(mgmt2);
- MockWebPlatform.populate(platform2, TestAppAssemblyInstantiator.class);
-
- mgmt2.getCatalog().addItems(yaml);
- String xml = ((BasicBrooklynCatalog) mgmt2.getCatalog()).toXmlString();
- ((BasicBrooklynCatalog) mgmt.getCatalog()).reset(CatalogDto.newDtoFromXmlContents(xml, "copy of temporary catalog"));
- } finally {
- mgmt2.terminate();
- }
-
- assertMgmtHasSampleMyCatalogApp(symbolicName, bundleUrl);
- }
- private String getSampleMyCatalogAppYaml(String symbolicName, String bundleUrl) {
+ private String prepAndGetSampleMyCatalogAppYaml(String symbolicName, String bundleUrl) {
+ installWithoutCatalogBom(mgmt, bundleUrl);
+
return Joiner.on("\n").join(
"brooklyn.catalog:",
" id: " + symbolicName,
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/71ede731/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/71ede731/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/71ede731/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/71ede731/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
----------------------------------------------------------------------
diff --cc rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
index c5a2b59,f0dbf34..76ebb63
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
@@@ -39,14 -44,11 +39,12 @@@ import org.apache.brooklyn.api.entity.E
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.location.LocationSpec;
+import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.policy.PolicySpec;
+import org.apache.brooklyn.api.typereg.ManagedBundle;
import org.apache.brooklyn.api.typereg.RegisteredType;
import org.apache.brooklyn.core.catalog.CatalogPredicates;
--import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog;
- import org.apache.brooklyn.core.catalog.internal.CatalogDto;
import org.apache.brooklyn.core.catalog.internal.CatalogItemComparator;
import org.apache.brooklyn.core.catalog.internal.CatalogUtils;
import org.apache.brooklyn.core.mgmt.entitlement.Entitlements;