Author: gnodet
Date: Fri Mar 30 05:47:26 2007
New Revision: 524065

URL: http://svn.apache.org/viewvc?view=rev&rev=524065
Log:
SM-913: Improve archetypes and add a batch file for ease of use

Added:
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/BeanServiceUnitTest.java
      - copied unchanged from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/BeanServiceUnitTest.java
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpPollerServiceUnitTest.java
      - copied unchanged from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpPollerServiceUnitTest.java
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpSenderServiceUnitTest.java
      - copied unchanged from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpSenderServiceUnitTest.java
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/pom.xml
      - copied, changed from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/pom.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/META-INF/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/META-INF/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/META-INF/maven/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/META-INF/maven/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml
      - copied, changed from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/java/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/java/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/resources/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/resources/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/pom.xml
      - copied, changed from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/pom.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/META-INF/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/META-INF/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/META-INF/maven/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/META-INF/maven/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/META-INF/maven/archetype.xml
      - copied unchanged from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/META-INF/maven/archetype.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml
      - copied, changed from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/src/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/src/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/src/main/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/src/main/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/src/main/resources/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/src/main/resources/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
      - copied unchanged from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/pom.xml
      - copied, changed from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/pom.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/META-INF/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/META-INF/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/META-INF/maven/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/META-INF/maven/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml
      - copied, changed from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/src/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/src/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/src/main/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/src/main/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/src/main/resources/
      - copied from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/src/main/resources/
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
      - copied unchanged from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
    
incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch
      - copied, changed from r524059, 
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch
    
incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat
      - copied, changed from r524059, 
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat
Modified:
    incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-archetypes-itests/pom.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/META-INF/maven/archetype.xml
   (contents, props changed)
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/java/MyBean.java
   (contents, props changed)
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
   (contents, props changed)
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/META-INF/maven/archetype.xml
   (contents, props changed)
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/src/main/resources/services.xml
    
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/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?view=diff&rev=524065&r1=524064&r2=524065
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml Fri Mar 30 
05:47:26 2007
@@ -1,84 +1,87 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-
-<!--
-
-    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.
--->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>servicemix</artifactId>
-        <version>3.1.1-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix</groupId>
-    <artifactId>archetypes</artifactId>
-    <version>3.1.1-incubating-SNAPSHOT</version>
-    <name>ServiceMix :: Archetypes</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>servicemix-binding-component</module>
-        <module>servicemix-service-engine</module>
-        <module>servicemix-service-unit</module>
-        <module>servicemix-service-assembly</module>
-        <module>servicemix-shared-library</module>    
-        <module>servicemix-http-consumer-service-unit</module>    
-        <module>servicemix-http-provider-service-unit</module>    
-        <module>servicemix-jms-consumer-service-unit</module>    
-        <module>servicemix-jms-provider-service-unit</module>    
-        <module>servicemix-jsr181-wsdl-first-service-unit</module>
-        <module>servicemix-lwcontainer-service-unit</module>
-        <module>servicemix-eip-service-unit</module>
-        <module>servicemix-embedded-simple</module>
-        <module>servicemix-ode-service-unit</module>
-        <module>servicemix-jsr181-annotated-service-unit</module>
-        <module>servicemix-saxon-xquery-service-unit</module>
-        <module>servicemix-saxon-xslt-service-unit</module>
-        <module>servicemix-archetypes-itests</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix</groupId>
-                <artifactId>build</artifactId>
-                <version>${servicemix-version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.servicemix</groupId>
-                        <artifactId>build</artifactId>
-                        <version>3.1.1-incubating-SNAPSHOT-SNAPSHOT</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+<!--
+
+    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.
+-->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix</artifactId>
+        <version>3.1.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>archetypes</artifactId>
+    <version>3.1.1-incubating-SNAPSHOT</version>
+    <name>ServiceMix :: Archetypes</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>servicemix-binding-component</module>
+        <module>servicemix-service-engine</module>
+        <module>servicemix-service-unit</module>
+        <module>servicemix-service-assembly</module>
+        <module>servicemix-shared-library</module>    
+        <module>servicemix-ftp-poller-service-unit</module>
+        <module>servicemix-ftp-sender-service-unit</module>
+        <module>servicemix-http-consumer-service-unit</module>
+        <module>servicemix-http-provider-service-unit</module>
+        <module>servicemix-jms-consumer-service-unit</module>
+        <module>servicemix-jms-provider-service-unit</module>
+        <module>servicemix-jsr181-wsdl-first-service-unit</module>
+        <module>servicemix-lwcontainer-service-unit</module>
+        <module>servicemix-eip-service-unit</module>
+        <module>servicemix-embedded-simple</module>
+        <module>servicemix-ode-service-unit</module>
+        <module>servicemix-jsr181-annotated-service-unit</module>
+        <module>servicemix-saxon-xquery-service-unit</module>
+        <module>servicemix-saxon-xslt-service-unit</module>
+        <module>servicemix-bean-service-unit</module>
+        <module>servicemix-archetypes-itests</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.servicemix</groupId>
+                <artifactId>build</artifactId>
+                <version>${servicemix-version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.servicemix</groupId>
+                        <artifactId>build</artifactId>
+                        <version>3.1.1-incubating-SNAPSHOT</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Modified: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-archetypes-itests/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-archetypes-itests/pom.xml?view=diff&rev=524065&r1=524064&r2=524065
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-archetypes-itests/pom.xml
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-archetypes-itests/pom.xml
 Fri Mar 30 05:47:26 2007
@@ -57,6 +57,16 @@
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.tooling</groupId>
+      <artifactId>servicemix-ftp-poller-service-unit</artifactId>
+      <version>${servicemix-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.tooling</groupId>
+      <artifactId>servicemix-ftp-sender-service-unit</artifactId>
+      <version>${servicemix-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.tooling</groupId>
       <artifactId>servicemix-http-consumer-service-unit</artifactId>
       <version>${servicemix-version}</version>
     </dependency>
@@ -107,6 +117,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.tooling</groupId>
+      <artifactId>servicemix-bean-service-unit</artifactId>
+      <version>${servicemix-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix.tooling</groupId>
       <artifactId>servicemix-service-assembly</artifactId>
       <version>${servicemix-version}</version>
     </dependency>
@@ -152,4 +167,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>

Copied: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/pom.xml
 (from r524059, 
incubator/servicemix/trunk/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?view=diff&rev=524065&p1=incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/pom.xml&r1=524059&p2=incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/pom.xml&r2=524065
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/pom.xml 
(original)
+++ 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/pom.xml
 Fri Mar 30 05:47:26 2007
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.servicemix.tooling</groupId>
     <artifactId>tooling</artifactId>
-    <version>3.2-incubating-SNAPSHOT</version>
+    <version>3.1.1-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>servicemix-bean-service-unit</artifactId>

Modified: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/META-INF/maven/archetype.xml
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/META-INF/maven/archetype.xml?view=diff&rev=524065&r1=524059&r2=524065
==============================================================================
    (empty)

Copied: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml
 (from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml)
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=524065&p1=incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml&r1=524059&p2=incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml&r2=524065
==============================================================================
--- 
incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml
 Fri Mar 30 05:47:26 2007
@@ -75,7 +75,7 @@
     </repository>
   </repositories>
   <properties>
-    <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+    <servicemix-version>3.1.1-incubating-SNAPSHOT</servicemix-version>
   </properties>
   <dependencies>
     <dependency>

Modified: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/java/MyBean.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/java/MyBean.java?view=diff&rev=524065&r1=524059&r2=524065
==============================================================================
    (empty)

Modified: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?view=diff&rev=524065&r1=524059&r2=524065
==============================================================================
    (empty)

Copied: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/pom.xml
 (from r524059, 
incubator/servicemix/trunk/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?view=diff&rev=524065&p1=incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/pom.xml&r1=524059&p2=incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/pom.xml&r2=524065
==============================================================================
--- 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/pom.xml
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/pom.xml
 Fri Mar 30 05:47:26 2007
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.servicemix.tooling</groupId>
     <artifactId>tooling</artifactId>
-    <version>3.2-incubating-SNAPSHOT</version>
+    <version>3.1.1-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>servicemix-ftp-poller-service-unit</artifactId>

Copied: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml
 (from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml)
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=524065&p1=incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml&r1=524059&p2=incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml&r2=524065
==============================================================================
--- 
incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml
 Fri Mar 30 05:47:26 2007
@@ -75,7 +75,7 @@
     </repository>
   </repositories>
        <properties>
-         <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+         <servicemix-version>3.1.1-incubating-SNAPSHOT</servicemix-version>
        </properties>
   <dependencies>
     <dependency>

Copied: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/pom.xml
 (from r524059, 
incubator/servicemix/trunk/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?view=diff&rev=524065&p1=incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/pom.xml&r1=524059&p2=incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/pom.xml&r2=524065
==============================================================================
--- 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/pom.xml
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/pom.xml
 Fri Mar 30 05:47:26 2007
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.servicemix.tooling</groupId>
     <artifactId>tooling</artifactId>
-    <version>3.2-incubating-SNAPSHOT</version>
+    <version>3.1.1-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>servicemix-ftp-sender-service-unit</artifactId>

Modified: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/META-INF/maven/archetype.xml
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/META-INF/maven/archetype.xml?view=diff&rev=524065&r1=524059&r2=524065
==============================================================================
    (empty)

Copied: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml
 (from r524059, 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml)
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=524065&p1=incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml&r1=524059&p2=incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml&r2=524065
==============================================================================
--- 
incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml
 Fri Mar 30 05:47:26 2007
@@ -75,7 +75,7 @@
     </repository>
   </repositories>
        <properties>
-         <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+         <servicemix-version>3.1.1-incubating-SNAPSHOT</servicemix-version>
        </properties>
   <dependencies>
     <dependency>

Modified: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?view=diff&rev=524065&r1=524064&r2=524065
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
 Fri Mar 30 05:47:26 2007
@@ -18,7 +18,8 @@
 
 -->
 <beans xmlns:jms="http://servicemix.apache.org/jms/1.0";
-       xmlns:test="http://test";>
+       xmlns:test="http://test";
+       xmlns:amq="http://activemq.org/config/1.0";>
 
     <!-- START SNIPPET: consumer -->
     <jms:endpoint service="test:MyConsumerService"
@@ -28,9 +29,9 @@
                   role="consumer" 
                   destinationStyle="queue"
                   jmsProviderDestinationName="queue/A"
-                  jndiConnectionFactoryName="ConnectionFactory"
                   defaultMep="http://www.w3.org/2004/08/wsdl/in-out";
-                  defaultOperation="test:Echo" />
+                  defaultOperation="test:Echo"
+                  connectionFactory="#connectionFactory" />
     <!-- END SNIPPET: consumer -->
 
     <jms:endpoint service="test:MyConsumerService"
@@ -39,8 +40,16 @@
                   role="consumer"
                   destinationStyle="queue"
                   jmsProviderDestinationName="queue/A/Soap"
-                  jndiConnectionFactoryName="ConnectionFactory"
                   soap="true"
-                  defaultMep="http://www.w3.org/2004/08/wsdl/in-out"; />
+                  defaultMep="http://www.w3.org/2004/08/wsdl/in-out";
+                  connectionFactory="#connectionFactory" />
+
+    <amq:connectionFactory id="connectionFactory" 
brokerURL="tcp://localhost:61616/" />
+
+    <!-- JMS ConnectionFactory from JNDI -
+    <bean id="connectionFactory" 
class="org.springframework.jndi.JndiObjectFactoryBean">
+      <property name="jndiName" value="ConnectionFactory" />
+    </bean>
+    -->
 
 </beans>

Modified: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?view=diff&rev=524065&r1=524064&r2=524065
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
 Fri Mar 30 05:47:26 2007
@@ -18,30 +18,8 @@
 
 -->
 <beans xmlns:jms="http://servicemix.apache.org/jms/1.0";
-       xmlns:test="http://test";>
-
-    <!-- START SNIPPET: consumer -->
-    <jms:endpoint service="test:MyConsumerService"
-                  endpoint="jms"
-                  targetService="test:MyConsumerService"
-                  targetEndpoint="myConsumer"
-                  role="consumer" 
-                  destinationStyle="queue"
-                  jmsProviderDestinationName="queue/A"
-                  jndiConnectionFactoryName="ConnectionFactory"
-                  defaultMep="http://www.w3.org/2004/08/wsdl/in-out";
-                  defaultOperation="test:Echo" />
-    <!-- END SNIPPET: consumer -->
-
-    <jms:endpoint service="test:MyConsumerService"
-                  endpoint="jms+soap"
-                  targetInterfaceName="test:MyConsumerInterface"
-                  role="consumer"
-                  destinationStyle="queue"
-                  jmsProviderDestinationName="queue/A/Soap"
-                  jndiConnectionFactoryName="ConnectionFactory"
-                  soap="true"
-                  defaultMep="http://www.w3.org/2004/08/wsdl/in-out"; />
+       xmlns:test="http://test";
+       xmlns:amq="http://activemq.org/config/1.0";>
 
     <!-- START SNIPPET: provider -->
     <jms:endpoint service="test:MyProviderService"
@@ -49,7 +27,7 @@
                   role="provider" 
                   destinationStyle="queue"
                   jmsProviderDestinationName="queue/A"
-                  jndiConnectionFactoryName="ConnectionFactory"
+                  connectionFactory="#connectionFactory"
                   wsdlResource="classpath:provider.wsdl" />
     <!-- END SNIPPET: provider -->
 
@@ -58,7 +36,15 @@
                   role="provider" 
                   destinationStyle="queue"
                   jmsProviderDestinationName="queue/A/Soap"
-                  jndiConnectionFactoryName="ConnectionFactory"
+                  connectionFactory="#connectionFactory"
                   soap="true"/>
-                                  
+
+    <amq:connectionFactory id="connectionFactory" 
brokerURL="tcp://localhost:61616/" />
+
+    <!-- JMS ConnectionFactory from JNDI -
+    <bean id="connectionFactory" 
class="org.springframework.jndi.JndiObjectFactoryBean">
+      <property name="jndiName" value="ConnectionFactory" />
+    </bean>
+    -->
+
 </beans>

Modified: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=524065&r1=524064&r2=524065
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml
 Fri Mar 30 05:47:26 2007
@@ -31,6 +31,23 @@
       <id>apache.incubating</id>
       <name>Apache Incubating Repository</name>
       <url>http://people.apache.org/repo/m2-incubating-repository</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+         <enabled>true</enabled>
+      </releases>
+    </pluginRepository>
+    <pluginRepository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshots Repository</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+         <enabled>false</enabled>
+      </releases>
     </pluginRepository>
   </pluginRepositories>
   <repositories>
@@ -38,111 +55,67 @@
       <id>apache.incubating</id>
       <name>Apache Incubating Repository</name>
       <url>http://people.apache.org/repo/m2-incubating-repository</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+         <enabled>true</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshots Repository</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+         <enabled>false</enabled>
+      </releases>
     </repository>
   </repositories>
-       <properties>
-         <servicemix-version>3.1.1-incubating-SNAPSHOT</servicemix-version>
-       </properties>
-       <dependencies>
-               <dependency>
-                       <groupId>org.codehaus.xfire</groupId>
-                       <artifactId>xfire-jaxws</artifactId>
-                       <version>${xfire-version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.servicemix</groupId>
-                       <artifactId>servicemix-jsr181</artifactId>
-                       <version>${servicemix-version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>3.8.1</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
-       <build>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                               <includes>
-                                       <include>**/*</include>
-                               </includes>
-                       </resource>
-               </resources>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <configuration>
-                                       <source>1.5</source>
-                                       <target>1.5</target>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-antrun-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <phase>test</phase>
-                                               <configuration>
-                                                       <tasks>
-                                                               <taskdef
-                                                                       
classname="org.codehaus.xfire.gen.WsdlGenTask"
-                                                                       
name="wsdlgen">
-                                                                       
<classpath>
-                                                                               
<pathelement
-                                                                               
        path="${basedir}/target/classes" />
-                                                                               
<pathelement
-                                                                               
        path="${basedir}/src/main/java" />                                      
                                                
-                                                                               
<path
-                                                                               
        refid="maven.test.classpath" />
-                                                                       
</classpath>
-                                                               </taskdef>
-                                                               <wsdlgen
-                                                                       
configUrl="${basedir}/src/main/resources/services.xml"
-                                                                       
outputDirectory="${basedir}/src/main/resources" />
-                                                       </tasks>
-                                                       <sourceRoot>
-                                                               
${basedir}/src/main/java
-                                                       </sourceRoot>
-                                               </configuration>
-                                               <goals>
-                                                       <goal>run</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <dependencies>
-                                       <dependency>
-                                               
<groupId>org.codehaus.xfire</groupId>
-                                               
<artifactId>xfire-generator</artifactId>
-                                               
<version>${xfire-version}</version>
-                                               <exclusions>
-                                                       <exclusion>
-                                                               
<groupId>javax.xml</groupId>
-                                                               
<artifactId>jsr173</artifactId>
-                                                       </exclusion>
-                                               </exclusions>
-                                       </dependency>
-                                       <dependency>
-                                               
<groupId>org.codehaus.xfire</groupId>
-                                               
<artifactId>xfire-jaxws</artifactId>
-                                               
<version>${xfire-version}</version>
-                                       </dependency>
-                                       <dependency>
-                                               <groupId>javax.servlet</groupId>
-                                               
<artifactId>servlet-api</artifactId>
-                                               <version>2.4</version>
-                                       </dependency>
-                               </dependencies>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.servicemix.tooling</groupId>
-                               <artifactId>jbi-maven-plugin</artifactId>
-                               <version>${servicemix-version}</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <type>service-unit</type>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+  <properties>
+    <servicemix-version>3.1.1-incubating-SNAPSHOT</servicemix-version>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-jsr181</artifactId>
+      <version>${servicemix-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+  </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+      <groupId>org.apache.servicemix.tooling</groupId>
+        <artifactId>jbi-maven-plugin</artifactId>
+        <version>${servicemix-version}</version>
+        <extensions>true</extensions>
+        <configuration>
+          <type>service-unit</type>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Modified: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/src/main/resources/services.xml
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/src/main/resources/services.xml?view=diff&rev=524065&r1=524064&r2=524065
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/src/main/resources/services.xml
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/src/main/resources/services.xml
 Fri Mar 30 05:47:26 2007
@@ -1,28 +1 @@
-<?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.
--->
-<beans xmlns="http://xfire.codehaus.org/config/1.0";>  
-  <service>
-       <name>ExampleService</name>
-    <serviceClass>${packageName}.ExampleService</serviceClass>    
-    <serviceFactory>jsr181</serviceFactory>
-    <createDefaultBindings>false</createDefaultBindings>   
-  </service>
-
-</beans>
 

Modified: 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=524065&r1=524064&r2=524065
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
 Fri Mar 30 05:47:26 2007
@@ -18,20 +18,37 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-       <modelVersion>4.0.0</modelVersion>
-       <groupId>${groupId}</groupId>
-       <artifactId>${artifactId}</artifactId>
-       <packaging>jbi-service-unit</packaging>
-       <version>${version}</version>
-       <name>An example JSR-181 Service Unit</name>
-       <url>http://www.myorganization.org</url>
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>${groupId}</groupId>
+  <artifactId>${artifactId}</artifactId>
+  <packaging>jbi-service-unit</packaging>
+  <version>${version}</version>
+  <name>An example JSR-181 Service Unit</name>
+  <url>http://www.myorganization.org</url>
   <pluginRepositories>
     <pluginRepository>
       <id>apache.incubating</id>
       <name>Apache Incubating Repository</name>
       <url>http://people.apache.org/repo/m2-incubating-repository</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+         <enabled>true</enabled>
+      </releases>
+    </pluginRepository>
+    <pluginRepository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshots Repository</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+         <enabled>false</enabled>
+      </releases>
     </pluginRepository>
   </pluginRepositories>
   <repositories>
@@ -39,93 +56,84 @@
       <id>apache.incubating</id>
       <name>Apache Incubating Repository</name>
       <url>http://people.apache.org/repo/m2-incubating-repository</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+         <enabled>true</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshots Repository</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+         <enabled>false</enabled>
+      </releases>
     </repository>
   </repositories>
-       <properties>
-         <servicemix-version>3.1.1-incubating-SNAPSHOT</servicemix-version>
-       </properties>
-       <dependencies>
-               <dependency>
-                       <groupId>org.apache.servicemix</groupId>
-                       <artifactId>servicemix-jsr181</artifactId>
-      <version>${servicemix-version}</version>      
-               </dependency>
-       </dependencies>
-       <build>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                               <includes>
-                                       <include>**/*</include>
-                               </includes>
-                       </resource>
-                       <resource>
-                               <directory>target/generated-sources</directory>
-                               <includes>
-                                       <include>**/*</include>
-                               </includes>
-                       </resource>
-               </resources>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <configuration>
-                                       <source>1.5</source>
-                                       <target>1.5</target>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-antrun-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <phase>generate-sources</phase>
-                                               <configuration>
-                                                       <tasks>
-                                                               <taskdef
-                                                                       
classname="org.codehaus.xfire.gen.WsGenTask" name="wsgen">
-                                                                       
<classpath>
-                                                                               
<pathelement path="\${basedir}/target/classes" />
-                                                                               
<path refid="maven.test.classpath" />
-                                                                       
</classpath>
-                                                               </taskdef>
-                                                               <wsgen
-                                                                       
wsdl="\${basedir}/src/main/resources/service.wsdl"
-                                                                       
outputDirectory="\$${basedir}/target/generated-sources"
-                                                                       
profile="org.codehaus.xfire.jaxws.gen.JAXWSProfile"
-                                                                       
explicitAnnotation="true" />
-                                                       </tasks>
-                                                       
<sourceRoot>\${basedir}/target/generated-sources</sourceRoot>
-                                               </configuration>
-                                               <goals>
-                                                       <goal>run</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <dependencies>
-                                       <dependency>
-                                               
<groupId>org.codehaus.xfire</groupId>
-                                               
<artifactId>xfire-generator</artifactId>
-                                               
<version>${xfire-version}</version>
-            <exclusions>
-              <exclusion>
-                <groupId>javax.xml</groupId>
-                <artifactId>jsr173</artifactId>
-              </exclusion>
-            </exclusions>
-                                       </dependency>
-                                       <dependency>
-                                               
<groupId>org.codehaus.xfire</groupId>
-                                               
<artifactId>xfire-jaxws</artifactId>
-                                               
<version>${xfire-version}</version>
-                                       </dependency>
-                               </dependencies>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.servicemix.tooling</groupId>
-                               <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
-                               <extensions>true</extensions>
-                       </plugin>
-               </plugins>
-       </build>
+  <properties>
+    <servicemix-version>3.1.1-incubating-SNAPSHOT</servicemix-version>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-jsr181</artifactId>
+      <version>${servicemix-version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+      <resources>
+        <resource>
+          <directory>src/main/resources</directory>
+          <includes>
+            <include>**/*</include>
+          </includes>
+        </resource>
+      <resource>
+      <directory>target/generated-sources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+      <artifactId>maven-compiler-plugin</artifactId>
+      <configuration>
+      <source>1.5</source>
+      <target>1.5</target>
+      </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.servicemix.tooling</groupId>
+        <artifactId>xfire-maven-plugin</artifactId>
+        <version>${servicemix-version}</version>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <configuration>
+              <wsdls>
+                <wsdl>src/main/resources/service.wsdl</wsdl>
+              </wsdls>
+              <outputDirectory>target/jaxws</outputDirectory>
+              <profile>org.codehaus.xfire.jaxws.gen.JAXWSProfile</profile>
+            </configuration>
+            <goals>
+              <goal>wsgen</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.servicemix.tooling</groupId>
+        <artifactId>jbi-maven-plugin</artifactId>
+        <version>${servicemix-version}</version>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Copied: 
incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch
 (from r524059, 
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch)
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch?view=diff&rev=524065&p1=incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch&r1=524059&p2=incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch&r2=524065
==============================================================================
--- 
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch
 Fri Mar 30 05:47:26 2007
@@ -19,7 +19,7 @@
 #
 
 if [ "$SERVICEMIX_VERSION" = "" ] ; then
-  SERVICEMIX_VERSION=3.2-incubating-SNAPSHOT
+  SERVICEMIX_VERSION=3.1.1-incubating-SNAPSHOT
 fi
 
 if [ "$DEF_GROUP_ID" = "" ] ; then

Copied: 
incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat
 (from r524059, 
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat)
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat?view=diff&rev=524065&p1=incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat&r1=524059&p2=incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat&r2=524065
==============================================================================
--- 
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat
 Fri Mar 30 05:47:26 2007
@@ -21,7 +21,7 @@
 rem 
 
 if "%SERVICEMIX_VERSION%" == "" (
-    set SERVICEMIX_VERSION=3.2-incubating-SNAPSHOT
+    set SERVICEMIX_VERSION=3.1.1-incubating-SNAPSHOT
 )
 
 if "%DEF_GROUP_ID%" == "" (


Reply via email to