servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r668803 - in /servicemix/archetypes/trunk: servicemix-bean-service-unit/src/main/resources/archetype-resources/ servicemix-binding-component/src/main/resources/archetype-resources/ servicemix-camel-service-unit/src/main/resources/archetype-...
Date Tue, 17 Jun 2008 19:19:00 GMT
Author: chirino
Date: Tue Jun 17 12:18:59 2008
New Revision: 668803

URL: http://svn.apache.org/viewvc?rev=668803&view=rev
Log:
making more extensive use of component name.

Modified:
    servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-cxf-se-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-drools-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-file-poller-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-file-sender-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-mail-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-osworkflow-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-project-root/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-validation-service-unit/src/main/resources/archetype-resources/pom.xml

Modified: servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,23 +26,26 @@
   <version>${version}</version>
   <name>A servicemix-bean Service Unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-bean</componentName>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-bean</artifactId>
-      <version>${servicemix-version}</version>
+      <version>@{servicemix-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-core</artifactId>
-      <version>${servicemix-version}</version>
+      <version>@{servicemix-version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
+  
   <build>
     <resources>
       <resource>
@@ -63,7 +66,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,21 +26,18 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
-  <properties>
-    <xbean-version>@{xbean-version}</xbean-version>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
-  </properties>
+@{repositories}
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-shared</artifactId>      
-      <version>${servicemix-version}</version>      
+      <version>@{servicemix-version}</version>      
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-core</artifactId>
-      <version>${servicemix-version}</version>      
+      <version>@{servicemix-version}</version>      
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -50,11 +47,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>        
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>   
         	<type>binding-component</type>       
@@ -64,7 +63,7 @@
       <plugin>
         <groupId>org.apache.xbean</groupId>
         <artifactId>maven-xbean-plugin</artifactId>
-        <version>${xbean-version}</version>
+        <version>@{xbean-version}</version>
         <executions>
           <execution>
             <configuration>

Modified: servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,24 +26,26 @@
   <version>${version}</version>
   <name>A Camel based JBI Service Unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-  	<camel-version>@{camel-version}</camel-version>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-camel</componentName>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-camel</artifactId>
-      <version>${servicemix-version}</version>
+      <version>@{servicemix-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-core</artifactId>
-      <version>${servicemix-version}</version>
+      <version>@{servicemix-version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
+  
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
@@ -59,14 +61,14 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>
       <!-- allows the route to be ran via 'mvn camel:run' -->
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
-        <version>${camel-version}</version>
+        <version>@{camel-version}</version>
       </plugin>
     </plugins>
   </build>

Modified: servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,17 +26,20 @@
   <version>${version}</version>
   <name>A Cxf BC Service Unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+  
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-cxf-bc</componentName>
   </properties>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-cxf-bc</artifactId>
-      <version>${servicemix-version}</version>      
+      <version>@{servicemix-version}</version>      
     </dependency>
   </dependencies>
+  
   <build>
   	<resources>
       <resource>
@@ -50,7 +53,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-cxf-se-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-cxf-se-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-cxf-se-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-cxf-se-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,23 +26,26 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-cxf-se</componentName>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-cxf-se</artifactId>
-      <version>${servicemix-version}</version>
+      <version>@{servicemix-version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <scope>test</scope>
-  </dependency>
+    </dependency>
   </dependencies>
+  
   <build>
     <resources>
       <resource>
@@ -63,7 +66,7 @@
       <plugin>
       <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-unit</type>

Modified: servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -17,8 +17,7 @@
     limitations under the License.
 
 -->
-<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">
+<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>
@@ -26,24 +25,26 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
-    <cxf-version>@{cxf-version}</cxf-version>
+    <componentName>servicemix-cxf-se</componentName>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-cxf-se</artifactId>
-      <version>${servicemix-version}</version>
+      <version>@{servicemix-version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <scope>test</scope>
-  </dependency>
+    </dependency>
   </dependencies>
+
   <build>
     <resources>
       <resource>
@@ -62,38 +63,38 @@
         </configuration>
       </plugin>
       <plugin>
-      <groupId>org.apache.servicemix.tooling</groupId>
+        <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-unit</type>
         </configuration>
       </plugin>
       <plugin>
-              <groupId>org.apache.cxf</groupId>
-              <artifactId>cxf-codegen-plugin</artifactId>
-              <version>${cxf-version}</version>
-              <executions>
-                  <execution>
-                      <phase>generate-sources</phase>
-                      <configuration>
-                          <sourceRoot>./target/jaxws</sourceRoot>
-                          <wsdlOptions>
-                              <wsdlOption>
-                                  <wsdl>./src/main/resources/person.wsdl</wsdl>
-                                  <extraargs>
-                                      <extraarg>-verbose</extraarg>
-                                  </extraargs>
-                              </wsdlOption>
-                          </wsdlOptions>
-                      </configuration>
-                      <goals>
-                          <goal>wsdl2java</goal>
-                      </goals>
-                  </execution>
-              </executions>
-       </plugin>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-codegen-plugin</artifactId>
+        <version>@{cxf-version}</version>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <configuration>
+              <sourceRoot>./target/jaxws</sourceRoot>
+              <wsdlOptions>
+                <wsdlOption>
+                  <wsdl>./src/main/resources/person.wsdl</wsdl>
+                  <extraargs>
+                    <extraarg>-verbose</extraarg>
+                  </extraargs>
+                </wsdlOption>
+              </wsdlOptions>
+            </configuration>
+            <goals>
+              <goal>wsdl2java</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

Modified: servicemix/archetypes/trunk/servicemix-drools-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-drools-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-drools-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-drools-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,17 +26,12 @@
   <version>${version}</version>
   <name>A Drools Service Unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-drools</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-drools</artifactId>
-      <version>${servicemix-version}</version>      
-    </dependency>
-  </dependencies>
+  
   <build>
   	<resources>
       <resource>
@@ -50,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,17 +26,12 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-eip</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-eip</artifactId>
-      <version>${servicemix-version}</version>      
-    </dependency>
-  </dependencies>
+
   <build>
   	<resources>
       <resource>
@@ -50,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -25,18 +25,19 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <xbean-version>@{xbean-version}</xbean-version>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
   </properties>
+
   <dependencies>
-	<dependency>
+  	<dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-core</artifactId>
-      <version>${servicemix-version}</version>
+      <version>@{servicemix-version}</version>
     </dependency>
   </dependencies>
+
   <build>
   	<resources>
       <resource>
@@ -50,9 +51,10 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>     
     </plugins>
   </build>
+  
 </project>

Modified: servicemix/archetypes/trunk/servicemix-file-poller-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-file-poller-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-file-poller-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-file-poller-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,23 +26,12 @@
   <version>${version}</version>
   <name>A file poller service unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-file</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-core</artifactId>
-      <version>${servicemix-version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-file</artifactId>
-      <version>${servicemix-version}</version>      
-    </dependency>
-  </dependencies>
+  
   <build>
     <resources>
       <resource>
@@ -56,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-unit</type>

Modified: servicemix/archetypes/trunk/servicemix-file-sender-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-file-sender-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-file-sender-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-file-sender-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,23 +26,12 @@
   <version>${version}</version>
   <name>A file sender service unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-file</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-core</artifactId>
-      <version>${servicemix-version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-file</artifactId>
-      <version>${servicemix-version}</version>      
-    </dependency>
-  </dependencies>
+
   <build>
     <resources>
       <resource>
@@ -56,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-unit</type>

Modified: servicemix/archetypes/trunk/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,17 +26,12 @@
   <version>${version}</version>
   <name>A FTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-ftp</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-ftp</artifactId>
-      <version>${servicemix-version}</version>      
-    </dependency>
-  </dependencies>
+  
   <build>
   	<resources>
       <resource>
@@ -50,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,17 +26,12 @@
   <version>${version}</version>
   <name>A FTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-ftp</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-ftp</artifactId>
-      <version>${servicemix-version}</version>      
-    </dependency>
-  </dependencies>
+
   <build>
   	<resources>
       <resource>
@@ -50,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -17,8 +17,7 @@
     limitations under the License.
 
 -->
-<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">
+<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>
@@ -26,31 +25,28 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  
-  @{repositories}
-  
+@{repositories}
+
   <properties>
     <componentName>servicemix-http</componentName>
   </properties>
   
-  <properties></properties>
-  
   <build>
-  	<resources>
+    <resources>
       <resource>
         <directory>src/main/resources</directory>
         <includes>
           <include>**/*</include>
         </includes>
-      </resource>    
+      </resource>
     </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>@{jbi-maven-plugin-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
-      </plugin>     
+      </plugin>
     </plugins>
   </build>
 </project>

Modified: servicemix/archetypes/trunk/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,17 +26,12 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-http</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-http</artifactId>
-      <version>${servicemix-version}</version>      
-    </dependency>
-  </dependencies>
+
   <build>
   	<resources>
       <resource>
@@ -50,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-      <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,17 +26,12 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-jms</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-jms</artifactId>
-      <version>${servicemix-version}</version>      
-    </dependency>
-  </dependencies>
+  
   <build>
   	<resources>
       <resource>
@@ -50,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-unit</type>

Modified: servicemix/archetypes/trunk/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,17 +26,12 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-jms</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-jms</artifactId>
-      <version>${servicemix-version}</version>      
-    </dependency>
-  </dependencies>
+  
   <build>
   	<resources>
       <resource>
@@ -50,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-unit</type>

Modified: servicemix/archetypes/trunk/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,23 +26,26 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-jsr181</componentName>
   </properties>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-jsr181</artifactId>
-      <version>${servicemix-version}</version>
+      <version>@{servicemix-version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <scope>test</scope>
-  </dependency>
+    </dependency>
   </dependencies>
+  
   <build>
     <resources>
       <resource>
@@ -63,7 +66,7 @@
       <plugin>
       <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-unit</type>

Modified: servicemix/archetypes/trunk/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -27,18 +27,20 @@
   <version>${version}</version>
   <name>An example JSR-181 Service Unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <xfire-version>@{xfire-version}</xfire-version>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-jsr181</componentName>
   </properties>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-jsr181</artifactId>
-      <version>${servicemix-version}</version>      
+      <version>@{servicemix-version}</version>      
     </dependency>
   </dependencies>
+  
   <build>
 		<resources>
 			<resource>
@@ -65,7 +67,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>xfire-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>
+        <version>@{servicemix-version}</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -85,7 +87,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,22 +26,25 @@
   <version>${version}</version>
   <name>A LWContainer Service Unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+  
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-lwcontainer</componentName>
   </properties>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-lwcontainer</artifactId>
-      <version>${servicemix-version}</version>      
+      <version>@{servicemix-version}</version>      
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-components</artifactId>
-      <version>${servicemix-version}</version>      
+      <version>@{servicemix-version}</version>      
     </dependency>
   </dependencies>
+  
   <build>
   	<resources>
       <resource>
@@ -54,7 +57,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
-        <artifactId>jbi-maven-plugin</artifactId>
+        <version>@{jbi-maven-plugin-version}</version>
         <version>${servicemix-version}</version>      
         <extensions>true</extensions>
       </plugin>     

Modified: servicemix/archetypes/trunk/servicemix-mail-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-mail-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-mail-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-mail-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,23 +26,12 @@
   <version>${version}</version>
   <name>A mail service unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-mail</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-core</artifactId>
-      <version>${servicemix-version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-mail</artifactId>
-      <version>${servicemix-version}</version>
-    </dependency>
-  </dependencies>
+
   <build>
     <resources>
       <resource>
@@ -56,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-unit</type>

Modified: servicemix/archetypes/trunk/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,13 +26,12 @@
   <version>1.0-SNAPSHOT</version>
   <name>A example service unit using Apache ODE's Service Engine</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
     <componentName>OdeBpelEngine</componentName>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
   </properties>
-  <dependencies> 
-  </dependencies>
+
   <build>
   	<resources>
       <resource>
@@ -46,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>        
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-osworkflow-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-osworkflow-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-osworkflow-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-osworkflow-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,34 +26,37 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-osworkflow</componentName>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-shared</artifactId>
-      <version>${servicemix-version}</version>
+      <version>@{servicemix-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-core</artifactId>
-      <version>${servicemix-version}</version>
+      <version>@{servicemix-version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-osworkflow</artifactId>
-      <version>${servicemix-version}</version>
+      <version>@{servicemix-version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <scope>test</scope>
-  </dependency>
+    </dependency>
   </dependencies>
+  
   <build>
     <resources>
       <resource>
@@ -74,7 +77,7 @@
       <plugin>
       <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-unit</type>

Modified: servicemix/archetypes/trunk/servicemix-project-root/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-project-root/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-project-root/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-project-root/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,10 +26,12 @@
   <version>${version}</version>
   <name>ServiceMix :: ${artifactId}</name>
   <url>http://servicemix.apache.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
     <servicemix-version>@{servicemix-version}</servicemix-version>
   </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -40,5 +42,6 @@
       </plugin>
     </plugins>
   </build>
+  
 </project>
 

Modified: servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,17 +26,12 @@
   <version>${version}</version>
   <name>An X-Query based Service</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-saxon</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-saxon</artifactId>
-      <version>${servicemix-version}</version>      
-    </dependency>
-  </dependencies>
+
   <build>
   	<resources>
       <resource>
@@ -50,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,17 +26,12 @@
   <version>${version}</version>
   <name>An XSLT based Service</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-saxon</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-saxon</artifactId>
-      <version>${servicemix-version}</version>      
-    </dependency>
-  </dependencies>
+
   <build>
   	<resources>
       <resource>
@@ -50,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,29 +26,12 @@
   <version>${version}</version>
   <name>A scripting service unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-scripting</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-core</artifactId>
-      <version>${servicemix-version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-scripting</artifactId>
-      <version>${servicemix-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.livetribe</groupId>
-      <artifactId>livetribe-jsr223</artifactId>
-      <version>2.0.3</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
+  
   <build>
     <resources>
       <resource>
@@ -62,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-unit</type>

Modified: servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,10 +26,9 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
-  <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
-  </properties>
+@{repositories}
+
+
   <dependencies>    
     <dependency>
       <groupId>junit</groupId>
@@ -38,12 +37,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-assembly</type>         

Modified: servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,21 +26,18 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
-  <properties>
-	<xbean-version>@{xbean-version}</xbean-version>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
-  </properties>
+@{repositories}
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-shared</artifactId>      
-      <version>${servicemix-version}</version>      
+      <version>@{servicemix-version}</version>      
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-core</artifactId>
-      <version>${servicemix-version}</version>
+      <version>@{servicemix-version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -50,12 +47,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>   
-        <version>${servicemix-version}</version>     
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-engine</type>
@@ -65,7 +63,7 @@
       <plugin>
         <groupId>org.apache.xbean</groupId>
         <artifactId>maven-xbean-plugin</artifactId>
-        <version>${xbean-version}</version>
+        <version>@{xbean-version}</version>
         <executions>
           <execution>
             <configuration>

Modified: servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,10 +26,8 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
-  <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
-  </properties>
+@{repositories}
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -38,6 +36,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  
   <build>
   	<resources>
       <resource>
@@ -51,7 +50,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,10 +26,8 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
-  <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
-  </properties>
+@{repositories}
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -38,6 +36,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  
   <build>
   	<resources>
       <resource>
@@ -51,9 +50,10 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>      
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>       
       </plugin>     
     </plugins>
   </build>
+  
 </project>

Modified: servicemix/archetypes/trunk/servicemix-validation-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-validation-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668803&r1=668802&r2=668803&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-validation-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-validation-service-unit/src/main/resources/archetype-resources/pom.xml Tue Jun 17 12:18:59 2008
@@ -26,23 +26,12 @@
   <version>${version}</version>
   <name>A validation service unit</name>
   <url>http://www.myorganization.org</url>
-  @{repositories}
+@{repositories}
+
   <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
+    <componentName>servicemix-validation</componentName>
   </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-core</artifactId>
-      <version>${servicemix-version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-validation</artifactId>
-      <version>${servicemix-version}</version>
-    </dependency>
-  </dependencies>
+
   <build>
     <resources>
       <resource>
@@ -56,7 +45,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemix-version}</version>
+        <version>@{jbi-maven-plugin-version}</version>
         <extensions>true</extensions>
         <configuration>
           <type>service-unit</type>



Mime
View raw message