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

svn commit: r573918 - in /incubator/servicemix/branches/servicemix-3.1: ./ archetypes/ archetypes/servicemix-bean-service-unit/ archetypes/servicemix-binding-component/ archetypes/servicemix-eip-service-unit/ archetypes/servicemix-embedded-simple/ arch...

Author: gnodet
Date: Sat Sep  8 15:24:58 2007
New Revision: 573918

URL: http://svn.apache.org/viewvc?rev=573918&view=rev
Log:
Upgrade to spring 2.0.6 and fix unit tests

Modified:
    incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-binding-component/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-eip-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-embedded-simple/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-consumer-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-provider-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-lwcontainer-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ode-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xquery-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xslt-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-assembly/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-engine/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-shared-library/pom.xml
    incubator/servicemix/branches/servicemix-3.1/deployables/serviceengines/servicemix-script/pom.xml
    incubator/servicemix/branches/servicemix-3.1/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb
    incubator/servicemix/branches/servicemix-3.1/pom.xml

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml Sat Sep  8 15:24:58 2007
@@ -92,7 +92,6 @@
 					<filters>
 						<servicemix-version>${servicemix-version}</servicemix-version>
 						<xbean-version>${xbean-version}</xbean-version>
-						<camel-version>${camel-version}</camel-version>
 						<xfire-version>${xfire-version}</xfire-version>
 						<repositories><![CDATA[  
   <pluginRepositories>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -22,11 +22,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-bean-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: BeanServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-binding-component/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-binding-component/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-binding-component/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-binding-component/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-binding-component</artifactId>
   <name>ServiceMix :: Archetypes :: BindingComponent</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-eip-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-eip-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-eip-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-eip-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-eip-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: EIPServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-embedded-simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-embedded-simple/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-embedded-simple/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-embedded-simple/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-embedded-simple</artifactId>
   <name>ServiceMix :: Archetypes :: EmbeddedSimple</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -22,11 +22,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-ftp-poller-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: FtpPollerServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -22,11 +22,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-ftp-sender-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: FtpSenderServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-consumer-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-consumer-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-consumer-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-consumer-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-http-consumer-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: HttpConsumerServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-provider-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-provider-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-provider-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-provider-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-http-provider-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: HttpProviderServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-jms-consumer-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: JmsConsumerServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-jms-provider-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: JmsProviderServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-jsr181-annotated-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: Jsr181AnnotatedServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-jsr181-wsdl-first-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: Jsr181WsdlFirstServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-lwcontainer-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-lwcontainer-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-lwcontainer-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-lwcontainer-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-lwcontainer-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: LWContainerServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ode-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ode-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ode-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ode-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-ode-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: ServiceMixODEServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xquery-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xquery-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xquery-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xquery-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-saxon-xquery-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: SaxonXQueryServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xslt-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xslt-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xslt-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xslt-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-saxon-xslt-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: SaxonXsltServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-assembly/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-assembly/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-assembly/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-service-assembly</artifactId>
   <name>ServiceMix :: Archetypes :: ServiceAssembly</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-engine/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-engine/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-engine/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-engine/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-service-engine</artifactId>
   <name>ServiceMix :: Archetypes :: ServiceEngine</name>
   

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-unit/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-unit/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-unit/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-service-unit</artifactId>
   <name>ServiceMix :: Archetypes :: ServiceUnit</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-shared-library/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-shared-library/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-shared-library/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-shared-library/pom.xml Sat Sep  8 15:24:58 2007
@@ -21,11 +21,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>tooling</artifactId>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
     <version>3.1.2-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-shared-library</artifactId>
   <name>ServiceMix :: Archetypes :: SharedLibrary</name>
 

Modified: incubator/servicemix/branches/servicemix-3.1/deployables/serviceengines/servicemix-script/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/deployables/serviceengines/servicemix-script/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/deployables/serviceengines/servicemix-script/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/deployables/serviceengines/servicemix-script/pom.xml Sat Sep  8 15:24:58 2007
@@ -83,7 +83,7 @@
 		<dependency>
 			<groupId>org.jruby</groupId>
 			<artifactId>jruby</artifactId>
-			<version>0.8.3</version>
+			<version>1.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

Modified: incubator/servicemix/branches/servicemix-3.1/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb (original)
+++ incubator/servicemix/branches/servicemix-3.1/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb Sat Sep  8 15:24:58 2007
@@ -17,14 +17,15 @@
 # limitations under the License.
 #
 #
-require 'java'
+include Java
 
-include_class 'javax.jbi.messaging.MessageExchange'
-include_class 'org.apache.servicemix.jbi.jaxp.StringSource'
-include_class 'org.apache.servicemix.common.ExchangeProcessor'
-include_class 'org.apache.servicemix.script.ScriptExchangeHelper'
+import javax.jbi.messaging.MessageExchange
+import org.apache.servicemix.jbi.jaxp.StringSource
+import org.apache.servicemix.common.ExchangeProcessor
+import org.apache.servicemix.script.ScriptExchangeHelper
 
-class RubyExchangeProcessor < ExchangeProcessor
+class RubyExchangeProcessor
+ include ExchangeProcessor
 
  def setExchangeHelper(exchangeHelper)
   @exchangeHelper = exchangeHelper
@@ -41,7 +42,7 @@
    print @exchangeHelper
    print "\n"
    out = exchange.createMessage()
-   out.setContent(StringSource.new("<world>hello</world>"))
+   out.content = StringSource.new("<world>hello</world>")
    exchange.setMessage(out, "out")
    @exchangeHelper.sendExchange(exchange)
  end

Modified: incubator/servicemix/branches/servicemix-3.1/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/pom.xml?rev=573918&r1=573917&r2=573918&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/pom.xml Sat Sep  8 15:24:58 2007
@@ -196,7 +196,7 @@
         <xfire-version>1.2.5</xfire-version>
         <mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
         <xbean-version>3.0.1</xbean-version>
-        <spring-version>2.0.5</spring-version>
+        <spring-version>2.0.6</spring-version>
         <activemq-version>4.1.1</activemq-version>
         <activeio-version>3.0.0-incubator</activeio-version>
         <backport-util-concurrent-version>2.2</backport-util-concurrent-version>