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:13 UTC
[03/21] incubator-brooklyn git commit: [BROOKLYN-183] Finished karaf
feature brooklyn-camp-server
[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>