You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2007/09/14 09:17:08 UTC

svn commit: r575569 - in /incubator/servicemix/branches/servicemix-3.1.2/trunk: archetypes/ archetypes/servicemix-archetypes-itests/ deployables/serviceengines/ distributions/apache-servicemix/ distributions/apache-servicemix/src/main/release/bin/

Author: ffang
Date: Fri Sep 14 00:17:07 2007
New Revision: 575569

URL: http://svn.apache.org/viewvc?rev=575569&view=rev
Log:
Preparing release-remove camel dependency from 3.1.2 release branch

Modified:
    incubator/servicemix/branches/servicemix-3.1.2/trunk/archetypes/pom.xml
    incubator/servicemix/branches/servicemix-3.1.2/trunk/archetypes/servicemix-archetypes-itests/pom.xml
    incubator/servicemix/branches/servicemix-3.1.2/trunk/deployables/serviceengines/pom.xml
    incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/pom.xml
    incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch
    incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat

Modified: incubator/servicemix/branches/servicemix-3.1.2/trunk/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1.2/trunk/archetypes/pom.xml?rev=575569&r1=575568&r2=575569&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1.2/trunk/archetypes/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1.2/trunk/archetypes/pom.xml Fri Sep 14 00:17:07 2007
@@ -47,7 +47,6 @@
         <module>servicemix-jms-provider-service-unit</module>
         <module>servicemix-jsr181-wsdl-first-service-unit</module>
         <module>servicemix-lwcontainer-service-unit</module>
-        <module>servicemix-camel-service-unit</module>
         <module>servicemix-eip-service-unit</module>
         <module>servicemix-embedded-simple</module>
         <module>servicemix-ode-service-unit</module>

Modified: incubator/servicemix/branches/servicemix-3.1.2/trunk/archetypes/servicemix-archetypes-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1.2/trunk/archetypes/servicemix-archetypes-itests/pom.xml?rev=575569&r1=575568&r2=575569&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1.2/trunk/archetypes/servicemix-archetypes-itests/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1.2/trunk/archetypes/servicemix-archetypes-itests/pom.xml Fri Sep 14 00:17:07 2007
@@ -148,11 +148,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.tooling</groupId>
-      <artifactId>servicemix-camel-service-unit</artifactId>
-      <version>${servicemix-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix.tooling</groupId>
       <artifactId>servicemix-cxf-se-service-unit</artifactId>
       <version>${servicemix-version}</version>
     </dependency>
@@ -183,6 +178,7 @@
             <exclude>**/Jsr181*</exclude>
             <exclude>**/ServiceEngine*</exclude>
             <exclude>**/EmbeddedSimple*</exclude>
+            <exclude>**/CamelServiceUnitTest*</exclude>
           </excludes>
         </configuration>
       </plugin>

Modified: incubator/servicemix/branches/servicemix-3.1.2/trunk/deployables/serviceengines/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1.2/trunk/deployables/serviceengines/pom.xml?rev=575569&r1=575568&r2=575569&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1.2/trunk/deployables/serviceengines/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1.2/trunk/deployables/serviceengines/pom.xml Fri Sep 14 00:17:07 2007
@@ -36,7 +36,6 @@
   <modules>
     <module>servicemix-bean</module>
     <module>servicemix-bpe</module>
-    <module>servicemix-camel</module>
     <module>servicemix-cxf-se</module>
     <module>servicemix-drools</module>
     <module>servicemix-eip</module>

Modified: incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/pom.xml?rev=575569&r1=575568&r2=575569&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/pom.xml Fri Sep 14 00:17:07 2007
@@ -122,10 +122,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-camel</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-components</artifactId>
     </dependency>
     <dependency>
@@ -429,13 +425,6 @@
                 <artifactItem>
                   <groupId>org.apache.servicemix</groupId>
                   <artifactId>servicemix-cxf-bc</artifactId>
-                  <version>${servicemix-version}</version>
-                  <classifier>installer</classifier>
-                  <type>zip</type>
-                </artifactItem>                
-                <artifactItem>
-                  <groupId>org.apache.servicemix</groupId>
-                  <artifactId>servicemix-camel</artifactId>
                   <version>${servicemix-version}</version>
                   <classifier>installer</classifier>
                   <type>zip</type>

Modified: incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch?rev=575569&r1=575568&r2=575569&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch (original)
+++ incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch Fri Sep 14 00:17:07 2007
@@ -78,7 +78,7 @@
   echo "                    ftp-poller, ftp-sender,"
   echo "                    jsr181-annotated, jsr181-wsdl-first,"
   echo "                    saxon-xquery, saxon-xslt,"
-  echo "                    eip, lwcontainer, bean, ode, camel"
+  echo "                    eip, lwcontainer, bean, ode,"
   echo "		    cxf-se, cxf-bc"
   echo "Optional arguments:"
   echo "  -DgroupId=xxxx"

Modified: incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat?rev=575569&r1=575568&r2=575569&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat (original)
+++ incubator/servicemix/branches/servicemix-3.1.2/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat Fri Sep 14 00:17:07 2007
@@ -49,7 +49,7 @@
 echo                     ftp-poller, ftp-sender,
 echo                     jsr181-annotated, jsr181-wsdl-first,
 echo                     saxon-xquery, saxon-xslt,
-echo                     eip, lwcontainer, bean, ode, camel
+echo                     eip, lwcontainer, bean, ode,
 echo			 cxf-se, cxf-bc
 echo Optional arguments:
 echo   -DgroupId=xxxx