You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/03/28 21:14:56 UTC

svn commit: r928479 [2/3] - in /servicemix/archetypes/trunk: ./ servicemix-archetype-catalog/ servicemix-archetypes-itests/ servicemix-archetypes-itests/src/test/resources/ servicemix-bean-service-unit/ servicemix-bean-service-unit/src/main/resources/a...

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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -1,62 +1,42 @@
 <?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.
-
--->
-<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>
-
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-jsr181</componentName>
-  </properties>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-jsr181</artifactId>
-      <version>@{components-version}</version>      
-    </dependency>
-  </dependencies>
-  
-  <build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</resource>
-			<resource>
-				<directory>target/jaxws</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</resource>
-		</resources>
+		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.
+	-->
+<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>A custom JSR-181 WSDL service unit</name>
+	<url>http://www.myorganization.org</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-jsr181</artifactId>
+			<version>@{components-version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<defaultGoal>install</defaultGoal>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -65,32 +45,32 @@
 					<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/generated-sources</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>@{jbi-maven-plugin-version}</version>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
+			<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/generated-sources</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>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: servicemix/archetypes/trunk/servicemix-lwcontainer-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-lwcontainer-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-lwcontainer-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-lwcontainer-service-unit/pom.xml Sun Mar 28 19:14:54 2010
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
+    <version>2010.01-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicemix.tooling</groupId>

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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -17,49 +17,36 @@
     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>
   <packaging>jbi-service-unit</packaging>
   <version>${version}</version>
-  <name>A LWContainer Service Unit</name>
+  <name>A LWContainer service unit</name>
   <url>http://www.myorganization.org</url>
-
-  @{repositories}
-  
-  <properties>
-    <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>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>    
-    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
-        <version>@{jbi-maven-plugin-version}</version>
-        <version>${servicemix-version}</version>      
+        <artifactId>jbi-maven-plugin</artifactId>
+        <version>@{jbi-maven-plugin.version}</version>      
         <extensions>true</extensions>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-mail-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-mail-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-mail-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-mail-service-unit/pom.xml Sun Mar 28 19:14:54 2010
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
+    <version>2010.01-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicemix.tooling</groupId>

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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -17,9 +17,10 @@
     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>
   <packaging>jbi-service-unit</packaging>
@@ -27,30 +28,22 @@
   <name>A mail service unit</name>
   <url>http://www.myorganization.org</url>
 
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-mail</componentName>
-  </properties>
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-mail</artifactId>
+        <version>@{components.version}</version>
+    </dependency>
+  </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
+    <defaultGoal>install</defaultGoal>
     <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>
-        <configuration>
-          <type>service-unit</type>
-        </configuration>
       </plugin>
     </plugins>
   </build>

Modified: servicemix/archetypes/trunk/servicemix-ode-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-ode-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-ode-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-ode-service-unit/pom.xml Sun Mar 28 19:14:54 2010
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
+    <version>2010.01-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicemix.tooling</groupId>

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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -17,9 +17,10 @@
     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>
   <packaging>jbi-service-unit</packaging>
@@ -27,26 +28,16 @@
   <name>A example service unit using Apache ODE's Service Engine</name>
   <url>http://www.myorganization.org</url>
 
-  @{repositories}
-
   <properties>
     <componentName>OdeBpelEngine</componentName>
   </properties>
 
   <build>
-  	<resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </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>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/pom.xml Sun Mar 28 19:14:54 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
+    <version>2010.01-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicemix.tooling</groupId>
@@ -36,7 +36,7 @@
 	<dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-maven-plugin</artifactId>
-      <version>${camel-version}</version>
+      <version>${camel.version}</version>
       <scope>test</scope>
 	</dependency>
   </dependencies>

Modified: servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/src/main/resources/archetype-resources/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/src/main/resources/archetype-resources/pom.xml Sun Mar 28 19:14:54 2010
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
 
   <!--
 
@@ -29,19 +28,17 @@
   <name>A Camel OSGi Service Unit</name>
   <url>http://www.myorganization.org</url>
 
-  @{repositories}
-
   <dependencies>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>${commons.logging.version}</version>
+      <version>${commons-logging.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
-      <version>${camel-version}</version>
+      <version>${camel.version}</version>
     </dependency>
   </dependencies>
 
@@ -72,8 +69,8 @@
   </build>
 
   <properties>
-    <commons.logging.version>1.1</commons.logging.version>
-    <camel-version>@{camel-version}</camel-version>
+    <commons.logging.version>1.1.1</commons.logging.version>
+    <camel-version>@{camel.version}</camel-version>
   </properties>
 
 </project>

Modified: servicemix/archetypes/trunk/servicemix-osgi-cxf-code-first-archetype/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-osgi-cxf-code-first-archetype/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-osgi-cxf-code-first-archetype/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-osgi-cxf-code-first-archetype/pom.xml Sun Mar 28 19:14:54 2010
@@ -17,20 +17,18 @@
     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>
 
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
+    <version>2010.01-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicemix.tooling</groupId>
   <artifactId>servicemix-osgi-cxf-code-first-archetype</artifactId>
   <name>ServiceMix :: Archetypes :: CXFCodeFirstOSGiServiceUnit</name>
 
-
 </project>

Modified: servicemix/archetypes/trunk/servicemix-osgi-cxf-code-first-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-osgi-cxf-code-first-archetype/src/main/resources/archetype-resources/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-osgi-cxf-code-first-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-osgi-cxf-code-first-archetype/src/main/resources/archetype-resources/pom.xml Sun Mar 28 19:14:54 2010
@@ -29,8 +29,6 @@
     <name>A CXF Code First OSGi Project</name>
     <url>http://www.myorganization.org</url>
 
-    @{repositories}
-
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -52,12 +50,12 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>@{cxf-version}</version>
+            <version>@{cxf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>@{cxf-version}</version>
+            <version>@{cxf.version}</version>
         </dependency> 
     </dependencies>
 

Modified: servicemix/archetypes/trunk/servicemix-osgi-cxf-wsdl-first-archetype/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-osgi-cxf-wsdl-first-archetype/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-osgi-cxf-wsdl-first-archetype/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-osgi-cxf-wsdl-first-archetype/pom.xml Sun Mar 28 19:14:54 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
+    <version>2010.01-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicemix.tooling</groupId>

Modified: servicemix/archetypes/trunk/servicemix-osgi-cxf-wsdl-first-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-osgi-cxf-wsdl-first-archetype/src/main/resources/archetype-resources/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-osgi-cxf-wsdl-first-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-osgi-cxf-wsdl-first-archetype/src/main/resources/archetype-resources/pom.xml Sun Mar 28 19:14:54 2010
@@ -29,8 +29,6 @@
     <name>A CXF WSDL First OSGi Project </name>
     <url>http://www.myorganization.org</url>
 
-    @{repositories}
-
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -64,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>@{cxf-version}</version>
+                <version>@{cxf.version}</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>

Modified: servicemix/archetypes/trunk/servicemix-osworkflow-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-osworkflow-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-osworkflow-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-osworkflow-service-unit/pom.xml Sun Mar 28 19:14:54 2010
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
+    <version>2010.01-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicemix.tooling</groupId>

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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -1,89 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<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.
-
--->
-<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>A custom project</name>
-  <url>http://www.myorganization.org</url>
-
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-osworkflow</componentName>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-shared</artifactId>
-      <version>@{components-version}</version>
-    </dependency>
-    <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-osworkflow</artifactId>
-      <version>@{components-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+    <!--
+
+        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>
+    
+    <groupId>${groupId}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <packaging>jbi-service-unit</packaging>
+    <version>${version}</version>
+    <name>A custom osWorkflow service unit</name>
+    <url>http://www.myorganization.org</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-osworkflow</artifactId>
+            <version>@{components.version}</version>
+        </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>@{jbi-maven-plugin-version}</version>
-        <extensions>true</extensions>
-        <configuration>
-          <type>service-unit</type>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <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>@{jbi-maven-plugin.version}</version>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: servicemix/archetypes/trunk/servicemix-project-root/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-project-root/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-project-root/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-project-root/pom.xml Sun Mar 28 19:14:54 2010
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
+    <version>2010.01-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.servicemix.tooling</groupId>

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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -1,48 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<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.
+	<!--
+
+		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>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>pom</packaging>
+	<version>${version}</version>
+	<name>ServiceMix :: ${artifactId}</name>
+	<url>http://servicemix.apache.org</url>
+
+	<properties>
+		<servicemix.version>@{servicemix.version}</servicemix.version>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-archetype-plugin</artifactId>
+				<configuration>
+					<archetypeCatalog>http://servicemix.apache.org/tooling/${servicemix.version}</archetypeCatalog>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
--->
-<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>pom</packaging>
-  <version>${version}</version>
-  <name>ServiceMix :: ${artifactId}</name>
-  <url>http://servicemix.apache.org</url>
-
-  @{repositories}
-
-  <properties>
-    <servicemix-version>@{servicemix-version}</servicemix-version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-archetype-plugin</artifactId>      
-        <configuration>
-          <archetypeCatalog>http://servicemix.apache.org/tooling/${servicemix-version}</archetypeCatalog>         
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
 </project>
 

Modified: servicemix/archetypes/trunk/servicemix-quartz-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-quartz-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-quartz-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-quartz-service-unit/pom.xml Sun Mar 28 19:14:54 2010
@@ -1,33 +1,33 @@
 <?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.
--->
-
 <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>
 
-  <parent>
-    <groupId>org.apache.servicemix</groupId>
-    <artifactId>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.servicemix.tooling</groupId>
-  <artifactId>servicemix-quartz-service-unit</artifactId>
-  <name>ServiceMix :: Archetypes :: QuartzServiceUnit</name>
+    <!--
+
+        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>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-quartz-service-unit</artifactId>
+	<name>ServiceMix :: Archetypes :: QuartzServiceUnit</name>
 
 </project>

Modified: servicemix/archetypes/trunk/servicemix-quartz-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-quartz-service-unit/src/main/resources/archetype-resources/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-quartz-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-quartz-service-unit/src/main/resources/archetype-resources/pom.xml Sun Mar 28 19:14:54 2010
@@ -1,57 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<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.
+	<!--
 
--->
-<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>A quartz service unit</name>
-  <url>http://www.myorganization.org</url>
-
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-quartz</componentName>
-  </properties>
-  
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.servicemix.tooling</groupId>
-        <artifactId>jbi-maven-plugin</artifactId>
-        <version>@{jbi-maven-plugin-version}</version>
-        <extensions>true</extensions>
-        <configuration>
-          <type>service-unit</type>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+		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>
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-service-unit</packaging>
+	<version>${version}</version>
+	<name>A custom quartz service unit</name>
+	<url>http://www.myorganization.org</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-quartz</artifactId>
+			<version>@{components.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>jbi-maven-plugin</artifactId>
+				<version>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/pom.xml Sun Mar 28 19:14:54 2010
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
 
-<!--
+	<!--
 
-    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>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.servicemix.tooling</groupId>
-  <artifactId>servicemix-saxon-xquery-service-unit</artifactId>
-  <name>ServiceMix :: Archetypes :: SaxonXQueryServiceUnit</name>
+		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>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-saxon-xquery-service-unit</artifactId>
+	<name>ServiceMix :: Archetypes :: SaxonXQueryServiceUnit</name>
 
 </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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -1,54 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<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.
+	<!--
 
--->
-<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 X-Query based Service</name>
-  <url>http://www.myorganization.org</url>
-
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-saxon</componentName>
-  </properties>
-
-  <build>
-  	<resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>    
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.servicemix.tooling</groupId>
-        <artifactId>jbi-maven-plugin</artifactId>
-        <version>@{jbi-maven-plugin-version}</version>
-        <extensions>true</extensions>
-      </plugin>     
-    </plugins>
-  </build>
+		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>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-service-unit</packaging>
+	<version>${version}</version>
+	<name>A custom Saxon/X-Query service unit</name>
+	<url>http://www.myorganization.org</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-saxon</artifactId>
+			<version>@{components.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>jbi-maven-plugin</artifactId>
+				<version>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/pom.xml Sun Mar 28 19:14:54 2010
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.servicemix.tooling</groupId>
-  <artifactId>servicemix-saxon-xslt-service-unit</artifactId>
-  <name>ServiceMix :: Archetypes :: SaxonXsltServiceUnit</name>
+		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>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-saxon-xslt-service-unit</artifactId>
+	<name>ServiceMix :: Archetypes :: SaxonXsltServiceUnit</name>
 
 </project>

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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -1,54 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<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.
-
--->
-<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 XSLT based Service</name>
-  <url>http://www.myorganization.org</url>
-
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-saxon</componentName>
-  </properties>
-
-  <build>
-  	<resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>    
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.servicemix.tooling</groupId>
-        <artifactId>jbi-maven-plugin</artifactId>
-        <version>@{jbi-maven-plugin-version}</version>
-        <extensions>true</extensions>
-      </plugin>     
-    </plugins>
-  </build>
+	<!--
+
+		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>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-service-unit</packaging>
+	<version>${version}</version>
+	<name>A customer Saxon/XSLT service unit</name>
+	<url>http://www.myorganization.org</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-saxon</artifactId>
+			<version>@{components.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>jbi-maven-plugin</artifactId>
+				<version>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: servicemix/archetypes/trunk/servicemix-script-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-script-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-script-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-script-service-unit/pom.xml Sun Mar 28 19:14:54 2010
@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<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>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-script-service-unit</artifactId>
+	<name>ServiceMix :: Archetypes :: ScriptServiceUnit</name>
 
-    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.
--->
-<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>
-    
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>archetypes</artifactId>
-        <version>2009.01-SNAPSHOT</version>
-    </parent>         
-    
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>servicemix-script-service-unit</artifactId>
-    <name>ServiceMix :: Archetypes :: ScriptServiceUnit</name>
-         
 </project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/pom.xml Sun Mar 28 19:14:54 2010
@@ -1,61 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<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>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-service-unit</packaging>
+	<version>${version}</version>
+	<name>A custom script service unit</name>
+	<url>http://www.myorganization.org</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-script</artifactId>
+			<version>@{components.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>jbi-maven-plugin</artifactId>
+				<version>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 
-    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.
-
--->
-<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>A Script service unit</name>
-    <url>http://www.myorganization.org</url>
-    
-    @{repositories}
-    
-    <properties>
-        <componentName>servicemix-script</componentName>
-    </properties>
-    
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <version>@{jbi-maven-plugin-version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <type>service-unit</type>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-         
 </project>         
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-scripting-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-scripting-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-scripting-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-scripting-service-unit/pom.xml Sun Mar 28 19:14:54 2010
@@ -1,33 +1,33 @@
 <?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.
--->
-
 <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>
 
-  <parent>
-    <groupId>org.apache.servicemix</groupId>
-    <artifactId>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.servicemix.tooling</groupId>
-  <artifactId>servicemix-scripting-service-unit</artifactId>
-  <name>ServiceMix :: Archetypes :: ScriptingServiceUnit</name>
+	<!--
+
+		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>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-scripting-service-unit</artifactId>
+	<name>ServiceMix :: Archetypes :: ScriptingServiceUnit</name>
 
 </project>

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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -1,57 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<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.
-
--->
-<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>A scripting service unit</name>
-  <url>http://www.myorganization.org</url>
-
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-scripting</componentName>
-  </properties>
-  
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.servicemix.tooling</groupId>
-        <artifactId>jbi-maven-plugin</artifactId>
-        <version>@{jbi-maven-plugin-version}</version>
-        <extensions>true</extensions>
-        <configuration>
-          <type>service-unit</type>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+	<!--
+
+		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>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-service-unit</packaging>
+	<version>${version}</version>
+	<name>A custom scripting service unit</name>
+	<url>http://www.myorganization.org</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-scripting</artifactId>
+			<version>@{components.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>jbi-maven-plugin</artifactId>
+				<version>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: servicemix/archetypes/trunk/servicemix-service-assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-assembly/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-assembly/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-assembly/pom.xml Sun Mar 28 19:14:54 2010
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.servicemix.tooling</groupId>
-  <artifactId>servicemix-service-assembly</artifactId>
-  <name>ServiceMix :: Archetypes :: ServiceAssembly</name>
+		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>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-service-assembly</artifactId>
+	<name>ServiceMix :: Archetypes :: ServiceAssembly</name>
 
 </project>

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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -1,55 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<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.
-
--->
-<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-assembly</packaging>
-  <version>${version}</version>
-  <name>A custom project</name>
-  <url>http://www.myorganization.org</url>
-
-  @{repositories}
-
-
-  <dependencies>    
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <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>service-assembly</type>         
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+	<!--
+
+		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>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-service-assembly</packaging>
+	<version>${version}</version>
+	<name>A custom service assembly</name>
+	<url>http://www.myorganization.org</url>
+
+	<dependencies>
+		<!-- Add your service units dependencies here -->
+	</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>service-assembly</type>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: servicemix/archetypes/trunk/servicemix-service-engine/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-engine/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-engine/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-engine/pom.xml Sun Mar 28 19:14:54 2010
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-service-engine</artifactId>
+	<name>ServiceMix :: Archetypes :: ServiceEngine</name>
 
-    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>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.servicemix.tooling</groupId>
-  <artifactId>servicemix-service-engine</artifactId>
-  <name>ServiceMix :: Archetypes :: ServiceEngine</name>
-  
 </project>