You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/10/11 23:35:55 UTC
svn commit: r1182100 - in /cxf/trunk:
osgi/karaf/features/src/main/resources/features.xml parent/pom.xml
services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml
Author: dkulp
Date: Tue Oct 11 21:35:54 2011
New Revision: 1182100
URL: http://svn.apache.org/viewvc?rev=1182100&view=rev
Log:
Define a working 2.4.2 ActiveMQ feature. :-(
Modified:
cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
cxf/trunk/parent/pom.xml
cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.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=1182100&r1=1182099&r2=1182100&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 21:35:54 2011
@@ -17,7 +17,30 @@
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.osgi.activemq.version}/xml/features</repository>
+
+
+ <feature name="activemq" version="5.4.2">
+ <!-- The ActiveMQ features.xml that is provided by 5.4.2 does not work with modern Karaf versions -->
+ <!-- Thus, we'll duplicate the main activemq definition here with the 'karaf' stuff removed -->
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
+ <bundle>mvn:commons-pool/commons-pool/1.5.4</bundle>
+ <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/2.4_3</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/1.3_3</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.6_1</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-core/5.4.2</bundle>
+ <bundle>mvn:org.apache.activemq/kahadb/5.4.2</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-console/5.4.2</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-ra/5.4.2</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-pool/5.4.2</bundle>
+ <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/0.2-incubating</bundle>
+ </feature>
+
<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>
@@ -120,7 +143,7 @@
<feature name="wsn" version="${project.version}" resolver="(obr)">
<config name="org.apache.cxf.wsn">
- cxf.wsn.activemq = vm:localhost?persistent=false&jmx=false
+ cxf.wsn.activemq = vm:localhost
cxf.wsn.port = 8182
</config>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1182100&r1=1182099&r2=1182100&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Oct 11 21:35:54 2011
@@ -59,7 +59,6 @@
<!-- Due to AMQ-3276, we need to keep the system tests at 5.4.2, but we
need the 5.5.0 features.xml. :-( -->
<cxf.activemq.version>5.4.2</cxf.activemq.version>
- <cxf.osgi.activemq.version>5.5.0</cxf.osgi.activemq.version>
<cxf.derby.version>10.2.2.0</cxf.derby.version>
<cxf.jaxb21.version>2.1</cxf.jaxb21.version>
Modified: cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml?rev=1182100&r1=1182099&r2=1182100&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml (original)
+++ cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml Tue Oct 11 21:35:54 2011
@@ -23,7 +23,7 @@
<!-- AdminConfig property place holder for the org.apache.cxf.wsn -->
<cm:property-placeholder persistent-id="org.apache.cxf.wsn" update-strategy="reload">
<cm:default-properties>
- <cm:property name="cxf.wsn.activemq" value="vm:localhost?persistent=false&jmx=false"/>
+ <cm:property name="cxf.wsn.activemq" value="vm:localhost"/>
<cm:property name="cxf.wsn.port" value="8182" />
</cm:default-properties>
</cm:property-placeholder>