You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/05/29 12:36:11 UTC
[11/13] incubator-brooklyn git commit: This closes #617
This closes #617
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b7a4d5ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b7a4d5ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b7a4d5ec
Branch: refs/heads/master
Commit: b7a4d5ec24045ab4f256f998c2d414296153ed29
Parents: 42e9aad 692e47c
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri May 29 11:29:30 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri May 29 11:29:30 2015 +0100
----------------------------------------------------------------------
.../brooklyn/entity/rebind/RebindManager.java | 7 +-
.../mementos/BrooklynMementoPersister.java | 1 +
.../catalog/internal/BasicBrooklynCatalog.java | 87 +++++--
.../catalog/internal/CatalogClasspathDo.java | 41 ++-
.../brooklyn/catalog/internal/CatalogDo.java | 1 +
.../catalog/internal/CatalogInitialization.java | 250 ++++++++++++-------
.../internal/CatalogItemDtoAbstract.java | 4 +-
.../rebind/PeriodicDeltaChangeListener.java | 210 +++++++++-------
.../entity/rebind/RebindContextImpl.java | 6 +-
.../brooklyn/entity/rebind/RebindIteration.java | 58 +++--
.../entity/rebind/RebindManagerImpl.java | 14 +-
.../BrooklynMementoPersisterToObjectStore.java | 2 +-
.../ha/HighAvailabilityManagerImpl.java | 67 +++--
.../internal/AbstractManagementContext.java | 20 +-
.../NonDeploymentManagementContext.java | 7 +-
.../brooklyn/osgi/tests/more/MoreEntity.java | 2 +
.../catalog/internal/CatalogScanTest.java | 22 +-
.../entity/rebind/ActivePartialRebindTest.java | 2 +-
.../brooklyn/entity/rebind/RebindTestUtils.java | 2 +-
...ntoPersisterInMemorySizeIntegrationTest.java | 21 +-
.../brooklyn/management/ha/HotStandbyTest.java | 14 +-
.../osgi/OsgiVersionMoreEntityTest.java | 4 +-
.../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 12590 -> 13078 bytes
docs/guide/ops/catalog/index.md | 5 +-
.../BrooklynComponentTemplateResolver.java | 12 +-
.../camp/brooklyn/AbstractYamlTest.java | 10 +-
.../camp/brooklyn/ReferencedYamlTest.java | 6 +-
.../CatalogOsgiVersionMoreEntityTest.java | 52 +++-
.../brooklyn/catalog/CatalogYamlCombiTest.java | 6 +-
.../brooklyn/catalog/CatalogYamlEntityTest.java | 44 ++--
.../catalog/CatalogYamlLocationTest.java | 4 +-
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 6 +-
.../catalog/CatalogYamlTemplateTest.java | 2 +-
.../catalog/CatalogYamlVersioningTest.java | 4 +-
.../more-entities-osgi-catalog-scan.yaml | 32 +++
usage/cli/src/main/java/brooklyn/cli/Main.java | 7 +-
.../java/brooklyn/cli/lister/ClassFinder.java | 2 +-
.../brooklyn/cli/lister/ItemDescriptors.java | 1 -
.../main/webapp/assets/js/view/ha-summary.js | 98 +++++---
.../brooklyn/launcher/BrooklynLauncher.java | 19 +-
.../rest/filter/HaHotCheckResourceFilter.java | 2 +-
.../rest/filter/HaMasterCheckFilter.java | 2 +-
.../brooklyn/rest/filter/LoggingFilter.java | 14 +-
.../brooklyn/rest/resources/ServerResource.java | 72 ++++--
.../brooklyn/rest/HaMasterCheckFilterTest.java | 2 +-
.../util/javalang/AggregateClassLoader.java | 41 ++-
.../java/brooklyn/util/javalang/Threads.java | 12 +-
.../src/main/java/brooklyn/util/os/Os.java | 6 +-
48 files changed, 841 insertions(+), 462 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b7a4d5ec/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b7a4d5ec/core/src/main/java/brooklyn/catalog/internal/CatalogDo.java
----------------------------------------------------------------------
diff --cc core/src/main/java/brooklyn/catalog/internal/CatalogDo.java
index afed76f,de68213..057b770
--- a/core/src/main/java/brooklyn/catalog/internal/CatalogDo.java
+++ b/core/src/main/java/brooklyn/catalog/internal/CatalogDo.java
@@@ -278,9 -264,10 +278,10 @@@ public class CatalogDo
dto.catalogs.add(child);
if (!isLoaded())
return null;
- return loadCatalog(child);
+ return loadCatalog(child, true);
}
+ /** adds the given urls; filters out any nulls supplied */
public synchronized void addToClasspath(String ...urls) {
if (dto.classpath == null)
dto.classpath = new CatalogClasspathDto();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b7a4d5ec/docs/guide/ops/catalog/index.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b7a4d5ec/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
----------------------------------------------------------------------
diff --cc usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
index e6ba010,af3d0b8..6e17bfb
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
@@@ -417,10 -417,10 +417,10 @@@ public class CatalogYamlEntityTest exte
"- type: " + SIMPLE_ENTITY_TYPE);
fail();
} catch (NullPointerException e) {
- Assert.assertEquals(e.getMessage(), "version");
+ Assert.assertEquals(e.getMessage(), "both name and version are required");
}
try {
- addCatalogItem(
+ addCatalogItems(
"brooklyn.catalog:",
" id: my.catalog.app.id.non_existing.ref",
" version: " + TEST_VERSION,