servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r428724 - in /incubator/servicemix/trunk: ./ apache-servicemix/ apache-servicemix/src/main/assembly/ apache-servicemix/src/main/release/examples/bpel-bpe/ apache-servicemix/src/main/release/examples/http-binding/ apache-servicemix/src/main/...
Date Fri, 04 Aug 2006 13:41:21 GMT
Author: gnodet
Date: Fri Aug  4 06:41:20 2006
New Revision: 428724

URL: http://svn.apache.org/viewvc?rev=428724&view=rev
Log:
Move servicemix-web to the samples dir, include the new loan-broker and bridge examples.
Remove soap-binding, http-binding, jms-binding, bpel-bpe, quartz-binding which are somewhat
duplicated by the new examples.

Added:
    incubator/servicemix/trunk/apache-servicemix/src/sandbox/bpel-bpe/
      - copied from r428384, incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/bpel-bpe/
    incubator/servicemix/trunk/apache-servicemix/src/sandbox/http-binding/
      - copied from r428384, incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/http-binding/
    incubator/servicemix/trunk/apache-servicemix/src/sandbox/jms-binding/
      - copied from r428384, incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/jms-binding/
    incubator/servicemix/trunk/apache-servicemix/src/sandbox/loan-broker/
      - copied from r428384, incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/loan-broker/
    incubator/servicemix/trunk/apache-servicemix/src/sandbox/quartz-binding/
      - copied from r428384, incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/quartz-binding/
    incubator/servicemix/trunk/apache-servicemix/src/sandbox/soap-binding/
      - copied from r428384, incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/soap-binding/
    incubator/servicemix/trunk/samples/servicemix-web/
      - copied from r428384, incubator/servicemix/trunk/servicemix-web/
Removed:
    incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/bpel-bpe/
    incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/http-binding/
    incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/jms-binding/
    incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/loan-broker/
    incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/quartz-binding/
    incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/soap-binding/
    incubator/servicemix/trunk/servicemix-web/
Modified:
    incubator/servicemix/trunk/apache-servicemix/pom.xml
    incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml
    incubator/servicemix/trunk/pom.xml
    incubator/servicemix/trunk/samples/pom.xml
    incubator/servicemix/trunk/samples/servicemix-web/pom.xml

Modified: incubator/servicemix/trunk/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/pom.xml?rev=428724&r1=428723&r2=428724&view=diff
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/pom.xml Fri Aug  4 06:41:20 2006
@@ -36,74 +36,79 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-jbi</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-core</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-services</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-components</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-common</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-jms</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-http</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-jsr181</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-lwcontainer</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-sca</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-wsn2005</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-eip</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-components</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-beanflow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.samples</groupId>
       <artifactId>servicemix-web</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-components</artifactId>
+      <groupId>org.apache.servicemix.samples</groupId>
+      <artifactId>wsdl-first</artifactId>
+      <type>pom</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-beanflow</artifactId>
+      <groupId>org.apache.servicemix.samples</groupId>
+      <artifactId>loan-broker</artifactId>
+      <type>pom</type>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.samples</groupId>
-      <artifactId>wsdl-first</artifactId>
+      <artifactId>bridge</artifactId>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -119,6 +124,10 @@
       <artifactId>geronimo-servlet_2.4_spec</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+    </dependency>
+    <dependency>
       <groupId>classworlds</groupId>
       <artifactId>classworlds</artifactId>
     </dependency>
@@ -280,7 +289,7 @@
               <outputDirectory>target/samples</outputDirectory>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${pom.groupId}</groupId>
+                  <groupId>org.apache.servicemix.samples</groupId>
                   <artifactId>servicemix-web</artifactId>
                   <version>3.0-incubating-SNAPSHOT</version>
                   <classifier>src</classifier>
@@ -289,6 +298,20 @@
                 <artifactItem>
                   <groupId>org.apache.servicemix.samples</groupId>
                   <artifactId>wsdl-first</artifactId>
+                  <version>3.0-incubating-SNAPSHOT</version>
+                  <classifier>src</classifier>
+                  <type>zip</type>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.servicemix.samples</groupId>
+                  <artifactId>loan-broker</artifactId>
+                  <version>3.0-incubating-SNAPSHOT</version>
+                  <classifier>src</classifier>
+                  <type>zip</type>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.servicemix.samples</groupId>
+                  <artifactId>bridge</artifactId>
                   <version>3.0-incubating-SNAPSHOT</version>
                   <classifier>src</classifier>
                   <type>zip</type>

Modified: incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml?rev=428724&r1=428723&r2=428724&view=diff
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml Fri Aug  4 06:41:20
2006
@@ -50,6 +50,14 @@
       <outputDirectory>examples/wsdl-first</outputDirectory>
     </fileSet>
     <fileSet>
+      <directory>target/samples/loan-broker-${pom.version}</directory>
+      <outputDirectory>examples/loan-broker</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/samples/bridge-${pom.version}</directory>
+      <outputDirectory>examples/bridge</outputDirectory>
+    </fileSet>
+    <fileSet>
       <directory>target/dummy</directory>
       <outputDirectory>lib/optional</outputDirectory>
     </fileSet>

Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?rev=428724&r1=428723&r2=428724&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Fri Aug  4 06:41:20 2006
@@ -232,7 +232,6 @@
                 <module>servicemix-wsn2005</module>
                 <module>servicemix-lwcontainer</module>
                 <module>servicemix-sca</module>
-                <module>servicemix-web</module>
                 <module>servicemix-eip</module>
                 <module>servicemix-itests</module>
                 <module>servicemix-sca</module>
@@ -277,7 +276,6 @@
                 <module>servicemix-wsn2005</module>
                 <module>servicemix-lwcontainer</module>
                 <module>servicemix-sca</module>
-                <module>servicemix-web</module>
                 <module>servicemix-eip</module>
                 <module>servicemix-itests</module>
                 <module>servicemix-sca</module>
@@ -399,94 +397,94 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-jbi</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-services</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-core</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-components</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-common</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-common</artifactId>
                 <type>jbi-shared-library</type>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-console</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-gbean</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-jms</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-jsr181</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-http</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-sca</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-soap</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-soap</artifactId>
                 <type>jbi-shared-library</type>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-wsn2005</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-lwcontainer</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-eip</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix.samples</groupId>
                 <artifactId>servicemix-web</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
                 <type>war</type>
@@ -498,7 +496,19 @@
                 <type>pom</type>
             </dependency>
             <dependency>
-                <groupId>${pom.groupId}</groupId>
+                <groupId>org.apache.servicemix.samples</groupId>
+                <artifactId>loan-broker</artifactId>
+                <version>3.0-incubating-SNAPSHOT</version>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.samples</groupId>
+                <artifactId>bridge</artifactId>
+                <version>3.0-incubating-SNAPSHOT</version>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-beanflow</artifactId>
                 <version>3.0-incubating-SNAPSHOT</version>
             </dependency>

Modified: incubator/servicemix/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/pom.xml?rev=428724&r1=428723&r2=428724&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/pom.xml (original)
+++ incubator/servicemix/trunk/samples/pom.xml Fri Aug  4 06:41:20 2006
@@ -32,12 +32,12 @@
   <groupId>org.apache.servicemix</groupId>
   <artifactId>samples</artifactId>
   <name>ServiceMix :: Samples</name>
-  <url>http://servicemix.org</url>
   <packaging>pom</packaging>
 
   <modules>
     <module>wsdl-first</module>
     <module>loan-broker</module>
     <module>bridge</module>
+    <module>servicemix-web</module>
   </modules>
 </project>

Modified: incubator/servicemix/trunk/samples/servicemix-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/pom.xml?rev=428724&r1=428384&r2=428724&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/pom.xml (original)
+++ incubator/servicemix/trunk/samples/servicemix-web/pom.xml Fri Aug  4 06:41:20 2006
@@ -25,21 +25,22 @@
 
   <parent>
     <groupId>org.apache.servicemix</groupId>
-    <artifactId>servicemix</artifactId>
+    <artifactId>samples</artifactId>
     <version>3.0-incubating-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.servicemix.samples</groupId>
   <artifactId>servicemix-web</artifactId>
   <packaging>war</packaging>
   <name>ServiceMix :: Web</name>
   
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-components</artifactId>
     </dependency>
     <dependency>
@@ -98,7 +99,7 @@
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
         <configuration>
-          <scanIntervalSeconds>10</scanIntervalSeconds>
+          <scanIntervalSeconds>1</scanIntervalSeconds>
           <webAppSourceDirectory>${basedir}/src/webapp</webAppSourceDirectory>
         </configuration>
       </plugin>



Mime
View raw message