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/10/24 14:51:26 UTC
svn commit: r1188128 [2/2] - in /servicemix/smx4/features/trunk: ./
assemblies/ assemblies/apache-servicemix-full/
assemblies/apache-servicemix-full/src/
assemblies/apache-servicemix-full/src/main/
assemblies/apache-servicemix-full/src/main/descriptors...
Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml?rev=1188128&r1=1188127&r2=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml Mon Oct 24 12:51:23 2011
@@ -23,33 +23,11 @@
</formats>
<componentDescriptors>
- <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/shared/common-windows-bin.xml</componentDescriptor>
</componentDescriptors>
<fileSets>
- <!-- Cherry-pick files from the expanded Karaf distribution -->
- <fileSet>
- <directory>target/dependencies/win/apache-karaf-${karaf.version}</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>**/demos/**</exclude>
- <exclude>etc/system.properties</exclude>
- <exclude>etc/org.apache.karaf.features.cfg</exclude>
- <exclude>etc/org.apache.karaf.features.obr.cfg</exclude>
- <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
- <exclude>etc/users.properties</exclude>
- <exclude>etc/custom.properties</exclude>
- <exclude>etc/jre.properties</exclude>
- <exclude>etc/startup.properties</exclude>
- <exclude>system/**</exclude>
- <exclude>LICENSE</exclude>
- <exclude>NOTICE</exclude>
- <exclude>README</exclude>
- <exclude>RELEASE-NOTES</exclude>
- <exclude>karaf-manual*</exclude>
- </excludes>
- </fileSet>
-
<!-- Copy over kernel demo to examples folder -->
<fileSet>
<directory>target/dependencies/win/apache-karaf-${karaf.version}/demos</directory>
@@ -60,23 +38,6 @@
<include>**/web/**</include>
</includes>
</fileSet>
-
- <!-- Copy over ant files -->
- <fileSet>
- <directory>target/dependencies/win/apache-servicemix-nmr-${servicemix.nmr.version}/ant</directory>
- <outputDirectory>/ant</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
-
- <!-- Using the NMR's startup.properties because that has OBR support enabled by default -->
- <fileSet>
- <directory>target/dependencies/unix/apache-servicemix-nmr-${servicemix.nmr.version}/etc</directory>
- <outputDirectory>/etc</outputDirectory>
- <lineEnding>unix</lineEnding>
- <includes>
- <include>startup.properties</include>
- </includes>
- </fileSet>
<!-- Copy over nmr examples files -->
<fileSet>
@@ -93,32 +54,6 @@
<lineEnding>dos</lineEnding>
</fileSet>
- <!-- Copy license and other files from root -->
- <fileSet>
- <directory>${basedir}/../..</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README</include>
- <include>RELEASE*</include>
- </includes>
- <lineEnding>dos</lineEnding>
- <fileMode>0644</fileMode>
- </fileSet>
-
- <!-- Copy over everything that needs to get dos line endings -->
- <fileSet>
- <directory>src/main/distribution/text</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>dos</lineEnding>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>target/classes/etc</directory>
- <outputDirectory>/etc/</outputDirectory>
- <lineEnding>dos</lineEnding>
- <fileMode>0644</fileMode>
- </fileSet>
-
<!-- Copy over the examples -->
<fileSet>
<directory>${basedir}/../../examples</directory>
@@ -142,13 +77,6 @@
<files>
<file>
- <source>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
- <outputDirectory>/bin/</outputDirectory>
- <destName>servicemix.bat</destName>
- <fileMode>0755</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
- <file>
<source>${basedir}/target/classes/features.xml</source>
<outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
<destName>${artifactId}-${version}-features.xml</destName>
@@ -156,21 +84,6 @@
<lineEnding>dos</lineEnding>
</file>
- <file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
- <outputDirectory>/</outputDirectory>
- <destName>LICENSE</destName>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
- <file>
- <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
- <outputDirectory>/</outputDirectory>
- <destName>NOTICE</destName>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
-
<!--filtering README.txt-->
<file>
<source>${basedir}/../../examples/README.txt</source>
@@ -301,7 +214,7 @@
<lineEnding>dos</lineEnding>
</file>
<file>
- <source>${basedir}/target/classes/pom.xml</source>
+ <source>${basedir}/target/shared/pom.xml</source>
<outputDirectory>/examples/</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>
Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1188128&r1=1188127&r2=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Mon Oct 24 12:51:23 2011
@@ -25,5 +25,5 @@ featuresRepositories=mvn:org.apache.kara
#
# Comma separated list of features to install at startup
#
-featuresBoot=karaf-framework,obr,config,activemq-broker,activemq-spring,camel,camel-activemq,camel-cxf,camel-blueprint
+featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,camel,camel-activemq,camel-cxf,camel-blueprint
Modified: servicemix/smx4/features/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/pom.xml?rev=1188128&r1=1188127&r2=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/pom.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/pom.xml Mon Oct 24 12:51:23 2011
@@ -32,8 +32,15 @@
<packaging>pom</packaging>
<name>Apache ServiceMix :: Features :: Assemblies</name>
+ <properties>
+ <examples.directory>../examples</examples.directory>
+ </properties>
+
<modules>
+ <module>shared</module>
<module>apache-servicemix</module>
+ <module>apache-servicemix-jbi</module>
+ <module>apache-servicemix-full</module>
</modules>
Copied: servicemix/smx4/features/trunk/assemblies/shared/pom.xml (from r1188127, servicemix/smx4/features/trunk/assemblies/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/pom.xml?p2=servicemix/smx4/features/trunk/assemblies/shared/pom.xml&p1=servicemix/smx4/features/trunk/assemblies/pom.xml&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/pom.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/shared/pom.xml Mon Oct 24 12:51:23 2011
@@ -23,18 +23,26 @@
<parent>
<groupId>org.apache.servicemix</groupId>
- <artifactId>parent</artifactId>
+ <artifactId>assemblies</artifactId>
<version>4.4.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
</parent>
- <artifactId>assemblies</artifactId>
- <packaging>pom</packaging>
- <name>Apache ServiceMix :: Features :: Assemblies</name>
-
- <modules>
- <module>apache-servicemix</module>
- </modules>
+ <groupId>org.apache.servicemix.assemblies</groupId>
+ <artifactId>shared</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache ServiceMix :: Features :: Assemblies :: Shared files</name>
+ <build>
+ <resources>
+ <resource>
+ <!-- we need unfiltered copies of these files -->
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/filtered-resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/filtered-resources/pom.xml (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/filtered-resources/pom.xml?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/filtered-resources/pom.xml&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Added: servicemix/smx4/features/trunk/assemblies/shared/src/main/filtered-resources/startup-obr.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/filtered-resources/startup-obr.properties?rev=1188128&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/shared/src/main/filtered-resources/startup-obr.properties (added)
+++ servicemix/smx4/features/trunk/assemblies/shared/src/main/filtered-resources/startup-obr.properties Mon Oct 24 12:51:23 2011
@@ -0,0 +1,4 @@
+
+# enabling features OBR resolver support
+org/apache/felix/org.apache.felix.bundlerepository/${felix.obr.version}/org.apache.felix.bundlerepository-${felix.obr.version}.jar=10
+org/apache/karaf/features/org.apache.karaf.features.obr/${karaf.version}/org.apache.karaf.features.obr-${karaf.version}.jar=30
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/appended-resources/META-INF/LICENSE.vm (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/appended-resources/META-INF/LICENSE.vm?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/appended-resources/META-INF/LICENSE.vm&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm (original)
+++ servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/appended-resources/META-INF/LICENSE.vm Mon Oct 24 12:51:23 2011
@@ -24,7 +24,7 @@
Apache ServiceMix includes a number of components and libraries with
separate copyright notices and license terms. Your use of those
components are subject to the terms and conditions of the following
-licenses.
+licenses.
#set ( $apacheTxt = "The Apache Software License, Version 2.0" )
#foreach ( $project in $projects )
Added: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/appended-resources/META-INF/NOTICE?rev=1188128&view=auto
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/common-bin.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/descriptors/common-bin.xml&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Added: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-unix-bin.xml?rev=1188128&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-unix-bin.xml (added)
+++ servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-unix-bin.xml Mon Oct 24 12:51:23 2011
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<component>
+ <fileSets>
+ <!-- Cherry-pick files from the expanded Karaf distribution -->
+ <fileSet>
+ <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/demos/**</exclude>
+ <exclude>bin/**</exclude>
+ <exclude>etc/system.properties</exclude>
+ <exclude>etc/org.apache.karaf.features.cfg</exclude>
+ <exclude>etc/org.apache.karaf.features.obr.cfg</exclude>
+ <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
+ <exclude>etc/users.properties</exclude>
+ <exclude>etc/custom.properties</exclude>
+ <exclude>etc/jre.properties</exclude>
+ <exclude>system/**</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README</exclude>
+ <exclude>RELEASE-NOTES</exclude>
+ <exclude>karaf-manual*</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Copy over bin/* scripts separately to get the correct file mode -->
+ <fileSet>
+ <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/../..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README</include>
+ <include>RELEASE*</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <!-- Copy over everything that needs to get unix line endings -->
+ <fileSet>
+ <directory>target/shared/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/shared/licenses</directory>
+ <outputDirectory>/licenses/</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <!-- Copy over filtered resources -->
+ <fileSet>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <includes>
+ <include>*.*</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ </fileSets>
+
+ <files>
+ <file>
+ <source>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
+ <outputDirectory>/bin/</outputDirectory>
+ <destName>servicemix</destName>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+
+</component>
Added: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-windows-bin.xml?rev=1188128&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-windows-bin.xml (added)
+++ servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-windows-bin.xml Mon Oct 24 12:51:23 2011
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<component>
+ <fileSets>
+ <!-- Cherry-pick files from the expanded Karaf distribution -->
+ <fileSet>
+ <directory>target/dependencies/win/apache-karaf-${karaf.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/demos/**</exclude>
+ <exclude>etc/system.properties</exclude>
+ <exclude>etc/org.apache.karaf.features.cfg</exclude>
+ <exclude>etc/org.apache.karaf.features.obr.cfg</exclude>
+ <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
+ <exclude>etc/users.properties</exclude>
+ <exclude>etc/custom.properties</exclude>
+ <exclude>etc/jre.properties</exclude>
+ <exclude>etc/startup.properties</exclude>
+ <exclude>system/**</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README</exclude>
+ <exclude>RELEASE-NOTES</exclude>
+ <exclude>karaf-manual*</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/../..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README</include>
+ <include>RELEASE*</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <!-- Copy over everything that needs to get dos line endings -->
+ <fileSet>
+ <directory>target/shared/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/shared/licenses</directory>
+ <outputDirectory>/licenses/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ </fileSets>
+
+ <files>
+ <file>
+ <source>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
+ <outputDirectory>/bin/</outputDirectory>
+ <destName>servicemix.bat</destName>
+ <fileMode>0755</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ </files>
+
+</component>
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/activemq-broker.xml (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/activemq-broker.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/activemq-broker.xml?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/activemq-broker.xml&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/activemq-broker.xml&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/custom.properties (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/custom.properties)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/custom.properties?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/custom.properties&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/custom.properties&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/jre.properties)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/jre.properties&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.aries.transaction.cfg (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.aries.transaction.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.aries.transaction.cfg?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.aries.transaction.cfg&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.aries.transaction.cfg&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.karaf.features.obr.cfg (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.karaf.features.obr.cfg?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.karaf.features.obr.cfg&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.servicemix.jbi.cfg (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.jbi.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.servicemix.jbi.cfg?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.servicemix.jbi.cfg&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.jbi.cfg&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.servicemix.nmr.cfg (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.nmr.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.servicemix.nmr.cfg?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.apache.servicemix.nmr.cfg&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.apache.servicemix.nmr.cfg&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.logging.cfg (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.logging.cfg?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.logging.cfg&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.web.cfg)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/org.ops4j.pax.web.cfg&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/system.properties (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/system.properties)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/system.properties?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/system.properties&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/system.properties&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/users.properties (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/users.properties)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/users.properties?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/users.properties&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/etc/users.properties&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/asm.txt (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/asm.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/asm.txt?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/asm.txt&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/asm.txt&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/bsd.txt (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/bsd.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/bsd.txt?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/bsd.txt&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/bsd.txt&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/cddl-1.0.txt (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cddl-1.0.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/cddl-1.0.txt?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/cddl-1.0.txt&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cddl-1.0.txt&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Copied: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/cpl-1.0.txt (from r1188127, servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cpl-1.0.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/cpl-1.0.txt?p2=servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/licenses/cpl-1.0.txt&p1=servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/distribution/text/licenses/cpl-1.0.txt&r1=1188127&r2=1188128&rev=1188128&view=diff
==============================================================================
(empty)
Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1188128&r1=1188127&r2=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Mon Oct 24 12:51:23 2011
@@ -38,9 +38,12 @@
<!-- Properties -->
<properties>
<activemq.version>5.5.0</activemq.version>
- <camel.version>2.8.1</camel.version>
- <cxf.version>2.4.2</cxf.version>
- <karaf.version>2.2.2</karaf.version>
+ <camel.version>2.8.2-SNAPSHOT</camel.version>
+ <cxf.version>2.4.3</cxf.version>
+
+ <felix.obr.version>1.6.4</felix.obr.version>
+
+ <karaf.version>2.2.4</karaf.version>
<servicemix.components.version>2011.02-SNAPSHOT</servicemix.components.version>
<servicemix.nmr.version>1.5.0-SNAPSHOT</servicemix.nmr.version>
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1188128&r1=1188127&r2=1188128&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Oct 24 12:51:23 2011
@@ -41,7 +41,7 @@
<module>camel</module>
<module>cxf</module>
<module>examples</module>
- <module>assembly</module>
+ <module>assemblies</module>
</modules>
<scm>
@@ -180,8 +180,8 @@
<!-- Maven Plugins -->
<depends-maven-plugin.version>1.2</depends-maven-plugin.version>
<jbi-maven-plugin.version>4.4</jbi-maven-plugin.version>
- <maven-antrun-plugin.version>1.2</maven-antrun-plugin.version>
- <maven-assembly-plugin.version>2.2-beta-4</maven-assembly-plugin.version>
+ <maven-antrun-plugin.version>1.6</maven-antrun-plugin.version>
+ <maven-assembly-plugin.version>2.2.1</maven-assembly-plugin.version>
<maven-bundle-plugin.version>2.1.0</maven-bundle-plugin.version>
<!-- Other Dependencies -->
@@ -776,18 +776,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5.3-1</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>