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 <[email protected]>
Authored: Thu Nov 12 18:10:20 2015 +0200
Committer: Ciprian Ciubotariu <[email protected]>
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>

Reply via email to