Return-Path: 
 <commits-return-21694-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 94425ECEB
	for <apmail-activemq-commits-archive@www.apache.org>;
 Thu, 14 Feb 2013 15:42:10 +0000 (UTC)
Received: (qmail 70571 invoked by uid 500); 14 Feb 2013 15:42:10 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 70545 invoked by uid 500); 14 Feb 2013 15:42:10 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 70534 invoked by uid 99); 14 Feb 2013 15:42:09 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Feb 2013 15:42:09 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Feb 2013 15:42:08 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 86B682388ABC;
	Thu, 14 Feb 2013 15:41:49 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1446245 - in /activemq/trunk: activemq-camel/pom.xml
 activemq-karaf/src/main/resources/features.xml
Date: Thu, 14 Feb 2013 15:41:49 -0000
To: commits@activemq.apache.org
From: dejanb@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130214154149.86B682388ABC@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dejanb
Date: Thu Feb 14 15:41:49 2013
New Revision: 1446245

URL: http://svn.apache.org/r1446245
Log:
https://issues.apache.org/jira/browse/AMQ-4317 - activemq-camel feature

Modified:
    activemq/trunk/activemq-camel/pom.xml
    activemq/trunk/activemq-karaf/src/main/resources/features.xml

Modified: activemq/trunk/activemq-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/pom.xml?rev=1446245&r1=1446244&r2=1446245&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/pom.xml (original)
+++ activemq/trunk/activemq-camel/pom.xml Thu Feb 14 15:41:49 2013
@@ -28,26 +28,9 @@
   <artifactId>activemq-camel</artifactId>
   <name>ActiveMQ :: Camel</name>
   <description>ActiveMQ component for Camel</description>
+  <packaging>bundle</packaging>
 
   <properties>
-    <activemq.osgi.import.pkg>
-      org.apache.activemq.pool;resolution:=optional,
-      javax.annotation*;resolution:=optional,
-      com.thoughtworks.xstream*;resolution:=optional,
-      org.apache.activeio*;resolution:=optional,
-      org.apache.camel*;version="[2,3)";resolution:=optional,
-      org.apache.commons.pool*;resolution:=optional,
-      org.apache.derby*;resolution:=optional,
-      org.apache.tools.ant*;resolution:=optional,
-      org.apache.xbean*;resolution:=optional,
-      '=org.apache.xbean.spring.context.v2;resolution:=optional',
-      org.apache.xpath*;resolution:=optional,
-      org.codehaus.jam*;resolution:=optional,
-      org.springframework*;resolution:=optional,
-      org.springframework.beans.factory.xml;resolution:=optional,
-      org.w3c.dom.traversal*;resolution:=optional,
-      *
-    </activemq.osgi.import.pkg>
     <activemq.osgi.export>
       org.apache.activemq.camel*;version=${project.version};-noimport:=true
     </activemq.osgi.export>

Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1446245&r1=1446244&r2=1446245&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Thu Feb 14 15:41:49 2013
@@ -20,7 +20,8 @@
 
 <features name="activemq-${project.version}">
 
-    <feature name="activemq-client" version="${project.version}" resolver="(obr)" start-level="50">
+    <!-- Bundles needed if only client will be deployed in the container -->
+    <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}" resolver="(obr)" start-level="50">
         <bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
@@ -44,29 +45,30 @@
         <bundle start-level="30">mvn:org.springframework/spring-context-support/3.1.3.RELEASE</bundle>
     </feature>
 
-    <feature name="activemq-broker" version="${project.version}" resolver="(obr)" start-level="50">
-        <feature version="${project.version}">activemq-client</feature>
-        <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
-        <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
-        <bundle dependency="true">mvn:commons-codec/commons-codec/1.4</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_5</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.0_1</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
-        <bundle dependency="true">mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
-        <bundle dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
-        <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries-version}</bundle>
-        <!-- the following 4 bundles is needed by activemq-console -->
-        <bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
-        <bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf-proto/${hawtbuf-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>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
-        <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
-        <feature version="${project.version}">activemq-http</feature>
+    <!-- All bundles needed by the broker -->
+    <feature name="activemq" description="ActiveMQ broker libraries" version="${project.version}" resolver="(obr)" start-level="50">
+      <feature version="${project.version}">activemq-client</feature>
+      <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+      <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+      <bundle dependency="true">mvn:commons-codec/commons-codec/1.4</bundle>
+      <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_5</bundle>
+      <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.0_1</bundle>
+      <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
+      <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
+      <bundle dependency="true">mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
+      <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
+      <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
+      <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
+      <bundle dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
+      <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries-version}</bundle>
+      <bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
+      <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
+      <feature version="${project.version}">activemq-http</feature>
+    </feature>
+
+    <!-- Starts the broker with default configuration and web console -->
+    <feature name="activemq-broker" description="Full ActiveMQ broker with default configuration and web console" version="${project.version}" resolver="(obr)" start-level="50">
+        <feature version="${project.version}">activemq</feature>
         <configfile finalname="/etc/activemq.xml">mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/activemq</configfile>
         <configfile finalname="/etc/org.apache.activemq.server-default.cfg">mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq</configfile>
         <feature version="${project.version}">activemq-web-console</feature>
@@ -86,8 +88,12 @@
     </feature>
 
     <feature name="activemq-camel" version="${project.version}" resolver="(obr)" start-level="50">
-        <feature version="${project.version}">activemq-broker</feature>
-        <feature version="${camel-version-range}">camel-jms</feature>
+        <feature version="${project.version}">activemq-client</feature>
+        <feature version="[3,4)">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-jms/3.1.3.RELEASE</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-tx/3.1.3.RELEASE</bundle>
+        <feature version="${camel-version-range}">camel-core</feature>
+        <bundle >mvn:org.apache.camel/camel-jms/${camel-version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-camel/${project.version}</bundle>
     </feature>