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 2014/07/11 06:14:16 UTC
[09/10] git commit: Merge remote-tracking branch 'upstream/master'
into feature/jsgui-catalog
Merge remote-tracking branch 'upstream/master' into feature/jsgui-catalog
Conflicts:
usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e70b3ffe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e70b3ffe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e70b3ffe
Branch: refs/heads/master
Commit: e70b3ffe33b3686157510621082b96c2e8df9a35
Parents: 4b468c5 d767d78
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Jul 10 12:58:29 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Jul 10 12:58:29 2014 +0100
----------------------------------------------------------------------
.../java/brooklyn/catalog/BrooklynCatalog.java | 5 +
.../main/java/brooklyn/catalog/CatalogItem.java | 4 +
.../BrooklynClassLoadingContext.java | 26 ++
.../brooklyn/camp/spi/pdp/DeploymentPlan.java | 10 +-
.../catalog/internal/BasicBrooklynCatalog.java | 132 ++++--
.../brooklyn/catalog/internal/CatalogDo.java | 24 +-
.../brooklyn/catalog/internal/CatalogDto.java | 62 ++-
.../catalog/internal/CatalogItemDo.java | 53 +--
.../internal/CatalogItemDtoAbstract.java | 21 +
.../entity/proxying/InternalEntityFactory.java | 173 ++++---
.../AbstractBrooklynClassLoadingContext.java | 62 +++
.../BrooklynClassLoadingContextSequential.java | 98 ++++
.../JavaBrooklynClassLoadingContext.java | 60 +++
.../OsgiBrooklynClassLoadingContext.java | 76 ++++
.../brooklyn/management/ha/OsgiManager.java | 29 +-
.../internal/AbstractManagementContext.java | 15 +-
.../main/java/brooklyn/util/ResourceUtils.java | 55 ++-
.../java/brooklyn/util/flags/TypeCoercions.java | 28 +-
.../src/main/java/brooklyn/util/osgi/Osgis.java | 119 +++++
.../src/test/dependencies/osgi/entities/pom.xml | 62 +++
.../brooklyn/osgi/tests/SimpleApplication.java | 10 +
.../osgi/tests/SimpleApplicationImpl.java | 9 +
.../java/brooklyn/osgi/tests/SimpleEntity.java | 10 +
.../brooklyn/osgi/tests/SimpleEntityImpl.java | 8 +
.../main/resources/brooklyn/osgi/tests/icon.gif | Bin 0 -> 43 bytes
.../brooklyn/camp/lite/CampYamlLiteTest.java | 82 +++-
.../brooklyn/entity/basic/EntitySpecTest.java | 2 +-
.../management/osgi/OsgiStandaloneTest.java | 53 ++-
.../util/internal/TypeCoercionsTest.java | 37 +-
.../ssh/process/ProcessToolIntegrationTest.java | 2 +-
.../camp/lite/test-app-service-blueprint.yaml | 2 +-
core/src/test/resources/brooklyn/osgi/README.md | 1 +
.../osgi/brooklyn-test-osgi-entities.jar | Bin 0 -> 10891 bytes
.../osgi/brooklyn-tests-osgi-entities-0.1.0.jar | Bin 4810 -> 0 bytes
pom.xml | 2 +-
.../ControlledDynamicWebAppClusterTest.java | 17 +-
.../BrooklynAssemblyTemplateInstantiator.java | 445 +++++++++----------
.../BrooklynComponentTemplateResolver.java | 148 +++---
.../creation/BrooklynEntityClassResolver.java | 141 ------
.../BrooklynEntityDecorationResolver.java | 20 +-
.../spi/creation/BrooklynEntityMatcher.java | 23 +-
.../creation/BrooklynYamlTypeInstantiator.java | 200 +++++++++
.../spi/creation/BrooklynYamlTypeLoader.java | 210 ---------
.../creation/ChefComponentTemplateResolver.java | 15 +-
.../BrooklynYamlTypeInstantiatorTest.java | 76 ++++
.../brooklyn/BrooklynYamlTypeLoaderTest.java | 70 ---
.../camp/brooklyn/DslAndRebindYamlTest.java | 8 +-
.../camp/brooklyn/EntitiesYamlTest.java | 16 +-
.../resources/test-entity-basic-template.yaml | 2 -
usage/cli/src/main/java/brooklyn/cli/Main.java | 3 +-
.../qa/longevity/MonitorUtilsTest.groovy | 12 +-
.../main/java/brooklyn/rest/api/CatalogApi.java | 19 +
.../rest/resources/CatalogResource.java | 19 +-
.../config/render/TestRendererHints.java | 8 +-
.../rest/resources/ApiDocResourceTest.java | 2 +-
.../rest/resources/ApplicationResourceTest.java | 30 ++
.../resources/CatalogBundleResourceTest.java | 178 ++++++++
.../rest/resources/CatalogResourceTest.java | 81 +++-
.../rest/resources/EntityResourceTest.java | 19 -
.../brooklyn/util/collections/MutableMap.java | 7 +
.../brooklyn/util/text/StringPredicates.java | 26 +-
.../test/PlatformTestSelectorListener.java | 39 ++
62 files changed, 2186 insertions(+), 980 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e70b3ffe/usage/rest-api/src/main/java/brooklyn/rest/api/CatalogApi.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e70b3ffe/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
----------------------------------------------------------------------
diff --cc usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
index 8a63f14,91a49fe..89efb30
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
@@@ -99,7 -101,25 +101,22 @@@ public class CatalogResource extends Ab
}
@Override
+ public Response resetXml(String xml) {
+ ((BasicBrooklynCatalog)mgmt().getCatalog()).reset(CatalogDto.newDtoFromXmlContents(xml, "REST reset"));
+ return Response.ok().build();
+ }
+
+ @Override
+ public void deleteEntity(String entityId) throws Exception {
+ CatalogItem<?,?> result = brooklyn().getCatalog().getCatalogItem(entityId);
+ if (result==null) {
+ throw WebResourceUtils.notFound("Entity with id '%s' not found", entityId);
+ }
+ brooklyn().getCatalog().deleteCatalogItem(entityId);
+ }
+
+ @Override
- public List<CatalogItemSummary> listEntities(
- final String regex,
- final String fragment
- ) {
+ public List<CatalogItemSummary> listEntities(String regex, String fragment) {
return getCatalogItemSummariesMatchingRegexFragment(CatalogPredicates.IS_ENTITY, regex, fragment);
}