svn commit: r1181778 - in /cxf/trunk: osgi/karaf/features/src/main/resources/features.xml parent/pom.xml services/wsn/wsn-core/pom.xml services/wsn/wsn-osgi/pom.xml

[gnodet]

Author: gnodet
Date: Tue Oct 11 13:35:57 2011
New Revision: 1181778

URL: http://svn.apache.org/viewvc?rev=1181778&view=rev
Log:
[CXF-3848] Fix groupIds to be consistent with sts, add a feature for wsn

Modified:
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
    cxf/trunk/parent/pom.xml
    cxf/trunk/services/wsn/wsn-core/pom.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=1181778&r1=1181777&r2=1181778&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 
13:35:57 2011
@@ -114,4 +114,21 @@
 
         
<bundle>mvn:org.apache.cxf.services.sts/cxf-services-sts-core/${project.version}</bundle>
     </feature>
+
+    <feature name="wsn" version="${project.version}" resolver="(obr)">
+
+        <config name="org.apache.cxf.wsn">
+            cxf.wsn.activemq = 
vm:broker:(tcp://localhost)?persistent=false&amp;jmx=false
+            cxf.wsn.port = 8182
+        </config>
+
+        <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/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1181778&r1=1181777&r2=1181778&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Oct 11 13:35:57 2011
@@ -108,6 +108,7 @@
         <cxf.velocity.version>1.7</cxf.velocity.version>
 
         
<cxf.geronimo.annotation.version>1.1.1</cxf.geronimo.annotation.version>
+        
<cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>
         <cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
         
<cxf.geronimo.transaction.version>1.1.1</cxf.geronimo.transaction.version>
         
<cxf.geronimo.ws.metadata.version>1.1.3</cxf.geronimo.ws.metadata.version>

Modified: cxf/trunk/services/wsn/wsn-core/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/pom.xml?rev=1181778&r1=1181777&r2=1181778&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-core/pom.xml Tue Oct 11 13:35:57 2011
@@ -18,7 +18,7 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.cxf</groupId>
+    <groupId>org.apache.cxf.services.wsn</groupId>
     <artifactId>cxf-services-wsn-core</artifactId>
     <packaging>jar</packaging>
     <version>2.5.0-SNAPSHOT</version>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
-            <version>5.4.2</version>
+            <version>${cxf.activemq.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/trunk/services/wsn/wsn-osgi/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-osgi/pom.xml?rev=1181778&r1=1181777&r2=1181778&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-osgi/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-osgi/pom.xml Tue Oct 11 13:35:57 2011
@@ -18,7 +18,7 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.cxf</groupId>
+    <groupId>org.apache.cxf.services.wsn</groupId>
     <artifactId>cxf-services-wsn-osgi</artifactId>
     <packaging>bundle</packaging>
     <version>2.5.0-SNAPSHOT</version>