You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2011/03/28 08:58:16 UTC
svn commit: r1086139 - in /servicemix/smx4/features/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/distribution/text/etc/
assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/etc/
Author: gertv
Date: Mon Mar 28 06:58:16 2011
New Revision: 1086139
URL: http://svn.apache.org/viewvc?rev=1086139&view=rev
Log:
Fix a few issues in the kit and remove override for Camel features descriptor
Removed:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
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/distribution/text/etc/custom.properties
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1086139&r1=1086138&r2=1086139&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Mar 28 06:58:16 2011
@@ -267,7 +267,13 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>apache-camel</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
<!-- CXF -->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -707,7 +713,7 @@
<descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
<descriptor>file:${basedir}/target/classes/activemq-features.xml</descriptor>
- <descriptor>file:${basedir}/target/classes/camel-features.xml</descriptor>
+ <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.ode/ode-jbi-karaf/${ode.version}/xml/features</descriptor>
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
</descriptors>
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=1086139&r1=1086138&r2=1086139&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 Mon Mar 28 06:58:16 2011
@@ -186,13 +186,6 @@
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
- <file>
- <source>${basedir}/target/classes/camel-features.xml</source>
- <outputDirectory>system/org/apache/camel/karaf/apache-camel/${camel.version}</outputDirectory>
- <destName>apache-camel-${camel.version}-features.xml</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
<file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
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=1086139&r1=1086138&r2=1086139&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 Mon Mar 28 06:58:16 2011
@@ -168,13 +168,6 @@
<fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
</file>
- <file>
- <source>${basedir}/target/classes/camel-features.xml</source>
- <outputDirectory>system/org/apache/camel/karaf/apache-camel/${camel.version}</outputDirectory>
- <destName>apache-camel-${camel.version}-features.xml</destName>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
<file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
Modified: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties?rev=1086139&r1=1086138&r2=1086139&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties Mon Mar 28 06:58:16 2011
@@ -22,8 +22,6 @@
# All the values specified here will override the default value.
#
-karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
-
karaf.systemBundlesStartLevel=50
obr.repository.url=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/repository.xml
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml?rev=1086139&r1=1086138&r2=1086139&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml Mon Mar 28 06:58:16 2011
@@ -16,7 +16,7 @@
limitations under the License.
-->
<features name="activemq-${activemq.version}">
- <repository>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</repository>
+ <repository>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</repository>
<feature name="activemq" version="${activemq.version}">
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1086139&r1=1086138&r2=1086139&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Mon Mar 28 06:58:16 2011
@@ -20,7 +20,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.karaf/apache-karaf/${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,mvn:org.apache.ode/ode-jbi-karaf/${ode.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${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,mvn:org.apache.ode/ode-jbi-karaf/${ode.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.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=1086139&r1=1086138&r2=1086139&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 Mon Mar 28 06:58:16 2011
@@ -16,7 +16,8 @@
limitations under the License.
-->
<features>
- <repository>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</repository>
+ <repository>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</repository>
+ <repository>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</repository>
<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>
<feature name="connector" version="${version}">
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1086139&r1=1086138&r2=1086139&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Mar 28 06:58:16 2011
@@ -566,6 +566,13 @@
<artifactId>camel-test</artifactId>
<version>${camel.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>apache-camel</artifactId>
+ <version>${camel.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
<!-- CXF -->
<dependency>