Author: dkulp
Date: Tue Oct 11 20:19:25 2011
New Revision: 1182065
URL: http://svn.apache.org/viewvc?rev=1182065&view=rev
Log:
Fix groupid for bundle, possibly use version of activemq already installed
Modified:
cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
cxf/trunk/services/wsn/wsn-osgi/pom.xml
Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1182065&r1=1182064&r2=1182065&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Tue Oct 11
20:19:25 2011
@@ -17,6 +17,8 @@
limitations under the License.
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0";
name="cxf-${project.version}">
+
<repository>mvn:org.apache.activemq/activemq-karaf/${cxf.activemq.version}/xml/features</repository>
+
<feature name="cxf-specs" version="${project.version}" resolver='(obr)'>
<bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle>
<bundle
start-level='10'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${cxf.geronimo.annotation.version}</bundle>
@@ -122,14 +124,9 @@
cxf.wsn.port = 8182
</config>
+ <feature version="[5.4,6)">activemq</feature>
<feature version="${project.version}">cxf</feature>
- <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${cxf.geronimo.j2ee.management.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.activemq/kahadb/${cxf.activemq.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.activemq/activemq-core/${cxf.activemq.version}</bundle>
-
<bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-osgi/${project.version}</bundle>
</feature>
</features>
Modified: cxf/trunk/services/wsn/wsn-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-osgi/pom.xml?rev=1182065&r1=1182064&r2=1182065&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-osgi/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-osgi/pom.xml Tue Oct 11 20:19:25 2011
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.cxf</groupId>
+ <groupId>org.apache.cxf.services.wsn</groupId>
<artifactId>cxf-services-wsn-core</artifactId>
<version>${project.version}</version>
</dependency>
