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/22 11:05:06 UTC
[21/23] incubator-brooklyn git commit: This closes #634
This closes #634
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f4de73e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f4de73e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f4de73e8
Branch: refs/heads/master
Commit: f4de73e8a5b3646d8b0185eead50863d7ec36940
Parents: 776ad43 5d767b6
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri May 22 10:04:08 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri May 22 10:04:08 2015 +0100
----------------------------------------------------------------------
.../java/brooklyn/catalog/BrooklynCatalog.java | 7 +-
.../brooklyn/management/ManagementContext.java | 5 +
.../mementos/BrooklynMementoPersister.java | 7 +-
.../mementos/BrooklynMementoRawData.java | 6 +
.../java/brooklyn/catalog/CatalogLoadMode.java | 3 +
.../brooklyn/catalog/CatalogPredicates.java | 1 +
.../catalog/internal/BasicBrooklynCatalog.java | 141 ++--
.../catalog/internal/CatalogBundleDto.java | 19 +
.../brooklyn/catalog/internal/CatalogDo.java | 26 +-
.../brooklyn/catalog/internal/CatalogDto.java | 10 +
.../catalog/internal/CatalogInitialization.java | 377 ++++++++++
.../internal/CatalogItemDtoAbstract.java | 32 +
.../brooklyn/config/BrooklynServerConfig.java | 14 +-
.../brooklyn/entity/rebind/RebindIteration.java | 82 ++-
.../entity/rebind/RebindManagerImpl.java | 4 +-
.../AbstractBrooklynMementoPersister.java | 12 +-
.../BrooklynMementoPersisterToMultiFile.java | 6 +-
.../BrooklynMementoPersisterToObjectStore.java | 19 +-
.../persister/BrooklynPersistenceUtils.java | 4 +-
.../location/basic/BasicLocationRegistry.java | 2 +-
.../location/cloud/CloudLocationConfig.java | 11 +-
.../location/cloud/CloudMachineNamer.java | 169 -----
.../location/cloud/CustomMachineNamer.java | 72 --
.../cloud/names/AbstractCloudMachineNamer.java | 150 ++++
.../cloud/names/BasicCloudMachineNamer.java | 91 +++
.../location/cloud/names/CloudMachineNamer.java | 61 ++
.../cloud/names/CustomMachineNamer.java | 72 ++
.../JavaBrooklynClassLoadingContext.java | 2 +-
.../ha/HighAvailabilityManagerImpl.java | 2 +-
.../internal/AbstractManagementContext.java | 50 +-
.../internal/ManagementContextInternal.java | 13 +-
.../NonDeploymentManagementContext.java | 19 +
.../main/resources/brooklyn/empty.catalog.bom | 18 +
.../catalog/internal/CatalogScanTest.java | 17 +-
.../entity/rebind/RebindCatalogEntityTest.java | 34 +-
.../entity/rebind/RebindCatalogItemTest.java | 4 +-
.../brooklyn/entity/rebind/RebindTestUtils.java | 2 +-
.../location/cloud/CloudMachineNamerTest.java | 45 +-
.../location/cloud/CustomMachineNamerTest.java | 7 +-
.../entity/LocalManagementContextForTests.java | 3 +-
.../test/resources/brooklyn/default.catalog.bom | 19 +
docs/guide/ops/catalog/index.md | 20 +
docs/guide/ops/install-on-server.md | 23 +-
docs/guide/ops/locations/index.md | 119 +--
docs/guide/start/blueprints.md | 13 +-
docs/guide/start/catalog.xml | 22 -
.../location/jclouds/JcloudsLocation.java | 85 ++-
.../location/jclouds/JcloudsLocationConfig.java | 6 +-
.../location/jclouds/JcloudsMachineNamer.java | 11 +-
.../location/jclouds/JcloudsLocationTest.java | 8 +-
.../jclouds/JcloudsMachineNamerTest.java | 10 +-
pom.xml | 5 +-
.../entity/brooklynnode/BrooklynNode.java | 6 +
.../entity/service/InitdServiceInstaller.java | 4 +-
.../BrooklynNodeIntegrationTest.java | 8 +-
.../java/brooklyn/entity/nosql/riak/riak.png | Bin 110651 -> 0 bytes
.../brooklyn/entity/nosql/riak/riak.png | Bin 0 -> 110651 bytes
.../BrooklynComponentTemplateResolver.java | 7 +-
.../brooklyn/catalog/CatalogYamlEntityTest.java | 20 +-
.../catalog/CatalogYamlVersioningTest.java | 11 +-
usage/cli/pom.xml | 5 +-
.../src/main/java/brooklyn/cli/ItemLister.java | 77 +-
usage/cli/src/main/java/brooklyn/cli/Main.java | 113 +--
.../java/brooklyn/cli/lister/ClassFinder.java | 7 +-
.../brooklyn/cli/lister/ItemDescriptors.java | 20 +-
.../main/resources/brooklyn-object-list.html | 147 ----
.../main/resources/brooklyn/default.catalog.bom | 23 +
.../statics/brooklyn-object-list.html | 147 ++++
.../brooklyn/item-lister/statics/common.js | 94 +++
.../brooklyn/item-lister/statics/items.css | 153 ++++
.../statics/style/js/catalog/bloodhound.js | 727 +++++++++++++++++++
.../statics/style/js/underscore-min.js | 6 +
.../statics/style/js/underscore-min.map | 1 +
.../item-lister/templates/enricher.html | 59 ++
.../brooklyn/item-lister/templates/entity.html | 66 ++
.../item-lister/templates/location.html | 62 ++
.../brooklyn/item-lister/templates/policy.html | 59 ++
usage/cli/src/main/resources/common.js | 94 ---
usage/cli/src/main/resources/enricher.html | 59 --
usage/cli/src/main/resources/entity.html | 66 --
usage/cli/src/main/resources/items.css | 153 ----
.../src/main/resources/libs/js/bloodhound.js | 727 -------------------
usage/cli/src/main/resources/location.html | 62 --
usage/cli/src/main/resources/policy.html | 59 --
usage/dist/pom.xml | 10 +
.../main/dist/conf/brooklyn/default.catalog.bom | 41 ++
usage/dist/src/main/dist/conf/catalog.xml | 37 -
usage/dist/src/main/dist/conf/logback.xml | 18 -
.../brooklyn/launcher/BrooklynLauncher.java | 63 +-
.../brooklyn/launcher/BrooklynLauncherTest.java | 9 +-
.../rest/resources/ApplicationResource.java | 2 +-
.../brooklyn/rest/resources/EntityResource.java | 2 +-
.../rest/util/BrooklynRestResourceUtils.java | 4 +
.../brooklyn/rest/BrooklynRestApiLauncher.java | 8 +-
.../BrooklynRestApiLauncherTestFixture.java | 5 +-
.../util/BrooklynRestResourceUtilsTest.java | 5 +-
.../resources/brooklyn/scanning.catalog.bom | 19 +
.../util/javalang/AggregateClassLoader.java | 24 +-
98 files changed, 3161 insertions(+), 2088 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4de73e8/core/src/main/java/brooklyn/catalog/internal/CatalogBundleDto.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4de73e8/docs/guide/ops/catalog/index.md
----------------------------------------------------------------------
diff --cc docs/guide/ops/catalog/index.md
index 074bbf3,7cb0e84..b93481c
--- a/docs/guide/ops/catalog/index.md
+++ b/docs/guide/ops/catalog/index.md
@@@ -5,9 -5,11 +5,11 @@@ children
- { section: General YAML Schema }
- { section: Catalog Metadata }
- { section: Catalog YAML Examples }
-- { section: Adding to the Catalog, title: Adding and Deleting }
- { section: Templates and the Add-Application Wizard, title: Templates }
+- { section: Adding to the Catalog, title: Adding and Deleting }
- { section: Versioning }
+ - { section: CLI Options }
+
---
Brooklyn provides a **catalog**, which is a persisted collection of versioned blueprints and other resources.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4de73e8/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4de73e8/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4de73e8/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4de73e8/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
----------------------------------------------------------------------