brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [18/18] git commit: This closes #294
Date Tue, 04 Nov 2014 14:30:12 GMT
This closes #294


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d5636527
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d5636527
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d5636527

Branch: refs/heads/master
Commit: d5636527ada64aabf1e0f122f56a2aa5968ca463
Parents: d36f348 32f2bd7
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Tue Nov 4 14:29:30 2014 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Tue Nov 4 14:29:30 2014 +0000

----------------------------------------------------------------------
 .../basic/AbstractBrooklynObjectSpec.java       |  12 +
 .../java/brooklyn/basic/BrooklynObject.java     |  13 +
 .../basic/internal/ApiObjectsFactory.java       |  60 ++++
 .../internal/ApiObjectsFactoryInterface.java    |  29 ++
 .../main/java/brooklyn/catalog/CatalogItem.java |   9 +-
 .../mementos/BrooklynMementoManifest.java       |  17 +-
 .../main/java/brooklyn/mementos/Memento.java    |   2 +
 .../brooklyn/basic/AbstractBrooklynObject.java  |  15 +
 .../brooklyn/basic/BrooklynObjectInternal.java  |   3 +
 .../basic/internal/ApiObjectsFactoryImpl.java   |  41 +++
 .../catalog/internal/BasicBrooklynCatalog.java  |  31 +-
 .../brooklyn/catalog/internal/CatalogDo.java    |   2 +-
 .../catalog/internal/CatalogItemDo.java         |   7 +-
 .../internal/CatalogItemDtoAbstract.java        |  13 +
 .../brooklyn/catalog/internal/CatalogUtils.java |  38 ++-
 .../brooklyn/entity/basic/AbstractEntity.java   |   6 +
 .../basic/EntityTransientCopyInternal.java      |   2 +
 .../entity/proxying/InternalEntityFactory.java  |   4 +
 .../proxying/InternalLocationFactory.java       |   5 +
 .../entity/proxying/InternalPolicyFactory.java  |   9 +
 .../AbstractBrooklynObjectRebindSupport.java    |   1 +
 .../entity/rebind/RebindManagerImpl.java        | 257 +++++++++------
 .../entity/rebind/dto/AbstractMemento.java      |  13 +
 .../rebind/dto/BrooklynMementoManifestImpl.java |  52 +--
 .../rebind/dto/EntityMementoManifestImpl.java   |  56 ++++
 .../entity/rebind/dto/MementosGenerators.java   |   1 +
 .../AbstractBrooklynMementoPersister.java       |   4 +-
 .../BrooklynMementoPersisterInMemory.java       |   6 +-
 .../BrooklynMementoPersisterToMultiFile.java    |   5 +-
 .../BrooklynMementoPersisterToObjectStore.java  |  22 +-
 .../BrooklynClassLoadingContextSequential.java  |  12 +-
 .../OsgiBrooklynClassLoadingContext.java        |  16 +-
 .../brooklyn/management/ha/OsgiManager.java     |  26 +-
 .../policy/basic/AbstractEntityAdjunct.java     |   3 +
 ...yn.basic.internal.ApiObjectsFactoryInterface |  19 ++
 core/src/test/dependencies/osgi/README.md       |  29 ++
 .../src/test/dependencies/osgi/entities/pom.xml |   7 +-
 .../dependencies/osgi/more-entities-v1/pom.xml  |  82 +++++
 .../brooklyn/osgi/tests/more/MoreEntity.java    |  38 +++
 .../osgi/tests/more/MoreEntityImpl.java         |  44 +++
 .../dependencies/osgi/more-entities-v2/pom.xml  |  87 +++++
 .../brooklyn/osgi/tests/more/MoreEntity.java    |  39 +++
 .../osgi/tests/more/MoreEntityImpl.java         |  47 +++
 .../brooklyn/catalog/internal/CatalogItems.java |   4 +-
 .../entity/rebind/RebindPolicyTest.java         |   2 +-
 .../management/osgi/OsgiStandaloneTest.java     |  60 +---
 .../management/osgi/OsgiTestResources.java      |  61 ++++
 .../osgi/OsgiVersionMoreEntityTest.java         | 318 +++++++++++++++++++
 .../entity/TestEntityTransientCopyImpl.java     |  28 ++
 core/src/test/resources/brooklyn/osgi/README.md |  10 +-
 .../osgi/brooklyn-test-osgi-entities.jar        | Bin 14663 -> 12406 bytes
 .../brooklyn-test-osgi-more-entities_0.1.0.jar  | Bin 0 -> 12452 bytes
 .../brooklyn-test-osgi-more-entities_0.2.0.jar  | Bin 0 -> 12615 bytes
 .../autoscaling/AutoScalerPolicyMetricTest.java |   8 +-
 .../BrooklynAssemblyTemplateInstantiator.java   |   2 +
 .../BrooklynComponentTemplateResolver.java      |   9 +-
 .../spi/creation/BrooklynEntityMatcher.java     |  11 +-
 .../lookup/AbstractTemplateBrooklynLookup.java  |   2 +-
 .../lookup/AssemblyTemplateBrooklynLookup.java  |   2 +-
 ...PlatformComponentTemplateBrooklynLookup.java |   2 +-
 .../camp/brooklyn/CatalogYamlEntityTest.java    | 184 -----------
 .../camp/brooklyn/CatalogYamlPolicyTest.java    | 136 --------
 .../CatalogOsgiVersionMoreEntityTest.java       | 130 ++++++++
 .../brooklyn/catalog/CatalogYamlEntityTest.java | 187 +++++++++++
 .../brooklyn/catalog/CatalogYamlPolicyTest.java | 135 ++++++++
 .../more-entity-v1-called-v1-osgi-catalog.yaml  |  27 ++
 .../catalog/more-entity-v1-osgi-catalog.yaml    |  27 ++
 ...more-entity-v1-with-policy-osgi-catalog.yaml |  29 ++
 .../catalog/more-entity-v2-osgi-catalog.yaml    |  28 ++
 .../catalog/simple-policy-osgi-catalog.yaml     |  27 ++
 .../brooklyn/util/exceptions/Exceptions.java    |  56 +++-
 .../java/brooklyn/util/guava/Functionals.java   |   1 -
 .../guava/IllegalStateExceptionSupplier.java    |   2 +-
 .../main/java/brooklyn/util/text/Strings.java   |  10 +
 74 files changed, 2122 insertions(+), 560 deletions(-)
----------------------------------------------------------------------



Mime
View raw message