Repository: servicemix
Updated Branches:
  refs/heads/master e04e5a203 -> df42014d5


SM-2296 Add the boot features to the system repository


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/df42014d
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/df42014d
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/df42014d

Branch: refs/heads/master
Commit: df42014d50549c3f6cd51f116f5005e6958036f2
Parents: e04e5a2
Author: Krzysztof Sobkowiak <[email protected]>
Authored: Fri May 9 23:58:35 2014 +0200
Committer: Krzysztof Sobkowiak <[email protected]>
Committed: Fri May 9 23:58:35 2014 +0200

----------------------------------------------------------------------
 assembly/pom.xml                                                  | 3 ++-
 .../src/main/filtered-resources/etc/org.apache.karaf.features.cfg | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/df42014d/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index dc1b325..18b51d8 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -167,9 +167,10 @@
                                 <feature>activemq-service</feature>
                                 <feature>camel</feature>
                                 <feature>camel-cxf</feature>
-                                <feature>camel-jms</feature>
+                                <feature>activemq-camel</feature>
                                 <feature>camel-blueprint</feature>
                                 <feature>war</feature>
+                                <feature>jaxrs-api</feature>
                             </features>
                             
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
                             <repository>target/features-repo</repository>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/df42014d/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git 
a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg 
b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index 1c38848..553d098 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -41,7 +41,7 @@ 
featuresRepositories=mvn:org.apache.karaf.features/standard/${karaf.version}/xml
 #
 # Comma separated list of features to install at startup
 #
-featuresBoot=config,standard,region,package,kar,ssh,management,eventadmin,activemq-broker-noweb,jaxrs-api,camel,camel-jms,camel-cxf,camel-blueprint,activemq-service,war
+featuresBoot=config,standard,package,kar,ssh,management,eventadmin,activemq-broker-noweb,jaxrs-api,activemq-camel,camel-cxf,camel-blueprint,activemq-service,war
 
 
 #

Reply via email to