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 [1/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...

Author: jbonofre
Date: Sun Mar 28 19:14:54 2010
New Revision: 928479

URL: http://svn.apache.org/viewvc?rev=928479&view=rev
Log:
[SM-1946] Upgrade archetypes to use latest 2010.01 components and cleanup POM. New archetypes will be added soon.

Modified:
    servicemix/archetypes/trunk/pom.xml
    servicemix/archetypes/trunk/servicemix-archetype-catalog/pom.xml
    servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/resources/archetype-pom.xml
    servicemix/archetypes/trunk/servicemix-bean-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-binding-component/pom.xml
    servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-camel-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/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/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/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/pom.xml
    servicemix/archetypes/trunk/servicemix-drools-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-eip-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-embedded-simple/pom.xml
    servicemix/archetypes/trunk/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-exec-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-exec-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-file-poller-service-unit/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/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/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/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/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/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/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/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/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/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/pom.xml
    servicemix/archetypes/trunk/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-mail-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-mail-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-ode-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/pom.xml
    servicemix/archetypes/trunk/servicemix-osgi-camel-archetype/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-osgi-cxf-code-first-archetype/pom.xml
    servicemix/archetypes/trunk/servicemix-osgi-cxf-code-first-archetype/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-osgi-cxf-wsdl-first-archetype/pom.xml
    servicemix/archetypes/trunk/servicemix-osgi-cxf-wsdl-first-archetype/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-osworkflow-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-osworkflow-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-project-root/pom.xml
    servicemix/archetypes/trunk/servicemix-project-root/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-quartz-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-quartz-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/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/pom.xml
    servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-script-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-scripting-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-service-assembly/pom.xml
    servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-service-engine/pom.xml
    servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-shared-library/pom.xml
    servicemix/archetypes/trunk/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-smpp-consumer-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-smpp-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-smpp-provider-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-smpp-provider-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-snmp-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-snmp-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-validation-service-unit/pom.xml
    servicemix/archetypes/trunk/servicemix-validation-service-unit/src/main/resources/archetype-resources/pom.xml

Modified: servicemix/archetypes/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/pom.xml (original)
+++ servicemix/archetypes/trunk/pom.xml Sun Mar 28 19:14:54 2010
@@ -21,12 +21,12 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>servicemix-pom</artifactId>
-    <version>2</version>
+    <version>4</version>
   </parent>
 
   <groupId>org.apache.servicemix</groupId>
   <artifactId>archetypes</artifactId>
-  <version>2009.01-SNAPSHOT</version>
+  <version>2010.01-SNAPSHOT</version>
 
   <name>ServiceMix :: Archetypes</name>
   <packaging>pom</packaging>
@@ -84,28 +84,24 @@
   </modules>
 
   <properties>
-    <components-version>2009.01</components-version>
-    <servicemix-version>3.3.1</servicemix-version>
-    <servicemix-specs-version>1.1.1</servicemix-specs-version>
-    <servicemix-utils-version>1.1.0</servicemix-utils-version>
-    <xbean-version>3.4.3</xbean-version>
-    <camel-version>1.6.0</camel-version>
-    <cxf-version>2.1.4</cxf-version>
-    <xfire-version>1.2.5</xfire-version>
-    <activemq-version>5.2.0</activemq-version>
+    <components.version>2010.01</components.version>
+    <jbi-maven-plugin.version>4.3</jbi-maven-plugin.version>
+    <maven-bundle-plugin.version>2.0.1</maven-bundle-plugin.version>
+    <servicemix.version>3.3.1</servicemix.version>
+    <servicemix-specs.version>1.4.0</servicemix-specs.version>
+    <servicemix-utils.version>1.2.0</servicemix-utils.version>
+    <geronimo-specs.version>1.1.1</geronimo-specs.version>
+    <xbean.version>3.4.3</xbean.version>
+    <camel.version>2.2.0</camel.version>
+    <cxf.version>2.2.6</cxf.version>
+    <xfire.version>1.2.5</xfire.version>
+    <activemq.version>5.3.0</activemq.version>
     <jaxb.version>2.1</jaxb.version>
     <jaxws.version>2.1-1</jaxws.version>
     <geronimo.wsmetadata.version>1.1.2</geronimo.wsmetadata.version>
+    <junit.version>4.5</junit.version>
   </properties>
 
-  <repositories>
-    <repository>
-       <id>servicemix-m2-repo</id>
-       <name>Servicemix Maven2 Repository</name>
-       <url>http://svn.apache.org/repos/asf/servicemix/m2-repo/</url>
-    </repository>
-  </repositories>
-
   <build>
     <plugins>
       <plugin>
@@ -129,46 +125,22 @@
           <inputDirectory>${basedir}/src/main/resources</inputDirectory>
           <outputDirectory>${basedir}/target/classes</outputDirectory>
           <filters>
-<!-- Don't like these bits.. archetypes should not be tied to specific versions if possible -->
-            <components-version>${components-version}</components-version>
-            <jbi-maven-plugin-version>3.2.1</jbi-maven-plugin-version>
-            <servicemix-version>${servicemix-version}</servicemix-version>
-            <xbean-version>${xbean-version}</xbean-version>
-            <camel-version>${camel-version}</camel-version>
-            <cxf-version>${cxf-version}</cxf-version>
-            <xfire-version>${xfire-version}</xfire-version>
-            <activemq-version>${activemq-version}</activemq-version>
+            <!-- Don't like these bits.. archetypes should not be tied to specific versions if possible -->
+            <components.version>${components.version}</components.version>
+            <jbi-maven-plugin.version>${jbi-maven-plugin.version}</jbi-maven-plugin.version>
+            <maven-bundle-plugin.version>${maven-bundle-plugin.version}</maven-bundle-plugin.version>
+            <servicemix.version>${servicemix.version}</servicemix.version>
+            <servicemix-specs.version>${servicemix-specs.version}</servicemix-specs.version>
+            <geronimo-specs.version>${geronimo-specs.version}</geronimo-specs.version>
+            <xbean.version>${xbean.version}</xbean.version>
+            <camel.version>${camel.version}</camel.version>
+            <cxf.version>${cxf.version}</cxf.version>
+            <xfire.version>${xfire.version}</xfire.version>
+            <activemq.version>${activemq.version}</activemq.version>
 			<jaxb.version>${jaxb.version}</jaxb.version>
 			<jaxws.version>${jaxws.version}</jaxws.version>
 			<geronimo.wsmetadata.version>${geronimo.wsmetadata.version}</geronimo.wsmetadata.version>
-            <repositories><![CDATA[
-  <repositories>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://repository.apache.org/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://repository.apache.org/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-]]></repositories>
+			<junit.version>${junit.version}</junit.version>
           </filters>
         </configuration>
         <executions>

Modified: servicemix/archetypes/trunk/servicemix-archetype-catalog/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetype-catalog/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetype-catalog/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-archetype-catalog/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-archetypes-itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml Sun Mar 28 19:14:54 2010
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.servicemix</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2009.01-SNAPSHOT</version>
+    <version>2010.01-SNAPSHOT</version>
   </parent>
   
   <artifactId>servicemix-archetypes-itests</artifactId>
@@ -42,92 +42,97 @@
     <dependency>
       <groupId>org.apache.servicemix.specs</groupId>
       <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
-      <version>${servicemix-specs-version}</version>
+      <version>${servicemix-specs.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-shared</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-utils</artifactId>
-      <version>${servicemix-utils-version}</version>
+      <version>${servicemix-utils.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-core</artifactId>
-      <version>${servicemix-version}</version>
+      <version>${servicemix.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-bean</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-camel</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-cxf-bc</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-cxf-se</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-eip</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-ftp</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-http</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-jms</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-jsr181</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <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-mail</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-saxon</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-scripting</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-script</artifactId>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-validation</artifactId>
-      <version>${components-version}</version>
+      <version>${components.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.tooling</groupId>

Modified: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/resources/archetype-pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/resources/archetype-pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/resources/archetype-pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/resources/archetype-pom.xml Sun Mar 28 19:14:54 2010
@@ -24,7 +24,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.logicblaze.jst.jbi</groupId>
+	<groupId>org.apache.servicemix</groupId>
 	<artifactId>dummy</artifactId>
 	<name>Archetype Manager</name>
 	<version>1.0-SNAPSHOT</version>

Modified: servicemix/archetypes/trunk/servicemix-bean-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-bean-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-bean-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-bean-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-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=928479&r1=928478&r2=928479&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 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,35 +28,15 @@
   <name>A servicemix-bean Service Unit</name>
   <url>http://www.myorganization.org</url>
 
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-bean</componentName>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-bean</artifactId>
-      <version>@{components-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-core</artifactId>
-      <version>@{servicemix-version}</version>
-      <scope>provided</scope>
+      <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>
@@ -67,7 +48,7 @@
       <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-binding-component/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-binding-component/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-binding-component/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-binding-component/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-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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -1,81 +1,131 @@
 <?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.
-
--->
+		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-component</packaging>
-  <version>${version}</version>
-  <name>A custom project</name>
-  <url>http://www.myorganization.org</url>
-
-  @{repositories}
-
-  <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>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>binding-component</type>       
-          <component>${packageName}.MyComponent</component>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>maven-xbean-plugin</artifactId>
-        <version>@{xbean-version}</version>
-        <executions>
-          <execution>
-            <configuration>
-              <namespace>http://${packageName}/1.0</namespace>
-            </configuration>
-            <goals>
-              <goal>mapping</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+	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-component</packaging>
+	<version>${version}</version>
+	<name>A custom binding component</name>
+	<url>http://www.myorganization.org</url>
+
+	<properties>
+		<servicemix.osgi.export>
+			${packageName}*;version=${project.version}
+	   </servicemix.osgi.export>
+		<servicemix.osgi.import>
+			!${packageName}*,
+			org.apache.servicemix.common,
+			org.apache.servicemix.common.osgi,
+			org.apache.servicemix.executors.impl,
+			org.apache.servicemix.jbi.container*;resolution:=optional,
+			org.apache.servicemix.jbi.framework*;resolution:=optional,
+			org.apache.xbean.spring.context.v2,
+			org.springframework.beans.factory.xml,
+			*
+	   </servicemix.osgi.import>
+		<servicemix.osgi.bundles>
+			org.springframework.core,
+			org.springframework.beans,
+			org.springframework.context,
+	   </servicemix.osgi.bundles>
+	</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-common</artifactId>
+			<version>@{components.version}</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.servicemix.specs</groupId>
+		    <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+		    <version>@{servicemix-specs.version}</version>
+		    <scope>provided</scope>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.geronimo.specs</groupId>
+		    <artifactId>geronimo-jta_1.1_spec</artifactId>
+		    <version>@{geronimo-specs.version}</version>
+		    <scope>provided</scope>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.servicemix</groupId>
+		    <artifactId>servicemix-core</artifactId>
+		    <version>@{servicemix.version}</version>
+		    <scope>test</scope>
+		</dependency>
+		<dependency>
+		    <groupId>junit</groupId>
+		    <artifactId>junit</artifactId>
+		    <version>@{junit.version}</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>
+					<generatedDescriptorLocation>${project.build.directory}/jbi</generatedDescriptorLocation>
+					<type>binding-component</type>
+					<component>${packageName}.MyComponent</component>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.xbean</groupId>
+				<artifactId>maven-xbean-plugin</artifactId>
+				<version>@{xbean.version}</version>
+				<executions>
+					<execution>
+						<configuration>
+							<namespace>http://${packageName}/1.0</namespace>
+						</configuration>
+						<goals>
+							<goal>mapping</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>@{maven-bundle-plugin.version}</version>
+				<configuration>
+				    <Bundle-Name>${project.name}</Bundle-Name>
+				    <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+				    <Export-Package>${servicemix.osgi.export}</Export-Package>
+				    <Import-Package>${servicemix.osgi.import}</Import-Package>
+				</configuration>
+			
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: servicemix/archetypes/trunk/servicemix-camel-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-camel-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-camel-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-camel-service-unit/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-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=928479&r1=928478&r2=928479&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 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,23 +28,11 @@
   <name>A Camel based JBI Service Unit</name>
   <url>http://www.myorganization.org</url>
 
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-camel</componentName>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-camel</artifactId>
-      <version>@{components-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.servicemix</groupId>
-      <artifactId>servicemix-core</artifactId>
-      <version>@{servicemix-version}</version>
-      <scope>provided</scope>
+      <version>@{components.version}</version>
     </dependency>
   </dependencies>
 
@@ -62,14 +51,14 @@
       <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>
       <!-- 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/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-cxf-bc-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-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=928479&r1=928478&r2=928479&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 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,34 +28,21 @@
   <name>A Cxf BC Service Unit</name>
   <url>http://www.myorganization.org</url>
   
-  @{repositories}
-  
-  <properties>
-    <componentName>servicemix-cxf-bc</componentName>
-  </properties>
-  
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-cxf-bc</artifactId>
-      <version>@{components-version}</version>      
+      <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>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-cxf-se-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-cxf-se-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-cxf-se-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-cxf-se-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-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=928479&r1=928478&r2=928479&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 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,35 +28,16 @@
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
 
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-cxf-se</componentName>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-cxf-se</artifactId>
-      <version>@{components-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
+      <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>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -67,11 +49,8 @@
       <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-cxf-se-wsdl-first-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-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-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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -18,7 +18,9 @@
 
 -->
 <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>
@@ -26,35 +28,16 @@
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
 
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-cxf-se</componentName>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-cxf-se</artifactId>
-      <version>@{components-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
+      <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>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -66,16 +49,13 @@
       <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>
       <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-drools-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-drools-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-drools-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-drools-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-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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -17,36 +17,32 @@
     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 Drools Service Unit</name>
   <url>http://www.myorganization.org</url>
-
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-drools</componentName>
-  </properties>
+  
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-drools</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>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-eip-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-eip-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-eip-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-eip-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-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=928479&r1=928478&r2=928479&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 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,21 @@
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
 
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-eip</componentName>
-  </properties>
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-eip</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>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-embedded-simple/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-embedded-simple/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-embedded-simple/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-embedded-simple/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-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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -17,39 +17,31 @@
     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>
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-
-  @{repositories}
-
+  
   <dependencies>
   	<dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-core</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>
+    <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>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-exec-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-exec-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-exec-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-exec-service-unit/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-exec-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-exec-service-unit/src/main/resources/archetype-resources/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-exec-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-exec-service-unit/src/main/resources/archetype-resources/pom.xml Sun Mar 28 19:14:54 2010
@@ -17,9 +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>
     
@@ -30,32 +28,24 @@
     <name>An Exec service unit</name>
     <url>http://www.myorganization.org</url>
     
-    @{repositories}
-    
-    <properties>
-        <componentName>servicemix-exec</componentName>
-    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-exec</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>
          
-</project>         
\ No newline at end of file
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-file-poller-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-file-poller-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-file-poller-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-file-poller-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-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=928479&r1=928478&r2=928479&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 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,31 +28,24 @@
   <name>A file poller service unit</name>
   <url>http://www.myorganization.org</url>
 
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-file</componentName>
-  </properties>
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-file</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>
+  
 </project>

Modified: servicemix/archetypes/trunk/servicemix-file-sender-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-file-sender-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-file-sender-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-file-sender-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-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=928479&r1=928478&r2=928479&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 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,31 +28,24 @@
   <name>A file sender service unit</name>
   <url>http://www.myorganization.org</url>
 
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-file</componentName>
-  </properties>
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-file</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>
+  
 </project>

Modified: servicemix/archetypes/trunk/servicemix-ftp-poller-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-ftp-poller-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-ftp-poller-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-ftp-poller-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-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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -17,36 +17,32 @@
     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 FTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-ftp</componentName>
-  </properties>
+  
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-ftp</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>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-ftp-sender-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-ftp-sender-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-ftp-sender-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-ftp-sender-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-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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -17,36 +17,32 @@
     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 FTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-ftp</componentName>
-  </properties>
+  
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-ftp</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>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-http-consumer-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-http-consumer-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-http-consumer-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-http-consumer-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-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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -18,36 +18,34 @@
 
 -->
 <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 Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-http</componentName>
-  </properties>
+  
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-http</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>
       </plugin>
     </plugins>
   </build>
+  
 </project>

Modified: servicemix/archetypes/trunk/servicemix-http-provider-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-http-provider-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-http-provider-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-http-provider-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-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=928479&r1=928478&r2=928479&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 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,21 @@
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
 
-  @{repositories}
-
-  <properties>
-    <componentName>servicemix-http</componentName>
-  </properties>
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-http</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>
       </plugin>     
     </plugins>

Modified: servicemix/archetypes/trunk/servicemix-jms-consumer-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-jms-consumer-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-jms-consumer-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-jms-consumer-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-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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -17,21 +17,24 @@
     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 custom project</name>
+  <name>A custom JMS consumer service unit</name>
   <url>http://www.myorganization.org</url>
-  
-  @{repositories}
 
-  <properties>
-    <componentName>servicemix-jms</componentName>
-  </properties>
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-jms</artifactId>
+        <version>@{components.version}</version>
+    </dependency>
+  </dependencies>
   
   <build>
   	<resources>

Modified: servicemix/archetypes/trunk/servicemix-jms-provider-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-jms-provider-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-jms-provider-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-jms-provider-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-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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -17,40 +17,33 @@
     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 custom project</name>
+  <name>A custom JMS provider service unit</name>
   <url>http://www.myorganization.org</url>
 
-  @{repositories}
+  <dependencies>
+    <dependency>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-jms</artifactId>
+        <version>@{components.version}</version>
+    </dependency>
+  </dependencies>
 
-  <properties>
-    <componentName>servicemix-jms</componentName>
-  </properties>
-  
   <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-jsr181-annotated-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-jsr181-annotated-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-jsr181-annotated-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-jsr181-annotated-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-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=928479&r1=928478&r2=928479&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 Sun Mar 28 19:14:54 2010
@@ -17,45 +17,27 @@
     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 custom project</name>
+  <name>A custom JSR-181 annotated 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>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
+    <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -67,11 +49,8 @@
       <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-jsr181-wsdl-first-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-jsr181-wsdl-first-service-unit/pom.xml?rev=928479&r1=928478&r2=928479&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-jsr181-wsdl-first-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-jsr181-wsdl-first-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>