You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/11/25 02:55:31 UTC
[21/21] incubator-brooklyn git commit: This closes #1048
This closes #1048
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/11b08da3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/11b08da3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/11b08da3
Branch: refs/heads/master
Commit: 11b08da35e55304082512b916d13207eaa14cea1
Parents: 3922b0e b514adb
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Tue Nov 24 20:41:36 2015 -0500
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Tue Nov 24 20:41:36 2015 -0500
----------------------------------------------------------------------
core/pom.xml | 2 -
.../catalog/internal/CatalogInitialization.java | 2 +-
.../internal/JavaCatalogToSpecTransformer.java | 2 +-
.../core/mgmt/ManagementContextInjectable.java | 2 +-
.../internal/AbstractManagementContext.java | 4 +-
.../core/mgmt/internal/LocalUsageManager.java | 2 +-
.../core/objs/BasicConfigurableObject.java | 2 +-
.../brooklyn/core/plan/PlanToSpecFactory.java | 2 +-
.../entity/AbstractEntitySpecResolver.java | 2 +-
.../typereg/AbstractTypePlanTransformer.java | 2 +-
.../core/typereg/TypePlanTransformers.java | 2 +-
.../apache/brooklyn/util/core/osgi/Compat.java | 69 +++++++++++
.../apache/brooklyn/util/core/osgi/Osgis.java | 22 +---
.../resources/OSGI-INF/blueprint/blueprint.xml | 41 +++++++
.../core/plan/XmlPlanToSpecTransformer.java | 2 +-
.../JavaClassNameTypePlanTransformerTest.java | 2 +-
karaf/apache-brooklyn/pom.xml | 3 +-
karaf/features/src/main/feature/feature.xml | 121 ++++++++++++++++++-
.../features/src/main/history/dependencies.xml | 58 ++++++++-
karaf/pom.xml | 6 +-
parent/pom.xml | 10 ++
pom.xml | 4 +-
usage/camp/pom.xml | 17 +++
.../BrooklynComponentTemplateResolver.java | 2 +-
.../spi/creation/CampToSpecTransformer.java | 2 +-
.../service/CampServiceSpecResolver.java | 2 +-
.../service/UrlServiceSpecResolver.java | 2 +-
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 2 +-
usage/downstream-parent/pom.xml | 4 +-
usage/jsgui/pom.xml | 24 ++++
.../BrooklynJavascriptGuiLauncherTest.java | 5 +-
usage/rest-server/pom.xml | 35 ++++++
.../BrooklynPropertiesSecurityFilter.java | 4 +-
.../rest/filter/HaMasterCheckFilter.java | 4 +-
.../resources/AbstractBrooklynRestResource.java | 7 +-
.../apache/brooklyn/rest/util/OsgiCompat.java | 46 +++++++
.../util/json/BrooklynJacksonJsonProvider.java | 8 +-
.../brooklyn/rest/BrooklynRestApiLauncher.java | 5 +-
.../BrooklynRestApiLauncherTestFixture.java | 4 +-
.../rest/resources/ScriptResourceTest.java | 2 +-
.../rest/testing/BrooklynRestApiTest.java | 2 +-
utils/rest-swagger/pom.xml | 66 +++++++++-
42 files changed, 534 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/11b08da3/parent/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/11b08da3/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/11b08da3/usage/rest-server/pom.xml
----------------------------------------------------------------------