You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ch...@apache.org on 2008/06/19 17:34:01 UTC

svn commit: r669509 - in /servicemix/sandbox/chirino/smx3-trunk-component-splitout: ./ archetypes/ build/ common/ common/servicemix-beanflow/ common/servicemix-common/ common/servicemix-soap/ common/servicemix-soap2/ core/ core/servicemix-audit/ core/s...

Author: chirino
Date: Thu Jun 19 08:34:00 2008
New Revision: 669509

URL: http://svn.apache.org/viewvc?rev=669509&view=rev
Log:
Started massaging the smx3 trunk build to start using the new split out components..


Added:
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/
      - copied from r669199, servicemix/smx3/trunk/
Removed:
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/archetypes/
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/build/
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/common/servicemix-beanflow/
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/common/servicemix-common/
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/common/servicemix-soap/
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/common/servicemix-soap2/
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/deployables/
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/tooling/
Modified:
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/common/pom.xml
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/pom.xml
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/servicemix-audit/pom.xml
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/servicemix-core/pom.xml
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/distributions/pom.xml
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/parent/pom.xml
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/platforms/pom.xml
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/pom.xml
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/samples/pom.xml
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/servicemix-itests/pom.xml
    servicemix/sandbox/chirino/smx3-trunk-component-splitout/web/pom.xml

Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/common/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/common/pom.xml?rev=669509&r1=669199&r2=669509&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/common/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/common/pom.xml Thu Jun 19 08:34:00 2008
@@ -34,19 +34,15 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>servicemix-common</module>
         <module>servicemix-components</module>
-        <module>servicemix-soap</module>
-        <module>servicemix-soap2</module>
-        <module>servicemix-beanflow</module>
     </modules>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -61,8 +57,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.3-SNAPSHOT</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/pom.xml?rev=669509&r1=669199&r2=669509&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/pom.xml Thu Jun 19 08:34:00 2008
@@ -44,8 +44,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -60,8 +60,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.3-SNAPSHOT</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/servicemix-audit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/servicemix-audit/pom.xml?rev=669509&r1=669199&r2=669509&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/servicemix-audit/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/servicemix-audit/pom.xml Thu Jun 19 08:34:00 2008
@@ -57,7 +57,8 @@
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix</groupId>
-        <artifactId>build</artifactId>
+        <artifactId>servicemix-build</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <goals>

Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/servicemix-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/servicemix-core/pom.xml?rev=669509&r1=669199&r2=669509&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/servicemix-core/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/core/servicemix-core/pom.xml Thu Jun 19 08:34:00 2008
@@ -319,7 +319,8 @@
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix</groupId>
-        <artifactId>build</artifactId>
+        <artifactId>servicemix-build</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <goals>

Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/distributions/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/distributions/pom.xml?rev=669509&r1=669199&r2=669509&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/distributions/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/distributions/pom.xml Thu Jun 19 08:34:00 2008
@@ -42,8 +42,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -58,8 +58,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.3-SNAPSHOT</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -69,8 +69,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>${project.version}</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
                 <executions>

Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/parent/pom.xml?rev=669509&r1=669199&r2=669509&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/parent/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/parent/pom.xml Thu Jun 19 08:34:00 2008
@@ -58,8 +58,8 @@
               <dependencies>
                 <dependency>
                   <groupId>org.apache.servicemix</groupId>
-                  <artifactId>build</artifactId>
-                  <version>${project.version}</version>
+                  <artifactId>servicemix-build</artifactId>
+                  <version>1.0</version>
                 </dependency>
               </dependencies>
               <executions>
@@ -87,8 +87,8 @@
               <dependencies>
                 <dependency>
                   <groupId>org.apache.servicemix</groupId>
-                  <artifactId>build</artifactId>
-                  <version>${project.version}</version>
+                  <artifactId>servicemix-build</artifactId>
+                  <version>1.0</version>
                 </dependency>
               </dependencies>
               <configuration>
@@ -141,8 +141,8 @@
                       <dependencies>
                           <dependency>
                               <groupId>org.apache.servicemix</groupId>
-                              <artifactId>build</artifactId>
-                              <version>${project.version}</version>
+                              <artifactId>servicemix-build</artifactId>
+                              <version>1.0</version>
                           </dependency>
                       </dependencies>
                       <executions>
@@ -180,8 +180,8 @@
           <dependencies>
               <dependency>
                   <groupId>org.apache.servicemix</groupId>
-                  <artifactId>build</artifactId>
-                  <version>${project.version}</version>
+                  <artifactId>servicemix-build</artifactId>
+                  <version>1.0</version>
               </dependency>
           </dependencies>
           <executions>

Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/platforms/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/platforms/pom.xml?rev=669509&r1=669199&r2=669509&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/platforms/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/platforms/pom.xml Thu Jun 19 08:34:00 2008
@@ -41,8 +41,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -57,8 +57,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.3-SNAPSHOT</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/pom.xml?rev=669509&r1=669199&r2=669509&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/pom.xml Thu Jun 19 08:34:00 2008
@@ -206,6 +206,9 @@
     </scm>
 
     <properties>
+        <servicemix-common-version>4.0-SNAPSHOT</servicemix-common-version>
+        <servicemix-shared-version>4.0-SNAPSHOT</servicemix-shared-version>
+        
         <xfire-jsr181-api-version>1.0-M1</xfire-jsr181-api-version>
         <xfire-version>1.2.5</xfire-version>
         <mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
@@ -248,13 +251,9 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>build</module>
                 <module>parent</module>
                 <module>core</module>
                 <module>common</module>
-                <module>tooling</module>
-                <module>deployables</module>
-                <module>archetypes</module>
                 <module>servicemix-itests</module>
                 <module>samples</module>
                 <module>web</module>
@@ -271,11 +270,9 @@
                 </property>
             </activation>
             <modules>
-                <module>build</module>
                 <module>parent</module>
                 <module>core</module>
                 <module>common</module>
-                <module>tooling</module>
             </modules>
         </profile>
         <profile>
@@ -287,8 +284,6 @@
                 </property>
             </activation>
             <modules>
-                <module>deployables</module>
-                <module>archetypes</module>
                 <module>servicemix-itests</module>
                 <module>samples</module>
                 <module>web</module>
@@ -333,12 +328,8 @@
         <profile>
             <id>deploy</id>
             <modules>
-                <module>build</module>
                 <module>core</module>
                 <module>common</module>
-                <module>tooling</module>
-                <module>deployables</module>
-                <module>archetypes</module>
                 <module>servicemix-itests</module>
                 <module>samples</module>
                 <module>web</module>
@@ -385,13 +376,9 @@
            <profile>
 	          <id>setup.eclipse</id>
             <modules>
-                <module>build</module>
                 <module>parent</module>
                 <module>core</module>
                 <module>common</module>
-                <module>tooling</module>
-                <module>deployables</module>
-                <module>archetypes</module>
                 <module>servicemix-itests</module>
                 <module>samples</module>
                 <module>web</module>
@@ -428,8 +415,8 @@
 	                    <dependencies>
 							<dependency>
 								<groupId>org.apache.servicemix</groupId>
-								<artifactId>build</artifactId>
-								<version>${servicemix-version}</version>
+								<artifactId>servicemix-build</artifactId>
+								<version>1.0</version>
 							</dependency>
 	                        <dependency>
 	                            <groupId>ant</groupId>
@@ -719,7 +706,7 @@
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-common</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-common-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
@@ -764,17 +751,17 @@
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-soap</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-common-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-soap2</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-common-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-shared</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <version>${servicemix-shared-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
@@ -2024,7 +2011,7 @@
                 <plugin>
                     <groupId>org.apache.servicemix.tooling</groupId>
                     <artifactId>jbi-maven-plugin</artifactId>
-                    <version>3.3-SNAPSHOT</version>
+                    <version>4.0-SNAPSHOT</version>
                     <extensions>true</extensions>
                 </plugin>
                 <plugin>

Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/samples/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/samples/pom.xml?rev=669509&r1=669199&r2=669509&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/samples/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/samples/pom.xml Thu Jun 19 08:34:00 2008
@@ -51,8 +51,8 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -67,8 +67,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.3-SNAPSHOT</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/servicemix-itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/servicemix-itests/pom.xml?rev=669509&r1=669199&r2=669509&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/servicemix-itests/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/servicemix-itests/pom.xml Thu Jun 19 08:34:00 2008
@@ -124,8 +124,8 @@
       </plugin>
       <plugin>
         <groupId>org.apache.servicemix</groupId>
-        <artifactId>build</artifactId>
-        <version>${servicemix-version}</version>
+        <artifactId>servicemix-build</artifactId>
+        <version>1.0</version>
         <executions>
             <execution>
                 <goals>
@@ -140,8 +140,8 @@
         <dependencies>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>3.3-SNAPSHOT</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
             </dependency>
         </dependencies>
       </plugin>

Modified: servicemix/sandbox/chirino/smx3-trunk-component-splitout/web/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/chirino/smx3-trunk-component-splitout/web/pom.xml?rev=669509&r1=669199&r2=669509&view=diff
==============================================================================
--- servicemix/sandbox/chirino/smx3-trunk-component-splitout/web/pom.xml (original)
+++ servicemix/sandbox/chirino/smx3-trunk-component-splitout/web/pom.xml Thu Jun 19 08:34:00 2008
@@ -42,8 +42,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
+                <artifactId>servicemix-build</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -58,8 +58,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.3-SNAPSHOT</version>
+                        <artifactId>servicemix-build</artifactId>
+                        <version>1.0</version>
                     </dependency>
                 </dependencies>
             </plugin>