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:11 UTC
[01/21] incubator-brooklyn git commit: [BROOKLYN-183] Karaf feature
for brooklyn-jsgui
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 3922b0ef9 -> 11b08da35
[BROOKLYN-183] Karaf feature for brooklyn-jsgui
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/25dde5e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/25dde5e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/25dde5e2
Branch: refs/heads/master
Commit: 25dde5e2c195520c3d831ecde911ab54b66f032b
Parents: 7b5e39b
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Thu Nov 12 18:10:20 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Thu Nov 12 18:11:42 2015 +0200
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 4 ++++
karaf/features/src/main/history/dependencies.xml | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/25dde5e2/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index f426ee2..0962e2f 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -173,7 +173,11 @@
<feature>brooklyn-rest-api</feature>
<feature>brooklyn-camp-brooklyn</feature>
<feature>brooklyn-camp-base</feature>
+ </feature>
+ <feature name="brooklyn-jsgui" version="${project.version}" description="Brooklyn REST JavaScript Web GUI">
+ <bundle>mvn:org.apache.brooklyn/brooklyn-jsgui/${project.version}/war</bundle>
+ <feature>war</feature>
</feature>
<feature name="brooklyn-commands" version="${project.version}" description="Brooklyn Shell Commands">
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/25dde5e2/karaf/features/src/main/history/dependencies.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/history/dependencies.xml b/karaf/features/src/main/history/dependencies.xml
index dcae787..d48f69a 100644
--- a/karaf/features/src/main/history/dependencies.xml
+++ b/karaf/features/src/main/history/dependencies.xml
@@ -18,6 +18,7 @@
<feature prerequisite="false" dependency="false">brooklyn-utils-rest-swagger</feature>
<feature prerequisite="false" dependency="false">jetty</feature>
<feature prerequisite="false" dependency="false">swagger</feature>
+ <feature prerequisite="false" dependency="false">war</feature>
<bundle>mvn:ch.qos.logback/logback-classic/1.0.7</bundle>
<bundle>mvn:ch.qos.logback/logback-core/1.0.7</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.5</bundle>
@@ -56,6 +57,7 @@
<bundle>mvn:org.apache.brooklyn/brooklyn-camp/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-commands/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-core/0.9.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.brooklyn/brooklyn-jsgui/0.9.0-SNAPSHOT/war</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-logback-includes/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-rest-api/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-rest-server/0.9.0-SNAPSHOT</bundle>
[21/21] incubator-brooklyn git commit: This closes #1048
Posted by ha...@apache.org.
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
----------------------------------------------------------------------
[05/21] incubator-brooklyn git commit: [BROOKLYN-183] Finalize
feature brooklyn-rest-server
Posted by ha...@apache.org.
[BROOKLYN-183] Finalize feature brooklyn-rest-server
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/05a2c5fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/05a2c5fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/05a2c5fc
Branch: refs/heads/master
Commit: 05a2c5fc3d092cf92c33f14606cfdaf639a65466
Parents: badf6df
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Fri Nov 6 15:56:38 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Thu Nov 12 18:11:42 2015 +0200
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 10 +++++++---
karaf/features/src/main/history/dependencies.xml | 6 ++++++
parent/pom.xml | 10 ++++++++++
pom.xml | 2 ++
4 files changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/05a2c5fc/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index cf95ff7..f426ee2 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -131,7 +131,6 @@
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-jaxrs/${jackson.version}</bundle>
-
<!-- TODO: don't use wrap -->
<bundle dependency="true">wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc</bundle> <!-- from geoip -->
<bundle dependency="true">wrap:mvn:com.maxmind.geoip2/geoip2/${maxmind.version}</bundle> <!-- from geoip2 -->
@@ -142,6 +141,11 @@
<feature name="brooklyn-camp-brooklyn" version="${project.version}" description="Brooklyn CAMP REST API">
<bundle>mvn:org.apache.brooklyn/brooklyn-camp/${project.version}</bundle>
+
+ <feature>brooklyn-core</feature>
+ <feature>brooklyn-camp-base</feature>
+ <bundle dependency="true">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
+ <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
</feature>
<feature name="brooklyn-camp-base" version="${project.version}" description="Brooklyn CAMP Base">
@@ -163,12 +167,12 @@
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle>
</feature>
-
-
<feature name="brooklyn-rest-server" version="${project.version}" description="Brooklyn REST Server">
<bundle>mvn:org.apache.brooklyn/brooklyn-rest-server/${project.version}</bundle>
<feature>brooklyn-core</feature>
<feature>brooklyn-rest-api</feature>
+ <feature>brooklyn-camp-brooklyn</feature>
+ <feature>brooklyn-camp-base</feature>
</feature>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/05a2c5fc/karaf/features/src/main/history/dependencies.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/history/dependencies.xml b/karaf/features/src/main/history/dependencies.xml
index 571053f..dcae787 100644
--- a/karaf/features/src/main/history/dependencies.xml
+++ b/karaf/features/src/main/history/dependencies.xml
@@ -4,6 +4,10 @@
<feature prerequisite="false" dependency="false">brooklyn-api</feature>
<feature prerequisite="false" dependency="false">brooklyn-api</feature>
<feature prerequisite="false" dependency="false">brooklyn-camp-base</feature>
+ <feature prerequisite="false" dependency="false">brooklyn-camp-base</feature>
+ <feature prerequisite="false" dependency="false">brooklyn-camp-base</feature>
+ <feature prerequisite="false" dependency="false">brooklyn-camp-brooklyn</feature>
+ <feature prerequisite="false" dependency="false">brooklyn-core</feature>
<feature prerequisite="false" dependency="false">brooklyn-core</feature>
<feature prerequisite="false" dependency="false">brooklyn-rest-api</feature>
<feature prerequisite="false" dependency="false">brooklyn-utils-common</feature>
@@ -34,7 +38,9 @@
<bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle>
<bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle>
<bundle>mvn:com.thoughtworks.xstream/xstream/1.4.7</bundle>
+ <bundle>mvn:commons-beanutils/commons-beanutils/1.9.1</bundle>
<bundle>mvn:commons-codec/commons-codec/1.9</bundle>
+ <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
<bundle>mvn:commons-io/commons-io/2.4</bundle>
<bundle>mvn:commons-lang/commons-lang/2.4</bundle>
<bundle>mvn:io.swagger/swagger-annotations/1.5.3</bundle>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/05a2c5fc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4cd0f06..92e9e80 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -315,6 +315,16 @@
<version>${gson.version}</version>
</dependency>
<dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons-beanutils.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${commons-configuration.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/05a2c5fc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f22544c..3235e24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,8 @@
<jline.version>2.12</jline.version>
<jsonSmart.version>2.1.1</jsonSmart.version>
<minidev.asm.version>1.0.2</minidev.asm.version>
+ <commons-beanutils.version>1.9.1</commons-beanutils.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
<!-- Compilation -->
</properties>
[11/21] incubator-brooklyn git commit: [BROOKLYN-183] Publish the
management context as an OSGi service
Posted by ha...@apache.org.
[BROOKLYN-183] Publish the management context as an OSGi service
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d5e216f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d5e216f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d5e216f0
Branch: refs/heads/master
Commit: d5e216f007bc2387bc1f01af3ef7a2b02951c155
Parents: ed6f1df
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Thu Nov 19 12:41:42 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Thu Nov 19 12:41:42 2015 +0200
----------------------------------------------------------------------
.../resources/OSGI-INF/blueprint/blueprint.xml | 41 ++++++++++++++++++++
1 file changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d5e216f0/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
new file mode 100644
index 0000000..08dcbe5
--- /dev/null
+++ b/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2015 The Apache Software Foundation.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
+ xsi:schemaLocation="
+ http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+ http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd
+ ">
+
+<!-- <cm:property-placeholder persistent-id="org.apache.brooklyn.properties" update-strategy="reload">
+ <cm:default-properties>
+ <cm:property name="some-property" value="${karaf.data}/some-path"/>
+ </cm:default-properties>
+ </cm:property-placeholder>-->
+
+ <bean id="localManagementContextService"
+ class="org.apache.brooklyn.core.mgmt.internal.LocalManagementContext" />
+
+ <service ref="localManagementContextService"
+ interface="org.apache.brooklyn.api.mgmt.ManagementContext" />
+
+<!-- <service ref="localManagementContextService"
+ interface="org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal" />-->
+
+</blueprint>
[18/21] incubator-brooklyn git commit: [BROOKLYN-183] Update default
karaf assembly bootfeatures
Posted by ha...@apache.org.
[BROOKLYN-183] Update default karaf assembly bootfeatures
Use brooklyn-rest-server and brooklyn-jsgui as main features, since they
pull in the whole tree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/74d890d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/74d890d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/74d890d7
Branch: refs/heads/master
Commit: 74d890d72c7f00d4f66e103de0be7e918477dbef
Parents: a5979a7
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Sun Nov 22 03:25:18 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Mon Nov 23 18:42:28 2015 +0200
----------------------------------------------------------------------
karaf/apache-brooklyn/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/74d890d7/karaf/apache-brooklyn/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml
index bf80915..8f32f87 100755
--- a/karaf/apache-brooklyn/pom.xml
+++ b/karaf/apache-brooklyn/pom.xml
@@ -113,8 +113,8 @@
<bootFeature>system</bootFeature>
<bootFeature>wrap</bootFeature>
<!-- brooklyn features -->
- <bootFeature>brooklyn-core</bootFeature>
- <bootFeature>brooklyn-rest-api</bootFeature>
+ <bootFeature>brooklyn-jsgui</bootFeature>
+ <bootFeature>brooklyn-rest-server</bootFeature>
</bootFeatures>
</configuration>
</plugin>
[15/21] incubator-brooklyn git commit: Sync with branch 'master'
Posted by ha...@apache.org.
Sync with branch 'master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/640a0b28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/640a0b28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/640a0b28
Branch: refs/heads/master
Commit: 640a0b28da2f1279ea96400a9f09183a20f66350
Parents: 9602cae 10e9a3c
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Sun Nov 22 02:38:17 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Sun Nov 22 02:38:17 2015 +0200
----------------------------------------------------------------------
.../brooklyn/api/catalog/CatalogItem.java | 28 +-
.../apache/brooklyn/api/entity/EntitySpec.java | 93 --
.../internal/AbstractBrooklynObjectSpec.java | 100 +-
.../apache/brooklyn/api/location/Location.java | 3 +-
.../brooklyn/api/location/LocationSpec.java | 78 +-
.../BrooklynClassLoadingContext.java | 50 +
.../api/mgmt/rebind/RebindExceptionHandler.java | 4 +
.../apache/brooklyn/api/policy/PolicySpec.java | 75 -
.../brooklyn/api/sensor/EnricherSpec.java | 75 +-
.../api/typereg/BrooklynTypeRegistry.java | 32 +-
.../brooklyn/api/typereg/RegisteredType.java | 45 +-
.../api/typereg/RegisteredTypeConstraint.java | 45 -
.../typereg/RegisteredTypeLoadingContext.java | 50 +
.../catalog/internal/BasicBrooklynCatalog.java | 73 +-
.../catalog/internal/CatalogClasspathDo.java | 8 -
.../catalog/internal/CatalogItemBuilder.java | 54 +-
.../core/catalog/internal/CatalogItemDo.java | 5 -
.../internal/CatalogItemDtoAbstract.java | 24 +-
.../core/catalog/internal/CatalogUtils.java | 33 +-
.../apache/brooklyn/core/config/ConfigKeys.java | 8 +
.../vault/VaultExternalConfigSupplier.java | 22 +-
.../core/entity/BrooklynConfigKeys.java | 12 +-
.../org/apache/brooklyn/core/feed/Poller.java | 9 +-
.../core/location/AbstractLocation.java | 2 -
.../AggregatingMachineProvisioningLocation.java | 2 -
.../core/location/CatalogLocationResolver.java | 3 +-
.../access/PortForwardManagerClient.java | 2 -
.../core/mgmt/EntityManagementUtils.java | 17 +-
.../AbstractBrooklynClassLoadingContext.java | 5 +-
.../BrooklynClassLoadingContext.java | 30 +-
.../BrooklynClassLoadingContextSequential.java | 1 +
...ssLoaderFromBrooklynClassLoadingContext.java | 2 +
.../mgmt/ha/HighAvailabilityManagerImpl.java | 19 +-
.../internal/AbstractManagementContext.java | 2 +-
.../mgmt/internal/EntityManagementSupport.java | 10 +-
.../persist/FileBasedStoreObjectAccessor.java | 10 +-
.../core/mgmt/persist/XmlMementoSerializer.java | 2 +-
.../mgmt/rebind/BasicEntityRebindSupport.java | 9 +-
.../mgmt/rebind/RebindExceptionHandlerImpl.java | 27 +
.../core/mgmt/rebind/RebindIteration.java | 2 +-
.../core/mgmt/rebind/RebindManagerImpl.java | 8 +
.../brooklyn/core/objs/BasicSpecParameter.java | 2 +-
.../core/plan/PlanNotRecognizedException.java | 5 +
.../brooklyn/core/plan/PlanToSpecFactory.java | 40 +-
.../core/plan/PlanToSpecTransformer.java | 3 +-
.../entity/AbstractEntitySpecResolver.java | 2 +-
.../entity/CatalogEntitySpecResolver.java | 6 +-
.../entity/DelegatingEntitySpecResolver.java | 4 +-
.../core/resolve/entity/EntitySpecResolver.java | 2 +-
.../resolve/entity/JavaEntitySpecResolver.java | 2 +-
.../brooklyn/core/sensor/AttributeMap.java | 5 +-
...actFormatSpecificTypeImplementationPlan.java | 52 +
.../typereg/AbstractTypePlanTransformer.java | 142 ++
.../core/typereg/BasicBrooklynTypeRegistry.java | 126 +-
.../core/typereg/BasicRegisteredType.java | 135 ++
.../typereg/BasicTypeImplementationPlan.java | 41 +
.../typereg/BrooklynTypePlanTransformer.java | 88 ++
.../JavaClassNameTypePlanTransformer.java | 91 ++
.../core/typereg/RegisteredTypeConstraints.java | 156 --
.../core/typereg/RegisteredTypeKindVisitor.java | 45 +
.../typereg/RegisteredTypeLoadingContexts.java | 236 +++
.../core/typereg/RegisteredTypePredicates.java | 28 +-
.../brooklyn/core/typereg/RegisteredTypes.java | 389 +++--
.../core/typereg/TypePlanTransformers.java | 165 ++
.../typereg/UnsupportedTypePlanException.java | 37 +
.../entity/stock/EffectorStartableImpl.java | 2 -
.../byon/SingleMachineProvisioningLocation.java | 1 -
.../LocalhostMachineProvisioningLocation.java | 6 +-
.../brooklyn/location/multi/MultiLocation.java | 2 -
.../location/ssh/SshMachineLocation.java | 122 +-
.../brooklyn/util/core/ResourcePredicates.java | 11 +
.../brooklyn/util/core/ResourceUtils.java | 6 +-
.../brooklyn/util/core/http/HttpTool.java | 63 +-
.../util/core/http/HttpToolResponse.java | 14 +-
.../util/core/internal/ssh/SshTool.java | 14 +-
.../util/core/task/BasicExecutionManager.java | 50 +-
.../brooklyn/util/core/task/ScheduledTask.java | 54 +-
...lyn.core.typereg.BrooklynTypePlanTransformer | 19 +
.../policy/basic/AbstractEntityAdjunctTest.java | 52 -
.../internal/SpecParameterInMetaTest.java | 139 --
.../internal/StaticTypePlanTransformer.java | 124 ++
.../internal/StaticTypePlanTransformerTest.java | 63 +
.../brooklyn/core/config/ConfigKeysTest.java | 21 +-
.../apache/brooklyn/core/feed/PollerTest.java | 191 ++-
.../core/location/AbstractLocationTest.java | 1 -
.../core/location/LocationExtensionsTest.java | 2 -
.../core/location/SimulatedLocation.java | 2 -
.../FileBasedStoreObjectAccessorWriterTest.java | 32 +-
.../core/mgmt/rebind/RebindLocationTest.java | 8 -
.../core/objs/AbstractEntityAdjunctTest.java | 52 +
.../objs/BasicSpecParameterFromListTest.java | 2 +-
.../core/plan/XmlPlanToSpecTransformer.java | 5 +-
.../core/plan/XmlPlanToSpecTransformerTest.java | 2 +
.../brooklyn/core/sensor/StaticSensorTest.java | 8 +-
.../core/test/BrooklynAppLiveTestSupport.java | 26 +-
.../core/test/BrooklynAppUnitTestSupport.java | 38 +-
.../core/test/BrooklynMgmtUnitTestSupport.java | 61 +
.../core/test/entity/TestEntityImpl.java | 1 -
.../qa/performance/AbstractPerformanceTest.java | 47 +-
.../qa/performance/EntityPerformanceTest.java | 84 +-
.../FilePersistencePerformanceTest.java | 146 +-
.../GroovyYardStickPerformanceTest.groovy | 7 +-
.../JavaYardStickPerformanceTest.java | 35 +-
.../SubscriptionPerformanceTest.java | 58 +-
.../qa/performance/TaskPerformanceTest.java | 63 +-
.../typereg/ExampleXmlTypePlanTransformer.java | 140 ++
.../ExampleXmlTypePlanTransformerTest.java | 67 +
.../JavaClassNameTypePlanTransformerTest.java | 90 ++
.../SshMachineLocationReuseIntegrationTest.java | 11 +-
.../ssh/SshMachineLocationSshToolTest.java | 131 ++
.../location/ssh/SshMachineLocationTest.java | 27 +-
.../core/internal/ssh/RecordingSshTool.java | 7 +
.../core/task/DynamicSequentialTaskTest.java | 41 +-
.../util/core/task/ScheduledExecutionTest.java | 48 +-
...che.brooklyn.core.plan.PlanToSpecTransformer | 19 -
docs/guide/index.md | 1 +
docs/guide/misc/release-notes.md | 51 +-
docs/guide/ops/catalog/index.md | 25 -
docs/guide/ops/persistence/index.md | 2 +
docs/guide/start/concept-quickstart.md | 5 +-
docs/guide/start/index.md | 3 +-
docs/guide/start/running.md | 2 +
docs/guide/test/entities.md | 143 ++
docs/guide/test/index.md | 8 +
docs/guide/yaml/yaml-reference.md | 35 +-
docs/website/documentation/faq.md | 28 +
docs/website/index.md | 2 +-
.../demo/WebClusterDatabaseExampleApp.java | 18 +-
.../location/jclouds/BrooklynImageChooser.java | 2 +-
.../location/jclouds/JcloudsLocation.java | 226 +--
.../jclouds/JcloudsSshMachineLocation.java | 1 -
.../brooklyn/location/jclouds/JcloudsUtil.java | 50 +-
.../BlobStorePersistencePerformanceTest.java | 39 +-
.../jclouds/AbstractJcloudsLiveTest.java | 4 +
.../jclouds/BailOutJcloudsLocation.java | 3 -
.../location/jclouds/JcloudsLoginLiveTest.java | 126 +-
.../policy/jclouds/os/CreateUserPolicyTest.java | 2 -
pom.xml | 4 +-
.../entity/machine/pool/ServerPoolLocation.java | 2 -
.../entity/resolve/ChefEntitySpecResolver.java | 2 +-
.../HardcodedCatalogEntitySpecResolver.java | 2 +-
.../base/AbstractSoftwareProcessDriver.java | 2 +-
.../brooklyn/entity/java/JavaOptsTest.java | 21 +-
.../entity/software/base/EntitySshToolTest.java | 107 ++
.../base/SoftwareProcessEntityRebindTest.java | 2 -
.../base/SoftwareProcessEntityTest.java | 2 -
.../base/lifecycle/StartStopSshDriverTest.java | 4 +-
.../mgmt/usage/LocationUsageTrackingTest.java | 2 -
.../nosql/couchbase/CouchbaseNodeImpl.java | 3 +-
.../nosql/elasticsearch/ElasticSearchNode.java | 29 +-
.../nosql/mongodb/AbstractMongoDBServer.java | 14 +-
.../brooklyn/entity/nosql/redis/RedisStore.java | 10 +-
.../entity/nosql/redis/RedisStoreImpl.java | 2 +-
.../entity/webapp/jboss/JBoss7Server.java | 14 +-
.../entity/webapp/tomcat/TomcatServer.java | 19 +-
.../nginx/NginxRebindWithHaIntegrationTest.java | 9 +-
usage/all/pom.xml | 6 +
.../api/AssemblyTemplateSpecInstantiator.java | 7 +-
.../BrooklynAssemblyTemplateInstantiator.java | 13 +-
.../BrooklynComponentTemplateResolver.java | 2 +-
.../BrooklynEntityDecorationResolver.java | 5 +-
.../spi/creation/BrooklynEntityMatcher.java | 2 +-
.../creation/BrooklynYamlTypeInstantiator.java | 2 +-
.../brooklyn/spi/creation/CampCatalogUtils.java | 54 +-
.../spi/creation/CampInternalUtils.java | 247 +++
.../brooklyn/spi/creation/CampResolver.java | 147 ++
.../spi/creation/CampToSpecTransformer.java | 17 +-
.../spi/creation/CampTypePlanTransformer.java | 98 ++
.../camp/brooklyn/spi/creation/CampUtils.java | 267 ----
.../service/ServiceTypeResolverAdaptor.java | 2 +-
.../service/UrlServiceSpecResolver.java | 20 +-
...lyn.core.typereg.BrooklynTypePlanTransformer | 19 +
.../camp/brooklyn/AbstractYamlTest.java | 39 +-
.../BrooklynYamlTypeInstantiatorTest.java | 2 +-
.../camp/brooklyn/DslAndRebindYamlTest.java | 3 +-
.../camp/brooklyn/EntitiesYamlTest.java | 2 +
.../camp/brooklyn/LocationsYamlTest.java | 4 +-
.../camp/brooklyn/ReferencedYamlTest.java | 1 +
.../CatalogOsgiVersionMoreEntityTest.java | 18 +-
.../brooklyn/catalog/CatalogParametersTest.java | 318 ----
.../catalog/CatalogYamlLocationTest.java | 3 +-
.../catalog/SpecParameterParsingTest.java | 156 ++
.../catalog/SpecParameterUnwrappingTest.java | 379 +++++
.../brooklyn/test/lite/CampYamlLiteTest.java | 6 +-
.../test/lite/TestAppAssemblyInstantiator.java | 10 +-
usage/dist/licensing/overrides.yaml | 96 +-
usage/dist/src/main/license/files/LICENSE | 92 +-
usage/jsgui/pom.xml | 9 +-
usage/jsgui/src/main/license/files/LICENSE | 54 +-
.../src/main/license/source-inclusions.yaml | 1 +
.../src/main/webapp/assets/html/swagger-ui.html | 78 +
.../main/webapp/assets/js/libs/swagger-ui.js | 1410 ------------------
.../src/main/webapp/assets/js/libs/swagger.js | 708 ---------
usage/jsgui/src/main/webapp/assets/js/router.js | 16 +-
.../src/main/webapp/assets/js/view/apidoc.js | 82 -
.../assets/js/view/application-add-wizard.js | 11 +-
.../webapp/assets/js/view/entity-details.js | 2 +-
.../main/webapp/assets/swagger-ui/css/print.css | 1195 +++++++++++++++
.../main/webapp/assets/swagger-ui/css/reset.css | 144 ++
.../webapp/assets/swagger-ui/css/screen.css | 1301 ++++++++++++++++
.../main/webapp/assets/swagger-ui/css/style.css | 269 ++++
.../webapp/assets/swagger-ui/css/typography.css | 45 +
.../fonts/droid-sans-v6-latin-700.eot | Bin 0 -> 22922 bytes
.../fonts/droid-sans-v6-latin-700.svg | 411 +++++
.../fonts/droid-sans-v6-latin-700.ttf | Bin 0 -> 40513 bytes
.../fonts/droid-sans-v6-latin-700.woff | Bin 0 -> 25992 bytes
.../fonts/droid-sans-v6-latin-700.woff2 | Bin 0 -> 11480 bytes
.../fonts/droid-sans-v6-latin-regular.eot | Bin 0 -> 22008 bytes
.../fonts/droid-sans-v6-latin-regular.svg | 403 +++++
.../fonts/droid-sans-v6-latin-regular.ttf | Bin 0 -> 39069 bytes
.../fonts/droid-sans-v6-latin-regular.woff | Bin 0 -> 24868 bytes
.../fonts/droid-sans-v6-latin-regular.woff2 | Bin 0 -> 11304 bytes
.../assets/swagger-ui/images/explorer_icons.png | Bin 0 -> 5763 bytes
.../assets/swagger-ui/images/pet_store_api.png | Bin 0 -> 824 bytes
.../assets/swagger-ui/images/throbber.gif | Bin 0 -> 9257 bytes
.../assets/swagger-ui/images/wordnik_api.png | Bin 0 -> 980 bytes
.../assets/swagger-ui/lib/backbone-min.js | 34 +
.../assets/swagger-ui/lib/handlebars-2.0.0.js | 20 +
.../assets/swagger-ui/lib/jquery-1.8.0.min.js | 21 +
.../assets/swagger-ui/lib/jquery.ba-bbq.min.js | 29 +
.../assets/swagger-ui/lib/jquery.wiggle.min.js | 27 +
.../main/webapp/assets/swagger-ui/lib/marked.js | 1285 ++++++++++++++++
.../assets/swagger-ui/lib/swagger-ui.min.js | 37 +
.../assets/swagger-ui/lib/underscore-min.js | 25 +
.../assets/swagger-ui/lib/underscore-min.map | 1 +
usage/jsgui/src/main/webapp/index.html | 32 +-
.../jsgui/BrooklynJavascriptGuiLauncher.java | 2 +-
.../brooklyn/launcher/BrooklynWebServer.java | 2 +
.../org/apache/brooklyn/rest/api/ServerApi.java | 4 +-
usage/rest-client/pom.xml | 57 +-
.../brooklyn/rest/filter/SwaggerFilter.java | 66 +-
.../rest/resources/ApplicationResource.java | 14 +-
.../rest/resources/CatalogResource.java | 5 +-
.../rest/transform/CatalogTransformer.java | 5 +-
.../rest/util/BrooklynRestResourceUtils.java | 2 +-
.../rest/resources/UsageResourceTest.java | 2 -
usage/test-framework/pom.xml | 90 ++
.../brooklyn/test/framework/AbstractTest.java | 67 +
.../brooklyn/test/framework/BaseTest.java | 63 +
.../test/framework/ParallelTestCase.java | 32 +
.../test/framework/ParallelTestCaseImpl.java | 142 ++
.../brooklyn/test/framework/TestCase.java | 30 +
.../brooklyn/test/framework/TestCaseImpl.java | 79 +
.../brooklyn/test/framework/TestEffector.java | 47 +
.../test/framework/TestEffectorImpl.java | 96 ++
.../brooklyn/test/framework/TestHttpCall.java | 37 +
.../test/framework/TestHttpCallImpl.java | 124 ++
.../brooklyn/test/framework/TestSensor.java | 37 +
.../brooklyn/test/framework/TestSensorImpl.java | 155 ++
.../test/framework/TestEffectorTest.java | 125 ++
.../brooklyn/test/framework/TestSensorTest.java | 286 ++++
.../test/framework/entity/TestEntity.java | 74 +
.../test/framework/entity/TestEntityImpl.java | 59 +
.../resources/test-framework-examples/README.md | 28 +
.../example-catalog-test.bom | 40 +
.../test-framework-examples/example-catalog.bom | 33 +
.../nginx-test-examples.yml | 116 ++
.../testhttpcall-examples.yml | 142 ++
.../tomcat-test-examples.yml | 63 +
.../brooklyn/test/PerformanceTestUtils.java | 82 +-
.../test/performance/FilePersister.java | 85 ++
.../brooklyn/test/performance/Histogram.java | 89 ++
.../performance/MeasurementResultPersister.java | 29 +
.../test/performance/PerformanceMeasurer.java | 156 ++
.../performance/PerformanceTestDescriptor.java | 208 +++
.../test/performance/PerformanceTestResult.java | 62 +
.../test/performance/PerformanceTestUtils.java | 107 ++
.../brooklyn/util/JavaGroovyEquivalents.java | 9 +-
.../brooklyn/util/exceptions/Exceptions.java | 29 +-
.../exceptions/PropagatedRuntimeException.java | 6 +
.../org/apache/brooklyn/util/io/FileUtil.java | 18 +-
.../apache/brooklyn/util/net/Networking.java | 7 +
.../util/net/ReachableSocketFinder.java | 154 ++
.../apache/brooklyn/util/text/Identifiers.java | 13 +-
.../util/exceptions/ExceptionsTest.java | 22 +
.../brooklyn/util/maven/MavenArtifactTest.java | 10 +-
.../brooklyn/util/net/NetworkingUtilsTest.java | 9 +-
.../util/net/ReachableSocketFinderTest.java | 165 ++
.../brooklyn/util/ssh/IptablesCommandsTest.java | 2 +-
.../brooklyn/util/text/IdentifiersTest.java | 13 +
.../rest/apidoc/RestApiResourceScanner.java | 18 +-
.../osgi/more-entities-v2-evil-twin/pom.xml | 2 +-
.../dependencies/osgi/more-entities-v2/pom.xml | 4 +-
.../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 15745 -> 15646 bytes
...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 13922 -> 13811 bytes
utils/swagger-annotations/pom.xml | 44 -
.../brooklyn/swagger/annotations/Apidoc.java | 33 -
.../TestResourceUnavailableException.java | 3 +-
288 files changed, 14060 insertions(+), 5252 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java
index ec3f669,002c6b5..0bfa4de
--- a/core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java
+++ b/core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java
@@@ -66,10 -92,10 +92,10 @@@ public class PlanToSpecFactory
}
}
} else {
- result.addAll(getAll());
+ result.addAll(getAll(includeSuperseded));
}
for(PlanToSpecTransformer t : result) {
- t.injectManagementContext(mgmt);
+ t.setManagementContext(mgmt);
}
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/core/src/main/java/org/apache/brooklyn/core/resolve/entity/AbstractEntitySpecResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/core/src/test/java/org/apache/brooklyn/core/plan/XmlPlanToSpecTransformer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampToSpecTransformer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/UrlServiceSpecResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/640a0b28/usage/jsgui/pom.xml
----------------------------------------------------------------------
[03/21] incubator-brooklyn git commit: [BROOKLYN-183] Finished karaf
feature brooklyn-camp-server
Posted by ha...@apache.org.
[BROOKLYN-183] Finished karaf feature brooklyn-camp-server
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/badf6df4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/badf6df4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/badf6df4
Branch: refs/heads/master
Commit: badf6df4283833ab217eb98595deb432a60c96fb
Parents: 9b633bd
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Sat Oct 31 00:30:08 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Thu Nov 12 18:11:42 2015 +0200
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 38 ++++++++++++++++++--
.../features/src/main/history/dependencies.xml | 20 ++++++++++-
usage/rest-api/pom.xml | 4 +++
.../brooklyn/rest/BrooklynRestApiLauncher.java | 1 +
utils/rest-swagger/pom.xml | 2 --
5 files changed, 60 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/badf6df4/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index d5a5622..cf95ff7 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -70,8 +70,9 @@
<!-- TODO: jersey osgi feature -->
<bundle dependency="true">mvn:com.sun.jersey/jersey-server/${jersey.version}</bundle>
<bundle dependency="true">mvn:com.sun.jersey/jersey-core/${jersey.version}</bundle>
- <!--<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet-api.version}</bundle>-->
- <bundle dependency="true">mvn:org.eclipse.jetty.orbit/javax.servlet/${jetty-orbit-javax-servlet.version}</bundle>
+ <bundle dependency="true">mvn:com.sun.jersey/jersey-servlet/${jersey.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
+ <bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet.version}</bundle>
</feature>
@@ -94,6 +95,7 @@
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet.version}</bundle>
</feature>
<feature name="brooklyn-api" version="${project.version}" description="Brooklyn API">
@@ -137,6 +139,38 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>
</feature>
+
+ <feature name="brooklyn-camp-brooklyn" version="${project.version}" description="Brooklyn CAMP REST API">
+ <bundle>mvn:org.apache.brooklyn/brooklyn-camp/${project.version}</bundle>
+ </feature>
+
+ <feature name="brooklyn-camp-base" version="${project.version}" description="Brooklyn CAMP Base">
+ <bundle>mvn:org.apache.brooklyn.camp/camp-base/${project.version}</bundle>
+
+ <feature>brooklyn-utils-common</feature>
+ <bundle dependency="true">mvn:org.apache.commons/commons-compress/${commons-compress.version}</bundle>
+ <bundle dependency="true">wrap:mvn:org.tukaani/xz/${commons-compress.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
+ </feature>
+
+ <feature name="brooklyn-camp-server" version="${project.version}" description="Brooklyn CAMP Server">
+ <bundle>mvn:org.apache.brooklyn.camp/camp-server/${project.version}</bundle>
+
+ <feature>brooklyn-camp-base</feature>
+ <feature>brooklyn-utils-rest-swagger</feature>
+ <feature>jetty</feature> <!-- TODO: pax-jetty??? -->
+
+ <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle>
+ </feature>
+
+
+
+ <feature name="brooklyn-rest-server" version="${project.version}" description="Brooklyn REST Server">
+ <bundle>mvn:org.apache.brooklyn/brooklyn-rest-server/${project.version}</bundle>
+ <feature>brooklyn-core</feature>
+ <feature>brooklyn-rest-api</feature>
+
+ </feature>
<feature name="brooklyn-commands" version="${project.version}" description="Brooklyn Shell Commands">
<bundle>mvn:org.apache.brooklyn/brooklyn-commands/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/badf6df4/karaf/features/src/main/history/dependencies.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/history/dependencies.xml b/karaf/features/src/main/history/dependencies.xml
index 1a1740f..571053f 100644
--- a/karaf/features/src/main/history/dependencies.xml
+++ b/karaf/features/src/main/history/dependencies.xml
@@ -3,10 +3,16 @@
<feature version="0.0.0">
<feature prerequisite="false" dependency="false">brooklyn-api</feature>
<feature prerequisite="false" dependency="false">brooklyn-api</feature>
+ <feature prerequisite="false" dependency="false">brooklyn-camp-base</feature>
+ <feature prerequisite="false" dependency="false">brooklyn-core</feature>
+ <feature prerequisite="false" dependency="false">brooklyn-rest-api</feature>
<feature prerequisite="false" dependency="false">brooklyn-utils-common</feature>
<feature prerequisite="false" dependency="false">brooklyn-utils-common</feature>
<feature prerequisite="false" dependency="false">brooklyn-utils-common</feature>
+ <feature prerequisite="false" dependency="false">brooklyn-utils-common</feature>
+ <feature prerequisite="false" dependency="false">brooklyn-utils-rest-swagger</feature>
<feature prerequisite="false" dependency="false">brooklyn-utils-rest-swagger</feature>
+ <feature prerequisite="false" dependency="false">jetty</feature>
<feature prerequisite="false" dependency="false">swagger</feature>
<bundle>mvn:ch.qos.logback/logback-classic/1.0.7</bundle>
<bundle>mvn:ch.qos.logback/logback-core/1.0.7</bundle>
@@ -26,25 +32,35 @@
<bundle>mvn:com.sun.jersey/jersey-core/1.18.1</bundle>
<bundle>mvn:com.sun.jersey/jersey-server/1.18.1</bundle>
<bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle>
+ <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle>
<bundle>mvn:com.thoughtworks.xstream/xstream/1.4.7</bundle>
<bundle>mvn:commons-codec/commons-codec/1.9</bundle>
<bundle>mvn:commons-io/commons-io/2.4</bundle>
<bundle>mvn:commons-lang/commons-lang/2.4</bundle>
<bundle>mvn:io.swagger/swagger-annotations/1.5.3</bundle>
<bundle>mvn:io.swagger/swagger-models/1.5.3</bundle>
+ <bundle>mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
+ <bundle>mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
<bundle>mvn:net.minidev/asm/1.0.2</bundle>
<bundle>mvn:net.minidev/json-smart/2.1.1</bundle>
<bundle>mvn:net.schmizz/sshj/0.8.1</bundle>
+ <bundle>mvn:org.apache.brooklyn.camp/camp-base/0.9.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.brooklyn.camp/camp-server/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-api/0.9.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.brooklyn/brooklyn-camp/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-commands/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-core/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-logback-includes/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-rest-api/0.9.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.brooklyn/brooklyn-rest-server/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-rt-osgi/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-utils-groovy/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-utils-rest-swagger/0.9.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.commons/commons-compress/1.4</bundle>
+ <bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle>
+ <bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle>
<bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.4.1</bundle>
@@ -55,10 +71,11 @@
<bundle>mvn:org.bouncycastle/bcprov-ext-jdk15on/1.49</bundle>
<bundle>mvn:org.codehaus.groovy/groovy-all/2.3.7</bundle>
<bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
+ <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
+ <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
<bundle>mvn:org.codehaus.jackson/jackson-jaxrs/1.9.13</bundle>
<bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle>
<bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle>
- <bundle>mvn:org.eclipse.jetty.orbit/javax.servlet/3.0.0.v201112011016</bundle>
<bundle>mvn:org.freemarker/freemarker/2.3.22</bundle>
<bundle>mvn:org.jvnet.mimepull/mimepull/1.9.3</bundle>
<bundle>mvn:org.slf4j/jul-to-slf4j/1.6.6</bundle>
@@ -68,6 +85,7 @@
<bundle>wrap:mvn:io.swagger/swagger-core/1.5.3</bundle>
<bundle>wrap:mvn:io.swagger/swagger-jaxrs/1.5.3</bundle>
<bundle>wrap:mvn:javax.validation/validation-api/1.0.0.GA</bundle>
+ <bundle>wrap:mvn:org.tukaani/xz/1.4</bundle>
<bundle>wrap:mvn:xpp3/xpp3_min/1.1.4c</bundle>
</feature>
</features>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/badf6df4/usage/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml
index bc54587..48189db 100644
--- a/usage/rest-api/pom.xml
+++ b/usage/rest-api/pom.xml
@@ -86,6 +86,10 @@
<artifactId>swagger-annotations</artifactId>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/badf6df4/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
index c3ae9cc..d35247c 100644
--- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
+++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
@@ -72,6 +72,7 @@ import com.sun.jersey.api.core.ResourceConfig;
import com.sun.jersey.spi.container.servlet.ServletContainer;
import org.eclipse.jetty.server.NetworkConnector;
import org.apache.brooklyn.rest.filter.SwaggerFilter;
+import org.eclipse.jetty.server.NetworkConnector;
/** Convenience and demo for launching programmatically. Also used for automated tests.
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/badf6df4/utils/rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml
index 42e9767..61e5fa4 100644
--- a/utils/rest-swagger/pom.xml
+++ b/utils/rest-swagger/pom.xml
@@ -84,13 +84,11 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
-
</dependencies>
</project>
[09/21] incubator-brooklyn git commit: [BROOKLYN-185] Inline
swagger-core and swagger-jaxrs into brooklyn-utils-rest-swagger
Posted by ha...@apache.org.
[BROOKLYN-185] Inline swagger-core and swagger-jaxrs into brooklyn-utils-rest-swagger
swagger-core and swagger-jaxrs versions 1.5.3 have package
io.swagger.config, which leads to a split-package situation.
The selected workaround is to inline both these dependencies into
brooklyn-utils-rest-swagger and re-export them for higher level client
code. When brooklyn moves to guava-18.0 we can migrate to swagger 1.5.4,
which are properly bundled.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c61f719a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c61f719a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c61f719a
Branch: refs/heads/master
Commit: c61f719a50d10908e2c2dd4a3b4539173d540ae6
Parents: c718ff3
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Wed Nov 18 17:51:29 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Wed Nov 18 17:51:29 2015 +0200
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 12 ++--
.../features/src/main/history/dependencies.xml | 4 +-
utils/rest-swagger/pom.xml | 64 +++++++++++++++++++-
3 files changed, 69 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c61f719a/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 46f7a0e..384bc7d 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -27,10 +27,11 @@
<!--<bundle dependency="true">mvn:javax.ws.rs/jsr311-api/${jsr311-api.version}</bundle>-->
<!--<bundle dependency="true">mvn:javax.ws.rs/javax.ws.rs-api/${javax.ws.rs-api}</bundle>-->
- <feature name="swagger" version="${swagger.version}" description="Swagger Annotations+Core+JAXRS+Models">
+ <!-- temporary feature until we migrate to swagger-1.5.4, which is properly bundled -->
+ <feature name="swagger-crippled" version="${swagger.version}" description="Swagger Annotations+Core+JAXRS+Models">
<bundle>mvn:io.swagger/swagger-annotations/${swagger.version}</bundle>
- <bundle>wrap:mvn:io.swagger/swagger-core/${swagger.version}</bundle>
- <bundle>wrap:mvn:io.swagger/swagger-jaxrs/${swagger.version}</bundle>
+<!-- <bundle>wrap:mvn:io.swagger/swagger-core/${swagger.version}</bundle>
+ <bundle>wrap:mvn:io.swagger/swagger-jaxrs/${swagger.version}</bundle>-->
<bundle>mvn:io.swagger/swagger-models/${swagger.version}</bundle>
<!--<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist.bundle.version}</bundle>-->
@@ -41,9 +42,6 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${fasterxml.jackson.version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
- <!--<bundle>mvn:com.thoughtworks.paranamer/paranamer/${thoughtworks.paranamer.version}</bundle>-->
- <!--<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle>-->
- <!--<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>-->
</feature>
<feature name="brooklyn-utils-common" version="${project.version}" description="Brooklyn Common Utils">
@@ -70,7 +68,7 @@
<feature name="brooklyn-utils-rest-swagger" version="${project.version}" description="Brooklyn REST Swagger Apidoc Utilities">
<feature>brooklyn-utils-common</feature>
- <feature version="${swagger.version}">swagger</feature>
+ <feature version="${swagger.version}">swagger-crippled</feature>
<bundle>mvn:org.apache.brooklyn/brooklyn-utils-rest-swagger/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c61f719a/karaf/features/src/main/history/dependencies.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/history/dependencies.xml b/karaf/features/src/main/history/dependencies.xml
index 1417ea8..98add88 100644
--- a/karaf/features/src/main/history/dependencies.xml
+++ b/karaf/features/src/main/history/dependencies.xml
@@ -17,7 +17,7 @@
<feature prerequisite="false" dependency="false">brooklyn-utils-rest-swagger</feature>
<feature prerequisite="false" dependency="false">brooklyn-utils-rest-swagger</feature>
<feature prerequisite="false" dependency="false">jetty</feature>
- <feature prerequisite="false" dependency="false">swagger</feature>
+ <feature prerequisite="false" dependency="false">swagger-crippled</feature>
<feature prerequisite="false" dependency="false">war</feature>
<feature prerequisite="false" dependency="false">war</feature>
<bundle>mvn:ch.qos.logback/logback-classic/1.0.7</bundle>
@@ -96,8 +96,6 @@
<bundle>mvn:org.yaml/snakeyaml/1.11</bundle>
<bundle>wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc</bundle>
<bundle>wrap:mvn:com.maxmind.geoip2/geoip2/0.8.1</bundle>
- <bundle>wrap:mvn:io.swagger/swagger-core/1.5.3</bundle>
- <bundle>wrap:mvn:io.swagger/swagger-jaxrs/1.5.3</bundle>
<bundle>wrap:mvn:javax.validation/validation-api/1.0.0.GA</bundle>
<bundle>wrap:mvn:org.tukaani/xz/1.4</bundle>
<bundle>wrap:mvn:xpp3/xpp3_min/1.1.4c</bundle>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c61f719a/utils/rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml
index 61e5fa4..6f9a86f 100644
--- a/utils/rest-swagger/pom.xml
+++ b/utils/rest-swagger/pom.xml
@@ -19,7 +19,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<artifactId>brooklyn-utils-rest-swagger</artifactId>
<name>Brooklyn REST Swagger Apidoc Utilities</name>
@@ -90,5 +90,67 @@
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <!-- <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>io.swagger:swagger-core</include>
+ <include>io.swagger:swagger-jaxrs</include>
+ </includes>
+ </artifactSet>
+ <finalName>${project.artifactId}-${project.version}-with-swagger</finalName>
+ <outputFile>${project.build.directory}/${project.artifactId}-shaded-${project.version}.jar</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>-->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>jar</supportedProjectType>
+ <supportedProjectType>bundle</supportedProjectType>
+ </supportedProjectTypes>
+ <excludeDependencies>brooklyn-util-common,brooklyn-logback-includes</excludeDependencies>
+ <instructions>
+ <!--
+ This tells maven-bundle-plugin to include and export swagger-core and swagger-jaxrs into this bundle,
+ but to not include other dependencies that are properly bundled themselves.
+ We also need the swagger packages exported, since we're going to use them in higher-level bundles.
+
+ The only way I could convince maven-bundle-plugin to do all this was to manually specify the packages
+ in swagger-core and swagger-jaxrs versions 1.5.3
+
+ FIXME: move to >=swagger-1.5.4 (which does not suffer from split packages and is a proper bundle),
+ but those depend on guava-18.0 instead of brooklyn's currently used guava-17.x
+ -->
+ <Export-Package>
+ org.apache.brooklyn.rest.*,
+ io.swagger.config.*,
+ io.swagger.converter.*,
+ io.swagger.core.filter.*,
+ io.swagger.jackson.*,
+ io.swagger.model.*,
+ io.swagger.util.*,
+ io.swagger.jaxrs.*,
+ !*
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
[17/21] incubator-brooklyn git commit: [BROOKLYN-183] Fix OSGi
imports for brooklyn-camp
Posted by ha...@apache.org.
[BROOKLYN-183] Fix OSGi imports for brooklyn-camp
New unrelated code added an unwanted dependency towards jython, that
causes the karaf assembly to break. Ignoring this dependency for now,
until winrm work and its jython dependency gets isolated in a proper
bundle.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f86e2da0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f86e2da0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f86e2da0
Branch: refs/heads/master
Commit: f86e2da0ce5ce5c02c65119aa9d29e9cd7176775
Parents: 74d890d
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Mon Nov 23 18:35:13 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Mon Nov 23 18:42:28 2015 +0200
----------------------------------------------------------------------
usage/camp/pom.xml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f86e2da0/usage/camp/pom.xml
----------------------------------------------------------------------
diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml
index 35ceca2..d04eef6 100644
--- a/usage/camp/pom.xml
+++ b/usage/camp/pom.xml
@@ -186,6 +186,23 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>jar</supportedProjectType>
+ </supportedProjectTypes>
+ <instructions>
+ <Export-Package>org.apache.brooklyn.*</Export-Package>
+ <Import-Package>
+ !org.python.google.common.collect
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+
<!-- if you want to build a WAR, full or skinny:
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[07/21] incubator-brooklyn git commit: [BROOKLYN-183] Bump jersey
version to 1.19
Posted by ha...@apache.org.
[BROOKLYN-183] Bump jersey version to 1.19
jersey-core-1.18.1 suffers from the split-package problem by providing
javax.ws.rs*, which can affect OSGi bundle resolution
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f154e033
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f154e033
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f154e033
Branch: refs/heads/master
Commit: f154e0334e13077611e891a59b46c5155870b446
Parents: 094e6e4
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Wed Nov 18 00:30:31 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Wed Nov 18 00:31:45 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
usage/downstream-parent/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f154e033/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3235e24..8431b13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
<xstream.version>1.4.7</xstream.version>
<jackson.version>1.9.13</jackson.version> <!-- codehaus jackson, used by brooklyn rest server -->
<fasterxml.jackson.version>2.4.5</fasterxml.jackson.version> <!-- more recent jackson, but not compatible with old annotations! -->
- <jersey.version>1.18.1</jersey.version>
+ <jersey.version>1.19</jersey.version>
<httpclient.version>4.4.1</httpclient.version>
<commons-lang3.version>3.1</commons-lang3.version>
<groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f154e033/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 9ce2329..6580281 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -58,8 +58,8 @@
<guava.version>17.0</guava.version>
<xstream.version>1.4.7</xstream.version>
<jackson.version>1.9.13</jackson.version> <!-- codehaus jackson, used by brooklyn rest server -->
- <fasterxml.jackson.version>2.4.2</fasterxml.jackson.version> <!-- more recent jackson, but not compatible with old annotations! -->
- <jersey.version>1.18.1</jersey.version>
+ <fasterxml.jackson.version>2.4.5</fasterxml.jackson.version> <!-- more recent jackson, but not compatible with old annotations! -->
+ <jersey.version>1.19</jersey.version>
<httpclient.version>4.4.1</httpclient.version>
<commons-lang3.version>3.1</commons-lang3.version>
<groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes -->
[13/21] incubator-brooklyn git commit: [BROOKLYN-183] Provide access
to management context in OSGi
Posted by ha...@apache.org.
[BROOKLYN-183] Provide access to management context in OSGi
In order to keep both the monolithic launcher and have the OSGi launcher
working we need a temporary solution that works both ways. This OSGi
antipattern should be removed as soon as client code gets better.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/94de4642
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/94de4642
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/94de4642
Branch: refs/heads/master
Commit: 94de46427eb84b97449456c02863fcd9ff164b7c
Parents: cbb58ba
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Thu Nov 19 20:44:31 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Thu Nov 19 20:44:31 2015 +0200
----------------------------------------------------------------------
.../apache/brooklyn/util/core/osgi/Compat.java | 69 ++++++++++++++++++++
.../BrooklynJavascriptGuiLauncherTest.java | 5 +-
.../BrooklynPropertiesSecurityFilter.java | 4 +-
.../rest/filter/HaMasterCheckFilter.java | 4 +-
.../resources/AbstractBrooklynRestResource.java | 4 +-
.../apache/brooklyn/rest/util/OsgiCompat.java | 46 +++++++++++++
.../util/json/BrooklynJacksonJsonProvider.java | 6 +-
.../brooklyn/rest/BrooklynRestApiLauncher.java | 4 +-
.../BrooklynRestApiLauncherTestFixture.java | 4 +-
9 files changed, 129 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94de4642/core/src/main/java/org/apache/brooklyn/util/core/osgi/Compat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Compat.java b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Compat.java
new file mode 100644
index 0000000..1f5d88b
--- /dev/null
+++ b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Compat.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.brooklyn.util.core.osgi;
+
+import org.apache.brooklyn.api.mgmt.ManagementContext;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * Compatibility methods between karaf launcher and monolithic launcher.
+ *
+ * @todo Remove after transition to karaf launcher.
+ */
+public class Compat {
+
+ /* synchronized by class initialization */
+ private static class SingletonHolder {
+
+ private static final Compat instance = new Compat();
+ }
+
+ public static Compat getInstance() {
+ return SingletonHolder.instance;
+ }
+
+ private final ServiceTracker managementContextTracker;
+
+ private Compat() {
+ Bundle bundle = FrameworkUtil.getBundle(Compat.class);
+ if (bundle != null) {
+ BundleContext bundleContext = bundle.getBundleContext();
+ managementContextTracker = new ServiceTracker(bundleContext, ManagementContext.class, null);
+ managementContextTracker.open();
+ } else {
+ managementContextTracker = null;
+ }
+ }
+
+ /**
+ * Provides the management context service.
+ *
+ * Either from the encompassing OSGi framework or from the servlet context, depending on which launcher was used.
+ *
+ * @todo This does not allow ungetting the service after usage, so the bundle will remain blocked until all dependent bundles are
+ * stopped.
+ * @fixme Drop this for good after switching to karaf launcher.
+ */
+ public ManagementContext getManagementContext() {
+ if (managementContextTracker != null) {
+ return (ManagementContext) managementContextTracker.getService();
+ }
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94de4642/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java b/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
index 16c5996..86eb4fa 100644
--- a/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
+++ b/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.brooklyn.rest.jsgui;
-import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.test.HttpTestUtils;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ContextHandler;
@@ -26,8 +25,8 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.core.entity.Entities;
-import org.apache.brooklyn.core.server.BrooklynServiceAttributes;
import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture;
+import org.apache.brooklyn.rest.util.OsgiCompat;
import org.eclipse.jetty.server.NetworkConnector;
/** Convenience and demo for launching programmatically. */
@@ -76,7 +75,7 @@ public class BrooklynJavascriptGuiLauncherTest {
}
private ManagementContext getManagementContextFromJettyServerAttributes(Server server) {
- return (ManagementContext) ((ContextHandler)server.getHandler()).getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
+ return OsgiCompat.getManagementContext((ContextHandler) server.getHandler());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94de4642/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
index 5e43f20..07afa7a 100644
--- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
+++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
@@ -36,11 +36,11 @@ import org.slf4j.LoggerFactory;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.core.mgmt.entitlement.Entitlements;
import org.apache.brooklyn.core.mgmt.entitlement.WebEntitlementContext;
-import org.apache.brooklyn.core.server.BrooklynServiceAttributes;
import org.apache.brooklyn.rest.security.provider.DelegatingSecurityProvider;
import org.apache.brooklyn.util.text.Strings;
import com.sun.jersey.core.util.Base64;
+import org.apache.brooklyn.rest.util.OsgiCompat;
/**
* Provides basic HTTP authentication.
@@ -155,7 +155,7 @@ public class BrooklynPropertiesSecurityFilter implements Filter {
@Override
public void init(FilterConfig config) throws ServletException {
- ManagementContext mgmt = (ManagementContext) config.getServletContext().getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
+ ManagementContext mgmt = OsgiCompat.getManagementContext(config.getServletContext());
provider = new DelegatingSecurityProvider(mgmt);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94de4642/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java
index 2020c13..71c6c27 100644
--- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java
+++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java
@@ -36,12 +36,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.ha.ManagementNodeState;
-import org.apache.brooklyn.core.server.BrooklynServiceAttributes;
import org.apache.brooklyn.rest.domain.ApiError;
import org.apache.brooklyn.rest.util.WebResourceUtils;
import org.apache.brooklyn.util.text.Strings;
import com.google.common.collect.Sets;
+import org.apache.brooklyn.rest.util.OsgiCompat;
/**
* Checks that for requests that want HA master state, the server is up and in that state.
@@ -62,7 +62,7 @@ public class HaMasterCheckFilter implements Filter {
@Override
public void init(FilterConfig config) throws ServletException {
servletContext = config.getServletContext();
- mgmt = (ManagementContext) servletContext.getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
+ mgmt = OsgiCompat.getManagementContext(servletContext);
}
static String lookForProblemIfServerNotRunning(ManagementContext mgmt) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94de4642/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
index 1e058f8..a8cc909 100644
--- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
+++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
@@ -26,8 +26,8 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.core.config.render.RendererHints;
import org.apache.brooklyn.core.mgmt.ManagementContextInjectable;
-import org.apache.brooklyn.core.server.BrooklynServiceAttributes;
import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils;
+import org.apache.brooklyn.rest.util.OsgiCompat;
import org.apache.brooklyn.rest.util.WebResourceUtils;
import org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider;
import org.apache.brooklyn.util.core.task.Tasks;
@@ -53,7 +53,7 @@ public abstract class AbstractBrooklynRestResource implements ManagementContextI
protected synchronized Maybe<ManagementContext> mgmtMaybe() {
if (managementContext!=null) return Maybe.of(managementContext);
- managementContext = (ManagementContext) servletContext.getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
+ managementContext = OsgiCompat.getManagementContext(servletContext);
if (managementContext!=null) return Maybe.of(managementContext);
return Maybe.absent("ManagementContext not available for Brooklyn Jersey Resource "+this);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94de4642/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/OsgiCompat.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/OsgiCompat.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/OsgiCompat.java
new file mode 100644
index 0000000..1570efc
--- /dev/null
+++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/OsgiCompat.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.brooklyn.rest.util;
+
+import javax.servlet.ServletContext;
+import org.apache.brooklyn.api.mgmt.ManagementContext;
+import org.apache.brooklyn.core.server.BrooklynServiceAttributes;
+import org.apache.brooklyn.util.core.osgi.Compat;
+import org.eclipse.jetty.server.handler.ContextHandler;
+
+/**
+ * Compatibility methods between karaf launcher and monolithic launcher.
+ *
+ * @todo Remove after transition to karaf launcher.
+ */
+public class OsgiCompat {
+
+ public static ManagementContext getManagementContext(ServletContext servletContext) {
+ ManagementContext managementContext = Compat.getInstance().getManagementContext();
+ if (managementContext == null && servletContext != null) {
+ managementContext = (ManagementContext) servletContext.getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
+ }
+ return managementContext;
+ }
+
+ public static ManagementContext getManagementContext(ContextHandler jettyServerHandler) {
+ ManagementContext managementContext = Compat.getInstance().getManagementContext();
+ if (managementContext == null && jettyServerHandler != null) {
+ managementContext = (ManagementContext) jettyServerHandler.getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
+ }
+ return managementContext;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94de4642/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
index f6f0e2d..a58531c 100644
--- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
+++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
@@ -28,6 +28,7 @@ import org.apache.brooklyn.core.config.ConfigKeys;
import org.apache.brooklyn.core.internal.BrooklynProperties;
import org.apache.brooklyn.core.mgmt.ManagementContextInjectable;
import org.apache.brooklyn.core.server.BrooklynServiceAttributes;
+import org.apache.brooklyn.rest.util.OsgiCompat;
import org.codehaus.jackson.Version;
import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
import org.codehaus.jackson.map.ObjectMapper;
@@ -158,10 +159,7 @@ public class BrooklynJacksonJsonProvider extends JacksonJsonProvider implements
}
public static ManagementContext getManagementContext(ServletContext servletContext) {
- if (servletContext == null)
- return null;
-
- return (ManagementContext) servletContext.getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
+ return OsgiCompat.getManagementContext(servletContext);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94de4642/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
index d35247c..d003b76 100644
--- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
+++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
@@ -70,8 +70,8 @@ import com.google.common.io.Files;
import com.sun.jersey.api.core.DefaultResourceConfig;
import com.sun.jersey.api.core.ResourceConfig;
import com.sun.jersey.spi.container.servlet.ServletContainer;
-import org.eclipse.jetty.server.NetworkConnector;
import org.apache.brooklyn.rest.filter.SwaggerFilter;
+import org.apache.brooklyn.rest.util.OsgiCompat;
import org.eclipse.jetty.server.NetworkConnector;
/** Convenience and demo for launching programmatically. Also used for automated tests.
@@ -359,7 +359,7 @@ public class BrooklynRestApiLauncher {
FilterHolder filterHolder = new FilterHolder(new ServletContainer(config));
context.addFilter(filterHolder, "/*", EnumSet.allOf(DispatcherType.class));
- ManagementContext mgmt = (ManagementContext) context.getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
+ ManagementContext mgmt = OsgiCompat.getManagementContext(context);
config.getSingletons().add(new ManagementContextProvider(mgmt));
config.getSingletons().add(new ShutdownHandlerProvider(shutdownListener));
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/94de4642/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
index 6cb2970..b2c5031 100644
--- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
+++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
@@ -28,8 +28,8 @@ import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.core.internal.BrooklynProperties;
import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
import org.apache.brooklyn.core.server.BrooklynServerConfig;
-import org.apache.brooklyn.core.server.BrooklynServiceAttributes;
import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider;
+import org.apache.brooklyn.rest.util.OsgiCompat;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.eclipse.jetty.server.NetworkConnector;
@@ -104,7 +104,7 @@ public abstract class BrooklynRestApiLauncherTestFixture {
}
public static ManagementContext getManagementContextFromJettyServerAttributes(Server server) {
- return (ManagementContext) ((ContextHandler) server.getHandler()).getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
+ return OsgiCompat.getManagementContext((ContextHandler) server.getHandler());
}
}
[14/21] incubator-brooklyn git commit: Remove duplicate dependency
Posted by ha...@apache.org.
Remove duplicate dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9602cae2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9602cae2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9602cae2
Branch: refs/heads/master
Commit: 9602cae25308a09fa27268bd31f1eaba8e300294
Parents: 94de464
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Sun Nov 22 02:20:20 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Sun Nov 22 02:20:20 2015 +0200
----------------------------------------------------------------------
usage/rest-api/pom.xml | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9602cae2/usage/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml
index 48189db..bc54587 100644
--- a/usage/rest-api/pom.xml
+++ b/usage/rest-api/pom.xml
@@ -86,10 +86,6 @@
<artifactId>swagger-annotations</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
[19/21] incubator-brooklyn git commit: [BROOKLYN-183] Drop unneeded
code
Posted by ha...@apache.org.
[BROOKLYN-183] Drop unneeded code
The settings in pom.xml are inherited from the parent and not needed here.
javax-servlet-api.version is already provided by parent pom.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/943c1371
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/943c1371
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/943c1371
Branch: refs/heads/master
Commit: 943c1371f0ec25189c106b3a7b5bba660b497e6a
Parents: f86e2da
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Tue Nov 24 23:40:59 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Tue Nov 24 23:43:13 2015 +0200
----------------------------------------------------------------------
core/pom.xml | 2 --
.../java/org/apache/brooklyn/util/core/osgi/Osgis.java | 10 +---------
karaf/pom.xml | 2 --
usage/jsgui/pom.xml | 2 --
usage/rest-server/pom.xml | 2 --
5 files changed, 1 insertion(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/943c1371/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index f79aee7..240cc82 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -284,8 +284,6 @@
!org.apache.felix.framework,
*
</Import-Package>
- <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1>
- <Implementation-Branch>${scmBranch}</Implementation-Branch>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/943c1371/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
index 8777032..7defcb6 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
@@ -309,9 +309,6 @@ public class Osgis {
* When running inside an OSGi container, the container framework is returned.
* When running standalone a new Apache Felix container is created.
*
- * Calling {@link #ungetFramework(Framework) } is needed in both cases, either to stop
- * the embedded framework or to release the service reference.
- *
* @param felixCacheDir
* @param clean
* @return
@@ -337,12 +334,7 @@ public class Osgis {
*/
public static void ungetFramework(Framework framework) {
final Bundle bundle = FrameworkUtil.getBundle(Osgis.class);
- if (bundle != null) {
-// // already running inside an OSGi container
-// final BundleContext ctx = bundle.getBundleContext();
-// final ServiceReference<Framework> ref = ctx.getServiceReference(Framework.class);
-// ctx.ungetService(ref);
- } else {
+ if (bundle == null) {
EmbeddedFelixFramework.stopFramework(framework);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/943c1371/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 0d555cd..f703864 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -37,8 +37,6 @@
<lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
- <javax-servlet-api.version>3.1.0</javax-servlet-api.version>
-
<!-- pax-exam -->
<pax.exam.version>4.5.0</pax.exam.version>
<pax.url.version>2.4.1</pax.url.version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/943c1371/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index 03514aa..c9631c6 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -276,8 +276,6 @@
</supportedProjectTypes>
<instructions>
<Web-ContextPath>/</Web-ContextPath>
- <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1>
- <Implementation-Branch>${scmBranch}</Implementation-Branch>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/943c1371/usage/rest-server/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml
index d343bfe..ff5ef1b 100644
--- a/usage/rest-server/pom.xml
+++ b/usage/rest-server/pom.xml
@@ -272,8 +272,6 @@
*
</Import-Package>
<Export-Package>org.apache.brooklyn.*</Export-Package>
- <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1>
- <Implementation-Branch>${scmBranch}</Implementation-Branch>
<Web-ContextPath>/</Web-ContextPath>
<_wab>src/main/webapp</_wab>
</instructions>
[12/21] incubator-brooklyn git commit: [BROOKLYN-183] Allow
spring-like injection of management context
Posted by ha...@apache.org.
[BROOKLYN-183] Allow spring-like injection of management context
Allow 3rd party libs to inject the managment context into various
objects by renaming MagementContextInjectable.injectManagementContext()
to setManagementContext().
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/cbb58baa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/cbb58baa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/cbb58baa
Branch: refs/heads/master
Commit: cbb58baab12556ac53458f7b539c0c8a761e2e69
Parents: d5e216f
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Thu Nov 19 12:52:08 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Thu Nov 19 12:52:08 2015 +0200
----------------------------------------------------------------------
.../brooklyn/core/catalog/internal/CatalogInitialization.java | 2 +-
.../core/catalog/internal/JavaCatalogToSpecTransformer.java | 2 +-
.../apache/brooklyn/core/mgmt/ManagementContextInjectable.java | 2 +-
.../brooklyn/core/mgmt/internal/AbstractManagementContext.java | 4 ++--
.../apache/brooklyn/core/mgmt/internal/LocalUsageManager.java | 2 +-
.../org/apache/brooklyn/core/objs/BasicConfigurableObject.java | 2 +-
.../java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java | 2 +-
.../brooklyn/core/resolve/entity/AbstractEntitySpecResolver.java | 2 +-
.../brooklyn/core/catalog/internal/TestToSpecTransformer.java | 2 +-
.../org/apache/brooklyn/core/plan/XmlPlanToSpecTransformer.java | 2 +-
.../brooklyn/spi/creation/BrooklynComponentTemplateResolver.java | 2 +-
.../camp/brooklyn/spi/creation/CampToSpecTransformer.java | 2 +-
.../brooklyn/spi/creation/service/CampServiceSpecResolver.java | 2 +-
.../brooklyn/spi/creation/service/UrlServiceSpecResolver.java | 2 +-
.../java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java | 2 +-
.../brooklyn/rest/resources/AbstractBrooklynRestResource.java | 3 ++-
.../brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java | 2 +-
.../org/apache/brooklyn/rest/resources/ScriptResourceTest.java | 2 +-
.../org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java | 2 +-
19 files changed, 21 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java
index 525e903..37783cd 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java
@@ -108,7 +108,7 @@ public class CatalogInitialization implements ManagementContextInjectable {
}
@Override
- public void injectManagementContext(ManagementContext managementContext) {
+ public void setManagementContext(ManagementContext managementContext) {
Preconditions.checkNotNull(managementContext, "management context");
if (this.managementContext!=null && managementContext!=this.managementContext)
throw new IllegalStateException("Cannot switch management context, from "+this.managementContext+" to "+managementContext);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/core/src/main/java/org/apache/brooklyn/core/catalog/internal/JavaCatalogToSpecTransformer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/JavaCatalogToSpecTransformer.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/JavaCatalogToSpecTransformer.java
index 519bb23..4e15d24 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/JavaCatalogToSpecTransformer.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/JavaCatalogToSpecTransformer.java
@@ -50,7 +50,7 @@ public class JavaCatalogToSpecTransformer implements PlanToSpecTransformer {
private ManagementContext mgmt;
@Override
- public void injectManagementContext(ManagementContext mgmt) {
+ public void setManagementContext(ManagementContext mgmt) {
this.mgmt = mgmt;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/core/src/main/java/org/apache/brooklyn/core/mgmt/ManagementContextInjectable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ManagementContextInjectable.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ManagementContextInjectable.java
index 15bafe0..8d0a6a5 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ManagementContextInjectable.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ManagementContextInjectable.java
@@ -28,6 +28,6 @@ public interface ManagementContextInjectable {
/**
* Sets the {@link ManagementContext} reference.
*/
- public void injectManagementContext(ManagementContext managementContext);
+ public void setManagementContext(ManagementContext managementContext);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
index cba394c..b39dc15 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java
@@ -383,7 +383,7 @@ public abstract class AbstractManagementContext implements ManagementContextInte
if (!getCatalogInitialization().hasRunAnyInitialization()) {
// catalog init is needed; normally this will be done from start sequence,
// but if accessed early -- and in tests -- we will load it here
- getCatalogInitialization().injectManagementContext(this);
+ getCatalogInitialization().setManagementContext(this);
getCatalogInitialization().populateUnofficial(catalog);
}
return catalog;
@@ -481,7 +481,7 @@ public abstract class AbstractManagementContext implements ManagementContextInte
Preconditions.checkNotNull(catalogInitialization, "initialization must not be null");
if (this.catalogInitialization!=null && this.catalogInitialization != catalogInitialization)
throw new IllegalStateException("Changing catalog init from "+this.catalogInitialization+" to "+catalogInitialization+"; changes not permitted");
- catalogInitialization.injectManagementContext(this);
+ catalogInitialization.setManagementContext(this);
this.catalogInitialization = catalogInitialization;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java
index 6793bfc..363009e 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java
@@ -179,7 +179,7 @@ public class LocalUsageManager implements UsageManager {
if (listeners != null) {
for (Object listener : listeners) {
if (listener instanceof ManagementContextInjectable) {
- ((ManagementContextInjectable)listener).injectManagementContext(managementContext);
+ ((ManagementContextInjectable)listener).setManagementContext(managementContext);
}
if (listener instanceof UsageListener) {
addUsageListener((UsageListener)listener);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java b/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java
index 18b7d85..d199608 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java
@@ -53,7 +53,7 @@ public class BasicConfigurableObject implements Configurable, Identifiable, Mana
}
@Override
- public void injectManagementContext(ManagementContext managementContext) {
+ public void setManagementContext(ManagementContext managementContext) {
this.managementContext = managementContext;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java b/core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java
index 1b49170..ec3f669 100644
--- a/core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java
+++ b/core/src/main/java/org/apache/brooklyn/core/plan/PlanToSpecFactory.java
@@ -69,7 +69,7 @@ public class PlanToSpecFactory {
result.addAll(getAll());
}
for(PlanToSpecTransformer t : result) {
- t.injectManagementContext(mgmt);
+ t.setManagementContext(mgmt);
}
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/core/src/main/java/org/apache/brooklyn/core/resolve/entity/AbstractEntitySpecResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/resolve/entity/AbstractEntitySpecResolver.java b/core/src/main/java/org/apache/brooklyn/core/resolve/entity/AbstractEntitySpecResolver.java
index ae3ddb2..7270d11 100644
--- a/core/src/main/java/org/apache/brooklyn/core/resolve/entity/AbstractEntitySpecResolver.java
+++ b/core/src/main/java/org/apache/brooklyn/core/resolve/entity/AbstractEntitySpecResolver.java
@@ -55,7 +55,7 @@ public abstract class AbstractEntitySpecResolver implements EntitySpecResolver {
}
@Override
- public void injectManagementContext(ManagementContext mgmt) {
+ public void setManagementContext(ManagementContext mgmt) {
this.mgmt = mgmt;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/core/src/test/java/org/apache/brooklyn/core/catalog/internal/TestToSpecTransformer.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/TestToSpecTransformer.java b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/TestToSpecTransformer.java
index 0dfe291..86b0e0e 100644
--- a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/TestToSpecTransformer.java
+++ b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/TestToSpecTransformer.java
@@ -56,7 +56,7 @@ public class TestToSpecTransformer implements PlanToSpecTransformer {
}
@Override
- public void injectManagementContext(ManagementContext managementContext) {
+ public void setManagementContext(ManagementContext managementContext) {
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/core/src/test/java/org/apache/brooklyn/core/plan/XmlPlanToSpecTransformer.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/plan/XmlPlanToSpecTransformer.java b/core/src/test/java/org/apache/brooklyn/core/plan/XmlPlanToSpecTransformer.java
index a4c3766..e4b3ddf 100644
--- a/core/src/test/java/org/apache/brooklyn/core/plan/XmlPlanToSpecTransformer.java
+++ b/core/src/test/java/org/apache/brooklyn/core/plan/XmlPlanToSpecTransformer.java
@@ -46,7 +46,7 @@ public class XmlPlanToSpecTransformer implements PlanToSpecTransformer {
private ManagementContext mgmt;
@Override
- public void injectManagementContext(ManagementContext managementContext) {
+ public void setManagementContext(ManagementContext managementContext) {
mgmt = managementContext;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
index 69c9109..ab20a40 100644
--- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
+++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
@@ -369,7 +369,7 @@ public class BrooklynComponentTemplateResolver {
}
if (flag instanceof ManagementContextInjectable) {
log.debug("Injecting Brooklyn management context info object: {}", flag);
- ((ManagementContextInjectable) flag).injectManagementContext(loader.getManagementContext());
+ ((ManagementContextInjectable) flag).setManagementContext(loader.getManagementContext());
}
return flag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampToSpecTransformer.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampToSpecTransformer.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampToSpecTransformer.java
index 35feb65..d62cab3 100644
--- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampToSpecTransformer.java
+++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampToSpecTransformer.java
@@ -100,7 +100,7 @@ public class CampToSpecTransformer implements PlanToSpecTransformer {
}
@Override
- public void injectManagementContext(ManagementContext mgmt) {
+ public void setManagementContext(ManagementContext mgmt) {
this.mgmt = mgmt;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CampServiceSpecResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CampServiceSpecResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CampServiceSpecResolver.java
index a993083..091a4f4 100644
--- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CampServiceSpecResolver.java
+++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CampServiceSpecResolver.java
@@ -39,7 +39,7 @@ public class CampServiceSpecResolver extends DelegatingEntitySpecResolver {
.add(new UrlServiceSpecResolver())
.build();
for (EntitySpecResolver resolver : resolvers) {
- resolver.injectManagementContext(mgmt);
+ resolver.setManagementContext(mgmt);
}
return resolvers;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/UrlServiceSpecResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/UrlServiceSpecResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/UrlServiceSpecResolver.java
index 387212c..6c61100 100644
--- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/UrlServiceSpecResolver.java
+++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/UrlServiceSpecResolver.java
@@ -61,7 +61,7 @@ public class UrlServiceSpecResolver implements EntitySpecResolver {
}
@Override
- public void injectManagementContext(ManagementContext managementContext) {
+ public void setManagementContext(ManagementContext managementContext) {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java
index e16d825..1a74882 100644
--- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java
+++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java
@@ -66,7 +66,7 @@ public class ObjectsYamlTest extends AbstractYamlTest {
public void setObject(Object object) { this.object = object; }
@Override
- public void injectManagementContext(ManagementContext managementContext) {
+ public void setManagementContext(ManagementContext managementContext) {
log.info("Detected injection of {}", managementContext);
managementContextInjected.set(true);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
index e4dacc9..1e058f8 100644
--- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
+++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
@@ -59,7 +59,8 @@ public abstract class AbstractBrooklynRestResource implements ManagementContextI
return Maybe.absent("ManagementContext not available for Brooklyn Jersey Resource "+this);
}
- public void injectManagementContext(ManagementContext managementContext) {
+ @Override
+ public void setManagementContext(ManagementContext managementContext) {
if (this.managementContext!=null) {
if (this.managementContext.equals(managementContext)) return;
throw new IllegalStateException("ManagementContext cannot be changed: specified twice for Brooklyn Jersey Resource "+this);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
index a8e146b..f6f0e2d 100644
--- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
+++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
@@ -165,7 +165,7 @@ public class BrooklynJacksonJsonProvider extends JacksonJsonProvider implements
}
@Override
- public void injectManagementContext(ManagementContext mgmt) {
+ public void setManagementContext(ManagementContext mgmt) {
this.mgmt = mgmt;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java
index 23a3e5a..08b9aa4 100644
--- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java
+++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ScriptResourceTest.java
@@ -42,7 +42,7 @@ public class ScriptResourceTest {
Entities.start(app, Collections.<Location>emptyList());
ScriptResource s = new ScriptResource();
- s.injectManagementContext(mgmt);
+ s.setManagementContext(mgmt);
ScriptExecutionSummary result = s.groovy(null, "def apps = []; mgmt.applications.each { println 'app:'+it; apps << it.id }; apps");
Assert.assertEquals(Collections.singletonList(app.getId()).toString(), result.getResult());
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cbb58baa/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java
index 20b945a..dea8bca 100644
--- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java
+++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestApiTest.java
@@ -123,7 +123,7 @@ public abstract class BrooklynRestApiTest {
config.getSingletons().add(resource);
if (resource instanceof ManagementContextInjectable) {
- ((ManagementContextInjectable)resource).injectManagementContext(getManagementContext());
+ ((ManagementContextInjectable)resource).setManagementContext(getManagementContext());
}
}
[10/21] incubator-brooklyn git commit: [BROOKLYN-183] Fix detection
of OSGi framework
Posted by ha...@apache.org.
[BROOKLYN-183] Fix detection of OSGi framework
Fix the code detecting if we are running within an OSGi framework.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ed6f1df1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ed6f1df1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ed6f1df1
Branch: refs/heads/master
Commit: ed6f1df199c268fdf2811abd15a3de967840b1ee
Parents: c61f719
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Thu Nov 19 12:27:39 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Thu Nov 19 12:27:39 2015 +0200
----------------------------------------------------------------------
.../apache/brooklyn/util/core/osgi/Osgis.java | 22 +++++++++-----------
1 file changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ed6f1df1/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
index be24dc1..8777032 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
@@ -318,12 +318,10 @@ public class Osgis {
* @todo Use felixCacheDir ?
*/
public static Framework getFramework(String felixCacheDir, boolean clean) {
- final Bundle frameworkBundle = FrameworkUtil.getBundle(Framework.class);
- if (frameworkBundle != null) {
+ final Bundle bundle = FrameworkUtil.getBundle(Osgis.class);
+ if (bundle != null) {
// already running inside an OSGi container
- final BundleContext ctx = frameworkBundle.getBundleContext();
- final ServiceReference<?> ref = ctx.getServiceReference(Framework.class);
- return (Framework) ctx.getService(ref);
+ return (Framework) bundle.getBundleContext().getBundle(0);
} else {
// not running inside OSGi container
return EmbeddedFelixFramework.newFrameworkStarted(felixCacheDir, clean, null);
@@ -338,12 +336,12 @@ public class Osgis {
* @param framework
*/
public static void ungetFramework(Framework framework) {
- final Bundle frameworkBundle = FrameworkUtil.getBundle(Framework.class);
- if (frameworkBundle != null) {
- // already running inside an OSGi container
- final BundleContext ctx = frameworkBundle.getBundleContext();
- final ServiceReference<?> ref = ctx.getServiceReference(Framework.class);
- ctx.ungetService(ref);
+ final Bundle bundle = FrameworkUtil.getBundle(Osgis.class);
+ if (bundle != null) {
+// // already running inside an OSGi container
+// final BundleContext ctx = bundle.getBundleContext();
+// final ServiceReference<Framework> ref = ctx.getServiceReference(Framework.class);
+// ctx.ungetService(ref);
} else {
EmbeddedFelixFramework.stopFramework(framework);
}
@@ -352,7 +350,7 @@ public class Osgis {
/** Tells if Brooklyn is running in an OSGi environment or not. */
public static boolean isBrooklynInsideFramework() {
- return FrameworkUtil.getBundle(Framework.class) != null;
+ return FrameworkUtil.getBundle(Osgis.class) != null;
}
/** @deprecated since 0.9.0, replaced with {@link OsgiUtils#getVersionedId(org.osgi.framework.Bundle) } */
[06/21] incubator-brooklyn git commit: [BROOKLYN-183] Bump karaf to
version 4.0.3
Posted by ha...@apache.org.
[BROOKLYN-183] Bump karaf to version 4.0.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/094e6e47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/094e6e47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/094e6e47
Branch: refs/heads/master
Commit: 094e6e47d8fa1f040469e50f35ec62eac7191c86
Parents: 25dde5e
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Mon Nov 16 17:20:42 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Tue Nov 17 14:55:03 2015 +0200
----------------------------------------------------------------------
karaf/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/094e6e47/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index ecacf2d..0d555cd 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<properties>
- <karaf.version>4.0.2</karaf.version>
+ <karaf.version>4.0.3</karaf.version>
<org.osgi.core.version>6.0.0</org.osgi.core.version>
<org.osgi.compendium.version>5.0.0</org.osgi.compendium.version>
[08/21] incubator-brooklyn git commit: [BROOKLYN-183] Deploy
brooklyn-rest-server using pax-web war extender
Posted by ha...@apache.org.
[BROOKLYN-183] Deploy brooklyn-rest-server using pax-web war extender
This brings brooklyn's REST API online within karaf using jersey.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c718ff35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c718ff35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c718ff35
Branch: refs/heads/master
Commit: c718ff353bcda43028c6c3dac8dc4a0c50bd12b9
Parents: f154e03
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Wed Nov 18 01:31:24 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Wed Nov 18 01:31:49 2015 +0200
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 22 +++++++++---
.../features/src/main/history/dependencies.xml | 16 ++++++---
usage/rest-server/pom.xml | 37 ++++++++++++++++++++
3 files changed, 66 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c718ff35/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 0962e2f..46f7a0e 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -22,6 +22,10 @@
<repository>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</repository>
<repository>mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features</repository>
+ <!-- all these are about jax-rs, and will need some love later on -->
+ <!--<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0/2.4.0</bundle>-->
+ <!--<bundle dependency="true">mvn:javax.ws.rs/jsr311-api/${jsr311-api.version}</bundle>-->
+ <!--<bundle dependency="true">mvn:javax.ws.rs/javax.ws.rs-api/${javax.ws.rs-api}</bundle>-->
<feature name="swagger" version="${swagger.version}" description="Swagger Annotations+Core+JAXRS+Models">
<bundle>mvn:io.swagger/swagger-annotations/${swagger.version}</bundle>
@@ -49,8 +53,11 @@
<bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
<bundle dependency="true">mvn:org.codehaus.groovy/groovy-all/${groovy.version}</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
+ <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
<bundle dependency="true">mvn:org.slf4j/jul-to-slf4j/${slf4j.version}</bundle>
<bundle dependency="true">mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
<bundle dependency="true">mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
<bundle dependency="true">mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
@@ -67,13 +74,14 @@
<bundle>mvn:org.apache.brooklyn/brooklyn-utils-rest-swagger/${project.version}</bundle>
- <!-- TODO: jersey osgi feature -->
+ <!--<feature>jersey</feature>-->
<bundle dependency="true">mvn:com.sun.jersey/jersey-server/${jersey.version}</bundle>
<bundle dependency="true">mvn:com.sun.jersey/jersey-core/${jersey.version}</bundle>
<bundle dependency="true">mvn:com.sun.jersey/jersey-servlet/${jersey.version}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
- <bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet.version}</bundle>
+ <bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet.version}</bundle>
+ <bundle dependency="true">mvn:javax.ws.rs/jsr311-api/${jsr311-api.version}</bundle>
</feature>
<feature name="brooklyn-rest-api" version="${project.version}" description="Brooklyn REST API">
@@ -95,6 +103,7 @@
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle>
+ <!--<bundle dependency="true">mvn:javax.ws.rs/jsr311-api/${jsr311-api.version}</bundle>-->
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet.version}</bundle>
</feature>
@@ -125,8 +134,6 @@
<bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient.version}</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-jaxrs/${jackson.version}</bundle>
@@ -173,6 +180,13 @@
<feature>brooklyn-rest-api</feature>
<feature>brooklyn-camp-brooklyn</feature>
<feature>brooklyn-camp-base</feature>
+
+ <feature>war</feature>
+
+ <!--<feature>jersey</feature>-->
+ <bundle dependency="true">mvn:com.sun.jersey/jersey-server/${jersey.version}</bundle>
+ <bundle dependency="true">mvn:com.sun.jersey/jersey-core/${jersey.version}</bundle>
+ <bundle dependency="true">mvn:com.sun.jersey/jersey-servlet/${jersey.version}</bundle>
</feature>
<feature name="brooklyn-jsgui" version="${project.version}" description="Brooklyn REST JavaScript Web GUI">
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c718ff35/karaf/features/src/main/history/dependencies.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/history/dependencies.xml b/karaf/features/src/main/history/dependencies.xml
index d48f69a..1417ea8 100644
--- a/karaf/features/src/main/history/dependencies.xml
+++ b/karaf/features/src/main/history/dependencies.xml
@@ -19,6 +19,7 @@
<feature prerequisite="false" dependency="false">jetty</feature>
<feature prerequisite="false" dependency="false">swagger</feature>
<feature prerequisite="false" dependency="false">war</feature>
+ <feature prerequisite="false" dependency="false">war</feature>
<bundle>mvn:ch.qos.logback/logback-classic/1.0.7</bundle>
<bundle>mvn:ch.qos.logback/logback-core/1.0.7</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.5</bundle>
@@ -33,14 +34,18 @@
<bundle>mvn:com.google.code.gson/gson/2.3</bundle>
<bundle>mvn:com.google.guava/guava/17.0</bundle>
<bundle>mvn:com.jayway.jsonpath/json-path/2.0.0</bundle>
- <bundle>mvn:com.sun.jersey.contribs/jersey-multipart/1.18.1</bundle>
- <bundle>mvn:com.sun.jersey/jersey-core/1.18.1</bundle>
- <bundle>mvn:com.sun.jersey/jersey-server/1.18.1</bundle>
- <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle>
- <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle>
+ <bundle>mvn:com.sun.jersey.contribs/jersey-multipart/1.19</bundle>
+ <bundle>mvn:com.sun.jersey/jersey-core/1.19</bundle>
+ <bundle>mvn:com.sun.jersey/jersey-core/1.19</bundle>
+ <bundle>mvn:com.sun.jersey/jersey-server/1.19</bundle>
+ <bundle>mvn:com.sun.jersey/jersey-server/1.19</bundle>
+ <bundle>mvn:com.sun.jersey/jersey-servlet/1.19</bundle>
+ <bundle>mvn:com.sun.jersey/jersey-servlet/1.19</bundle>
+ <bundle>mvn:com.sun.jersey/jersey-servlet/1.19</bundle>
<bundle>mvn:com.thoughtworks.xstream/xstream/1.4.7</bundle>
<bundle>mvn:commons-beanutils/commons-beanutils/1.9.1</bundle>
<bundle>mvn:commons-codec/commons-codec/1.9</bundle>
+ <bundle>mvn:commons-codec/commons-codec/1.9</bundle>
<bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
<bundle>mvn:commons-io/commons-io/2.4</bundle>
<bundle>mvn:commons-lang/commons-lang/2.4</bundle>
@@ -48,6 +53,7 @@
<bundle>mvn:io.swagger/swagger-models/1.5.3</bundle>
<bundle>mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
<bundle>mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
+ <bundle>mvn:javax.ws.rs/jsr311-api/1.1.1</bundle>
<bundle>mvn:net.minidev/asm/1.0.2</bundle>
<bundle>mvn:net.minidev/json-smart/2.1.1</bundle>
<bundle>mvn:net.schmizz/sshj/0.8.1</bundle>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c718ff35/usage/rest-server/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml
index 251c6fb..d343bfe 100644
--- a/usage/rest-server/pom.xml
+++ b/usage/rest-server/pom.xml
@@ -241,9 +241,46 @@
<!-- Required to set values in build-metadata.properties -->
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${basedir}/src/main/webapp</directory>
+ </resource>
</resources>
<plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <!-- configure plugin to generate MANIFEST.MF
+ adapted from http://blog.knowhowlab.org/2010/06/osgi-tutorial-from-project-structure-to.html -->
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>jar</supportedProjectType>
+ </supportedProjectTypes>
+ <instructions>
+ <Import-Package>
+ com.sun.jersey.spi.container.servlet;version="[1.18.1,2.0)",
+ *
+ </Import-Package>
+ <Export-Package>org.apache.brooklyn.*</Export-Package>
+ <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1>
+ <Implementation-Branch>${scmBranch}</Implementation-Branch>
+ <Web-ContextPath>/</Web-ContextPath>
+ <_wab>src/main/webapp</_wab>
+ </instructions>
+ </configuration>
+ </plugin>
+
+
<!-- if you want to build a WAR, full or skinny:
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[04/21] incubator-brooklyn git commit: [BROOKLYN-183] Karaf feature
for brooklyn-rest-api
Posted by ha...@apache.org.
[BROOKLYN-183] Karaf feature for brooklyn-rest-api
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9b633bd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9b633bd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9b633bd7
Branch: refs/heads/master
Commit: 9b633bd7d3f2a1202b4ed8d2be290a6939925957
Parents: cc56bb2
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Fri Oct 16 12:41:06 2015 +0300
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Thu Nov 12 18:11:42 2015 +0200
----------------------------------------------------------------------
karaf/apache-brooklyn/pom.xml | 1 +
karaf/features/src/main/feature/feature.xml | 63 +++++++++++++++++++-
.../features/src/main/history/dependencies.xml | 28 ++++++++-
karaf/pom.xml | 6 ++
4 files changed, 94 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b633bd7/karaf/apache-brooklyn/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml
index e478e78..bf80915 100755
--- a/karaf/apache-brooklyn/pom.xml
+++ b/karaf/apache-brooklyn/pom.xml
@@ -114,6 +114,7 @@
<bootFeature>wrap</bootFeature>
<!-- brooklyn features -->
<bootFeature>brooklyn-core</bootFeature>
+ <bootFeature>brooklyn-rest-api</bootFeature>
</bootFeatures>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b633bd7/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index c6cfed6..d5a5622 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -21,7 +21,27 @@
<repository>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</repository>
<repository>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</repository>
<repository>mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features</repository>
-
+
+
+ <feature name="swagger" version="${swagger.version}" description="Swagger Annotations+Core+JAXRS+Models">
+ <bundle>mvn:io.swagger/swagger-annotations/${swagger.version}</bundle>
+ <bundle>wrap:mvn:io.swagger/swagger-core/${swagger.version}</bundle>
+ <bundle>wrap:mvn:io.swagger/swagger-jaxrs/${swagger.version}</bundle>
+ <bundle>mvn:io.swagger/swagger-models/${swagger.version}</bundle>
+
+ <!--<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist.bundle.version}</bundle>-->
+ <!--<bundle dependency='true'>mvn:com.google.guava/guava/${guava.version}</bundle>-->
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
+ <!--<bundle>mvn:com.thoughtworks.paranamer/paranamer/${thoughtworks.paranamer.version}</bundle>-->
+ <!--<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle>-->
+ <!--<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>-->
+ </feature>
+
<feature name="brooklyn-utils-common" version="${project.version}" description="Brooklyn Common Utils">
<bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/${project.version}</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-logback-includes/${project.version}</bundle>
@@ -41,6 +61,41 @@
<bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/${project.version}</bundle>
</feature>
+ <feature name="brooklyn-utils-rest-swagger" version="${project.version}" description="Brooklyn REST Swagger Apidoc Utilities">
+ <feature>brooklyn-utils-common</feature>
+ <feature version="${swagger.version}">swagger</feature>
+
+ <bundle>mvn:org.apache.brooklyn/brooklyn-utils-rest-swagger/${project.version}</bundle>
+
+ <!-- TODO: jersey osgi feature -->
+ <bundle dependency="true">mvn:com.sun.jersey/jersey-server/${jersey.version}</bundle>
+ <bundle dependency="true">mvn:com.sun.jersey/jersey-core/${jersey.version}</bundle>
+ <!--<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet-api.version}</bundle>-->
+ <bundle dependency="true">mvn:org.eclipse.jetty.orbit/javax.servlet/${jetty-orbit-javax-servlet.version}</bundle>
+
+ </feature>
+
+ <feature name="brooklyn-rest-api" version="${project.version}" description="Brooklyn REST API">
+ <feature>brooklyn-utils-rest-swagger</feature>
+ <feature>brooklyn-api</feature>
+
+ <bundle>mvn:org.apache.brooklyn/brooklyn-rest-api/${project.version}</bundle>
+
+ <bundle dependency="true">mvn:com.sun.jersey.contribs/jersey-multipart/${jersey.version}</bundle>
+ <bundle dependency="true">mvn:org.jvnet.mimepull/mimepull/1.9.3</bundle>
+ <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
+
+ <!-- TODO: version 1.1.0.Final has OSGi manifest; check if upgrade doesn't get rid of wrap -->
+ <bundle dependency="true">wrap:mvn:javax.validation/validation-api/${validation-api.version}</bundle>
+
+ <!--<feature>jersey</feature>-->
+ <bundle dependency="true">mvn:com.sun.jersey/jersey-servlet/${jersey.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
+ <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle>
+
+ </feature>
+
<feature name="brooklyn-api" version="${project.version}" description="Brooklyn API">
<feature>brooklyn-utils-common</feature>
<bundle>mvn:org.apache.brooklyn/brooklyn-api/${project.version}</bundle>
@@ -74,11 +129,13 @@
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-jaxrs/${jackson.version}</bundle>
- <!-- TODO: don't use wrap: -->
+
+ <!-- TODO: don't use wrap -->
<bundle dependency="true">wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc</bundle> <!-- from geoip -->
<bundle dependency="true">wrap:mvn:com.maxmind.geoip2/geoip2/${maxmind.version}</bundle> <!-- from geoip2 -->
<bundle dependency="true">wrap:mvn:xpp3/xpp3_min/1.1.4c</bundle> <!-- from com.thoughtworks.xstream/xstream -->
- <bundle dependency="true">wrap:mvn:org.reflections/reflections/${reflections.version}</bundle>
+
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>
</feature>
<feature name="brooklyn-commands" version="${project.version}" description="Brooklyn Shell Commands">
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b633bd7/karaf/features/src/main/history/dependencies.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/history/dependencies.xml b/karaf/features/src/main/history/dependencies.xml
index 3940190..1a1740f 100644
--- a/karaf/features/src/main/history/dependencies.xml
+++ b/karaf/features/src/main/history/dependencies.xml
@@ -2,19 +2,36 @@
<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="org.apache.brooklyn-0.9.0-SNAPSHOT">
<feature version="0.0.0">
<feature prerequisite="false" dependency="false">brooklyn-api</feature>
+ <feature prerequisite="false" dependency="false">brooklyn-api</feature>
+ <feature prerequisite="false" dependency="false">brooklyn-utils-common</feature>
<feature prerequisite="false" dependency="false">brooklyn-utils-common</feature>
<feature prerequisite="false" dependency="false">brooklyn-utils-common</feature>
+ <feature prerequisite="false" dependency="false">brooklyn-utils-rest-swagger</feature>
+ <feature prerequisite="false" dependency="false">swagger</feature>
<bundle>mvn:ch.qos.logback/logback-classic/1.0.7</bundle>
<bundle>mvn:ch.qos.logback/logback-core/1.0.7</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.5</bundle>
+ <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.4.5</bundle>
+ <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.4.5</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.4.5</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.4.5</bundle>
+ <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.4.5</bundle>
+ <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.4.5</bundle>
+ <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.4.5</bundle>
+ <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.4.5</bundle>
<bundle>mvn:com.google.code.gson/gson/2.3</bundle>
<bundle>mvn:com.google.guava/guava/17.0</bundle>
<bundle>mvn:com.jayway.jsonpath/json-path/2.0.0</bundle>
+ <bundle>mvn:com.sun.jersey.contribs/jersey-multipart/1.18.1</bundle>
+ <bundle>mvn:com.sun.jersey/jersey-core/1.18.1</bundle>
+ <bundle>mvn:com.sun.jersey/jersey-server/1.18.1</bundle>
+ <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle>
<bundle>mvn:com.thoughtworks.xstream/xstream/1.4.7</bundle>
<bundle>mvn:commons-codec/commons-codec/1.9</bundle>
<bundle>mvn:commons-io/commons-io/2.4</bundle>
+ <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
+ <bundle>mvn:io.swagger/swagger-annotations/1.5.3</bundle>
+ <bundle>mvn:io.swagger/swagger-models/1.5.3</bundle>
<bundle>mvn:net.minidev/asm/1.0.2</bundle>
<bundle>mvn:net.minidev/json-smart/2.1.1</bundle>
<bundle>mvn:net.schmizz/sshj/0.8.1</bundle>
@@ -22,26 +39,35 @@
<bundle>mvn:org.apache.brooklyn/brooklyn-commands/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-core/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-logback-includes/0.9.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.brooklyn/brooklyn-rest-api/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-rt-osgi/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.brooklyn/brooklyn-utils-groovy/0.9.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.brooklyn/brooklyn-utils-rest-swagger/0.9.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle>
<bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.4.1</bundle>
<bundle>mvn:org.apache.httpcomponents/httpcore-osgi/4.4.1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/1.1.3_2</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/0.9.9_1</bundle>
<bundle>mvn:org.bouncycastle/bcpkix-jdk15on/1.49</bundle>
<bundle>mvn:org.bouncycastle/bcprov-ext-jdk15on/1.49</bundle>
<bundle>mvn:org.codehaus.groovy/groovy-all/2.3.7</bundle>
<bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
<bundle>mvn:org.codehaus.jackson/jackson-jaxrs/1.9.13</bundle>
<bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle>
+ <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle>
+ <bundle>mvn:org.eclipse.jetty.orbit/javax.servlet/3.0.0.v201112011016</bundle>
<bundle>mvn:org.freemarker/freemarker/2.3.22</bundle>
+ <bundle>mvn:org.jvnet.mimepull/mimepull/1.9.3</bundle>
<bundle>mvn:org.slf4j/jul-to-slf4j/1.6.6</bundle>
<bundle>mvn:org.yaml/snakeyaml/1.11</bundle>
<bundle>wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc</bundle>
<bundle>wrap:mvn:com.maxmind.geoip2/geoip2/0.8.1</bundle>
- <bundle>wrap:mvn:org.reflections/reflections/0.9.9-RC1</bundle>
+ <bundle>wrap:mvn:io.swagger/swagger-core/1.5.3</bundle>
+ <bundle>wrap:mvn:io.swagger/swagger-jaxrs/1.5.3</bundle>
+ <bundle>wrap:mvn:javax.validation/validation-api/1.0.0.GA</bundle>
<bundle>wrap:mvn:xpp3/xpp3_min/1.1.4c</bundle>
</feature>
</features>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b633bd7/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 25f909f..ecacf2d 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -37,11 +37,17 @@
<lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
+ <javax-servlet-api.version>3.1.0</javax-servlet-api.version>
+
<!-- pax-exam -->
<pax.exam.version>4.5.0</pax.exam.version>
<pax.url.version>2.4.1</pax.url.version>
<ops4j.base.version>1.5.0</ops4j.base.version>
+ <!-- feature repositories -->
+ <servicemix.version>6.0.0</servicemix.version>
+ <reflections.bundle.version>0.9.9_1</reflections.bundle.version> <!-- see reflections.version -->
+
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
[20/21] incubator-brooklyn git commit: [BROOKLYN-183] Remove
TestToSpecTransformer
Posted by ha...@apache.org.
[BROOKLYN-183] Remove TestToSpecTransformer
Slipped in while syncing with master
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b514adbd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b514adbd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b514adbd
Branch: refs/heads/master
Commit: b514adbdbf4def6c601ce8aaf16879b3b19a11ad
Parents: 943c137
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Tue Nov 24 23:45:10 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Tue Nov 24 23:45:10 2015 +0200
----------------------------------------------------------------------
.../catalog/internal/TestToSpecTransformer.java | 118 -------------------
1 file changed, 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b514adbd/core/src/test/java/org/apache/brooklyn/core/catalog/internal/TestToSpecTransformer.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/TestToSpecTransformer.java b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/TestToSpecTransformer.java
deleted file mode 100644
index 86b0e0e..0000000
--- a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/TestToSpecTransformer.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.brooklyn.core.catalog.internal;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.brooklyn.api.catalog.CatalogItem;
-import org.apache.brooklyn.api.entity.Application;
-import org.apache.brooklyn.api.entity.EntitySpec;
-import org.apache.brooklyn.api.internal.AbstractBrooklynObjectSpec;
-import org.apache.brooklyn.api.mgmt.ManagementContext;
-import org.apache.brooklyn.core.plan.PlanNotRecognizedException;
-import org.apache.brooklyn.core.plan.PlanToSpecTransformer;
-import org.apache.brooklyn.util.text.Identifiers;
-import org.apache.brooklyn.util.yaml.Yamls;
-
-/**
- * Resolves previously registered specs by id.
- * First create a spec and register it, keeping the returned ID:
- * <pre> {@code
- * String specId = TestToSpecTransformer.registerSpec(EntitySpec.create(BasicEntity.class));
- * }</pre>
- *
- * Then build a plan to be resolved such as:
- * <pre> {@code
- * brooklyn.catalog:
- * id: test.inputs
- * version: 0.0.1
- * item: <specId>
- * } </pre>
- */
-public class TestToSpecTransformer implements PlanToSpecTransformer {
- private static final Map<String, AbstractBrooklynObjectSpec<?, ?>> REGISTERED_SPECS = new ConcurrentHashMap<>();
- public static String registerSpec(AbstractBrooklynObjectSpec<?, ?> spec) {
- String id = Identifiers.makeRandomId(10);
- REGISTERED_SPECS.put(id, spec);
- return id;
- }
-
- @Override
- public void setManagementContext(ManagementContext managementContext) {
- }
-
- @Override
- public String getShortDescription() {
- return "test";
- }
-
- @Override
- public boolean accepts(String planType) {
- return "test".equals(planType);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public EntitySpec<? extends Application> createApplicationSpec(String plan) throws PlanNotRecognizedException {
- return (EntitySpec<? extends Application>) getSpec(plan);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public <T, SpecT extends AbstractBrooklynObjectSpec<? extends T, SpecT>> SpecT createCatalogSpec(CatalogItem<T, SpecT> item, Set<String> encounteredTypes)
- throws PlanNotRecognizedException {
- return (SpecT) getSpecFromPlan(item.getPlanYaml());
- }
-
- private AbstractBrooklynObjectSpec<?,?> getSpecFromPlan(String plan) {
- if (plan != null) {
- Object planRaw = Yamls.parseAll(plan).iterator().next();
- if (planRaw instanceof String) {
- return getSpec((String)planRaw);
- } else if (planRaw instanceof Map) {
- // The catalog parser assumes it's dealing with CAMP specs so will helpfully
- // prepend "type: " if it's an inline item.
- return getSpec((String)((Map<?, ?>)planRaw).get("type"));
- } else {
- throw notRecognized();
- }
- } else {
- throw notRecognized();
- }
- }
-
- private AbstractBrooklynObjectSpec<?,?> getSpec(String plan) {
- if (plan == null) {
- throw notRecognized();
- }
- AbstractBrooklynObjectSpec<?, ?> spec = REGISTERED_SPECS.get(plan);
- if (spec != null) {
- return spec;
- } else {
- throw notRecognized();
- }
- }
-
- private PlanNotRecognizedException notRecognized() {
- return new PlanNotRecognizedException("Not recognized as registered spec");
- }
-
-}
[02/21] incubator-brooklyn git commit: [BROOKLYN-183] Add WAB
manifest headers for brooklyn-jsgui
Posted by ha...@apache.org.
[BROOKLYN-183] Add WAB manifest headers for brooklyn-jsgui
Enable pax-web WAR Extender to find and automatically install the web
application into the web container.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7b5e39b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7b5e39b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7b5e39b0
Branch: refs/heads/master
Commit: 7b5e39b07323367c32a7387690624c70f1c624fe
Parents: 05a2c5f
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Thu Nov 12 18:06:57 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Thu Nov 12 18:11:42 2015 +0200
----------------------------------------------------------------------
usage/jsgui/pom.xml | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7b5e39b0/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index 7ec8c4c..3355577 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -237,6 +237,9 @@
<directory>${basedir}/src/main/license/files</directory>
</webResource>
</webResources>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
<!-- Disable the automatic LICENSE/NOTICE placement from the upstream pom, because we need to include
@@ -255,6 +258,29 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>war</supportedProjectType>
+ </supportedProjectTypes>
+ <instructions>
+ <Web-ContextPath>/</Web-ContextPath>
+ <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1>
+ <Implementation-Branch>${scmBranch}</Implementation-Branch>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
[16/21] incubator-brooklyn git commit: [BROOKLYN-183] Adjust commits
from master to match OSGI changes
Posted by ha...@apache.org.
[BROOKLYN-183] Adjust commits from master to match OSGI changes
Rename injectManagementContext to setManagementContext
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a5979a71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a5979a71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a5979a71
Branch: refs/heads/master
Commit: a5979a715263752fd7589669f5dabad4c2110a39
Parents: 640a0b2
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Sun Nov 22 03:01:39 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Sun Nov 22 03:01:39 2015 +0200
----------------------------------------------------------------------
.../apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java | 2 +-
.../org/apache/brooklyn/core/typereg/TypePlanTransformers.java | 2 +-
.../core/typereg/JavaClassNameTypePlanTransformerTest.java | 2 +-
karaf/features/src/main/history/dependencies.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a5979a71/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java b/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java
index 79085ea..ee49d39 100644
--- a/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java
+++ b/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java
@@ -43,7 +43,7 @@ public abstract class AbstractTypePlanTransformer implements BrooklynTypePlanTra
protected ManagementContext mgmt;
@Override
- public void injectManagementContext(ManagementContext mgmt) {
+ public void setManagementContext(ManagementContext mgmt) {
this.mgmt = mgmt;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a5979a71/core/src/main/java/org/apache/brooklyn/core/typereg/TypePlanTransformers.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/TypePlanTransformers.java b/core/src/main/java/org/apache/brooklyn/core/typereg/TypePlanTransformers.java
index e24660e..fb1bbd6 100644
--- a/core/src/main/java/org/apache/brooklyn/core/typereg/TypePlanTransformers.java
+++ b/core/src/main/java/org/apache/brooklyn/core/typereg/TypePlanTransformers.java
@@ -80,7 +80,7 @@ public class TypePlanTransformers {
result.addAll(getAll());
}
for(BrooklynTypePlanTransformer t : result) {
- t.injectManagementContext(mgmt);
+ t.setManagementContext(mgmt);
}
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a5979a71/core/src/test/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformerTest.java b/core/src/test/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformerTest.java
index 23dc2f3..55b5d3b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformerTest.java
@@ -47,7 +47,7 @@ public class JavaClassNameTypePlanTransformerTest extends BrooklynMgmtUnitTestSu
protected BrooklynTypePlanTransformer newTransformer() {
BrooklynTypePlanTransformer xf = new JavaClassNameTypePlanTransformer();
- xf.injectManagementContext(mgmt);
+ xf.setManagementContext(mgmt);
return xf;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a5979a71/karaf/features/src/main/history/dependencies.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/history/dependencies.xml b/karaf/features/src/main/history/dependencies.xml
index 98add88..8d705b5 100644
--- a/karaf/features/src/main/history/dependencies.xml
+++ b/karaf/features/src/main/history/dependencies.xml
@@ -96,7 +96,7 @@
<bundle>mvn:org.yaml/snakeyaml/1.11</bundle>
<bundle>wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc</bundle>
<bundle>wrap:mvn:com.maxmind.geoip2/geoip2/0.8.1</bundle>
- <bundle>wrap:mvn:javax.validation/validation-api/1.0.0.GA</bundle>
+ <bundle>wrap:mvn:javax.validation/validation-api/1.1.0.Final</bundle>
<bundle>wrap:mvn:org.tukaani/xz/1.4</bundle>
<bundle>wrap:mvn:xpp3/xpp3_min/1.1.4c</bundle>
</feature>