servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r891508 - in /servicemix/smx4/features/trunk/assembly: pom.xml src/main/descriptors/unix-bin.xml src/main/descriptors/windows-bin.xml src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg src/main/filtered-resources/features.xml
Date Thu, 17 Dec 2009 01:22:45 GMT
Author: ccustine
Date: Thu Dec 17 01:22:44 2009
New Revision: 891508

URL: http://svn.apache.org/viewvc?rev=891508&view=rev
Log:
Fix broken features build from Camel 2.1.0 upgrade.

Modified:
    servicemix/smx4/features/trunk/assembly/pom.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=891508&r1=891507&r2=891508&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Thu Dec 17 01:22:44 2009
@@ -955,7 +955,7 @@
                             <descriptors>
                                 <descriptor>mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.camel.karaf/features/${camel.version}/xml/features</descriptor>
                                 <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
                             </descriptors>
                             <features>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=891508&r1=891507&r2=891508&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Dec 17 01:22:44
2009
@@ -282,7 +282,7 @@
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
-                <include>org.apache.camel.karaf:apache-camel:xml:features</include>
+                <include>org.apache.camel.karaf:features:xml:features</include>
             </includes>
         </dependencySet>
         <dependencySet>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=891508&r1=891507&r2=891508&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Thu Dec 17
01:22:44 2009
@@ -271,7 +271,7 @@
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
-                <include>org.apache.camel.karaf:apache-camel:xml:features</include>
+                <include>org.apache.camel.karaf:features:xml:features</include>
             </includes>
         </dependencySet>
         <dependencySet>

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg?rev=891508&r1=891507&r2=891508&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
(original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
Thu Dec 17 01:22:44 2009
@@ -20,7 +20,7 @@
 #
 # Comma separated list of features repositories to register by default
 #
-featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features
+featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/features/${camel.version}/xml/features
 
 #
 # Comma separated list of features to install at startup

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=891508&r1=891507&r2=891508&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Thu Dec
17 01:22:44 2009
@@ -18,7 +18,7 @@
 -->
 <features>
     <repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
-    <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
+    <repository>mvn:org.apache.camel.karaf/features/${camel.version}/xml/features</repository>
     <feature name="connector" version="${version}">
         <feature version="${servicemix.nmr.version}">transaction</feature>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>



Mime
View raw message