servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r565353 [1/2] - in /incubator/servicemix/trunk: archetypes/ archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/ archetypes/servicemix-binding-component/src/main/resources/archetype-resources/ archetypes/servicemi...
Date Mon, 13 Aug 2007 13:55:23 GMT
Author: gnodet
Date: Mon Aug 13 06:55:15 2007
New Revision: 565353

URL: http://svn.apache.org/viewvc?view=rev&rev=565353
Log:
Add a plugin to correctly filter resources, use it on archetypes to avoid the need to modify in the release process, and add some svn:ignore properties

Added:
    incubator/servicemix/trunk/tooling/res-maven-plugin/   (with props)
    incubator/servicemix/trunk/tooling/res-maven-plugin/pom.xml
    incubator/servicemix/trunk/tooling/res-maven-plugin/src/
    incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/
    incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/
    incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/
    incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/
    incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/
    incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/
    incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/
    incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/
    incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/InterpolationFilterReader.java
    incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/ResMojo.java
Modified:
    incubator/servicemix/trunk/archetypes/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-camel-service-unit/   (props changed)
    incubator/servicemix/trunk/archetypes/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-drools-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/archetypes/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/trunk/core/   (props changed)
    incubator/servicemix/trunk/core/servicemix-audit/   (props changed)
    incubator/servicemix/trunk/core/servicemix-core/   (props changed)
    incubator/servicemix/trunk/core/servicemix-jbi/   (props changed)
    incubator/servicemix/trunk/core/servicemix-services/   (props changed)
    incubator/servicemix/trunk/deployables/bindingcomponents/   (props changed)
    incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-cxf-bc/   (props changed)
    incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-file/   (props changed)
    incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-ftp/   (props changed)
    incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/   (props changed)
    incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/   (props changed)
    incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/   (props changed)
    incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-bpe/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-cxf-se/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-drools/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-jsr181/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-lwcontainer/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-saxon/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/   (props changed)
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/   (props changed)
    incubator/servicemix/trunk/deployables/sharedlibraries/   (props changed)
    incubator/servicemix/trunk/deployables/sharedlibraries/servicemix-shared/   (props changed)
    incubator/servicemix/trunk/deployables/sharedlibraries/servicemix-shared-compat/   (props changed)
    incubator/servicemix/trunk/parent/   (props changed)
    incubator/servicemix/trunk/tooling/   (props changed)
    incubator/servicemix/trunk/tooling/jbi-maven-plugin/   (props changed)
    incubator/servicemix/trunk/tooling/pom.xml
    incubator/servicemix/trunk/tooling/xfire-maven-plugin/   (props changed)

Modified: incubator/servicemix/trunk/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/pom.xml Mon Aug 13 06:55:15 2007
@@ -73,6 +73,81 @@
                     </execution>
                 </executions>
             </plugin>
+			<plugin>
+				<inherited>true</inherited>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>res-maven-plugin</artifactId>
+				<version>${servicemix-version}</version>
+				<configuration>
+					<inputDirectory>${basedir}/src/main/resources</inputDirectory>
+					<outputDirectory>${basedir}/target/classes</outputDirectory>
+					<filters>
+						<servicemix-version>${servicemix-version}</servicemix-version>
+						<xbean-version>${xbean-version}</xbean-version>
+						<camel-version>1.1-SNAPSHOT</camel-version>
+						<xfire-version>${xfire-version}</xfire-version>
+						<releases-repo>http://people.apache.org/repo/m2-incubating-repository</releases-repo>
+						<snapshots-repo>http://people.apache.org/repo/m2-snapshot-repository</snapshots-repo>
+						<repositories><![CDATA[ 
+						  <pluginRepositories>
+						    <pluginRepository>
+						      <id>apache.incubating</id>
+						      <name>Apache Incubating Repository</name>
+						      <url>http://people.apache.org/repo/m2-incubating-repository</url>
+						      <snapshots>
+						        <enabled>false</enabled>
+						      </snapshots>
+						      <releases>
+						         <enabled>true</enabled>
+						      </releases>
+						    </pluginRepository>
+						    <pluginRepository>
+						      <id>apache.snapshots</id>
+						      <name>Apache Snapshots Repository</name>
+						      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+						      <snapshots>
+						        <enabled>true</enabled>
+						      </snapshots>
+						      <releases>
+						         <enabled>false</enabled>
+						      </releases>
+						    </pluginRepository>
+						  </pluginRepositories>
+						  <repositories>
+						    <repository>
+						      <id>apache.incubating</id>
+						      <name>Apache Incubating Repository</name>
+						      <url>http://people.apache.org/repo/m2-incubating-repository</url>
+						      <snapshots>
+						        <enabled>false</enabled>
+						      </snapshots>
+						      <releases>
+						         <enabled>true</enabled>
+						      </releases>
+						    </repository>
+						    <repository>
+						      <id>apache.snapshots</id>
+						      <name>Apache Snapshots Repository</name>
+						      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+						      <snapshots>
+						        <enabled>true</enabled>
+						      </snapshots>
+						      <releases>
+						         <enabled>false</enabled>
+						      </releases>
+						    </repository>
+						  </repositories>
+						]]></repositories>
+					</filters>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
         </plugins>
     </build>
 

Modified: incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A servicemix-bean Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
+
+@{repositories}
+
   <properties>
-    <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,58 +26,14 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <xbean-version>2.8</xbean-version>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <xbean-version>@{xbean-version}</xbean-version>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Propchange: incubator/servicemix/trunk/archetypes/servicemix-camel-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Modified: incubator/servicemix/trunk/archetypes/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -31,58 +31,11 @@
 
   <url>http://www.myorganization.org</url>
 
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
+@{repositories}
 
   <properties>
-  	<camel-version>1.1-SNAPSHOT</camel-version>
-    <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+  	<camel-version>@{camel-version}</camel-version>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
   </properties>
 
   <dependencies>

Modified: incubator/servicemix/trunk/archetypes/servicemix-drools-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-drools-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-drools-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-drools-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A Drools Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -25,60 +25,14 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <dependencies>   
-  </dependencies>
-	<properties>
-	  <xbean-version>2.8</xbean-version>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <xbean-version>@{xbean-version}</xbean-version>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
+
   <build>
   	<resources>
       <resource>

Modified: incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
+
+@{repositories}
+
   <properties>
-    <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -27,58 +27,14 @@
   <version>${version}</version>
   <name>An example JSR-181 Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
+
+@{repositories}
+
   <properties>
-    <xfire-version>1.2.5</xfire-version>
-    <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+    <xfire-version>@{xfire-version}</xfire-version>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A LWContainer Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,58 +26,13 @@
   <version>1.0-SNAPSHOT</version>
   <name>A example service unit using Apache ODE's Service Engine</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
+
+@{repositories}
+
+  <properties>
     <componentName>OdeBpelEngine</componentName>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies> 
   </dependencies>
   <build>

Modified: incubator/servicemix/trunk/archetypes/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,12 @@
   <version>${version}</version>
   <name>An X-Query based Service</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>An XSLT based Service</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+  </properties>
+
   <dependencies>    
     <dependency>
       <groupId>junit</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,58 +26,14 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <xbean-version>2.8</xbean-version>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+	<xbean-version>@{xbean-version}</xbean-version>
+    <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>

Modified: incubator/servicemix/trunk/archetypes/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/archetypes/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml Mon Aug 13 06:55:15 2007
@@ -26,57 +26,13 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+
+@{repositories}
+
+  <properties>
+    <servicemix-version>3.2-incubating-SNAPSHOT</servicemix-version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>

Propchange: incubator/servicemix/trunk/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -1 +1,6 @@
 *.iml
+.ruleset
+.pmd
+.pmd
+target
+.checkstyle

Propchange: incubator/servicemix/trunk/core/servicemix-audit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -3,3 +3,6 @@
 .project
 .settings
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/core/servicemix-core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -12,3 +12,6 @@
 *.iws
 derby.log
 cobertura.ser
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/core/servicemix-jbi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -7,3 +7,6 @@
 *.ipr
 *.iws
 cobertura.ser
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/core/servicemix-services/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -5,3 +5,6 @@
 cobertura.ser
 .settings
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/bindingcomponents/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -1,2 +1,5 @@
 target
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-cxf-bc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -1,3 +1,7 @@
 .classpath
 .project
 target
+.ruleset
+.checkstyle
+.pmd
+.settings

Propchange: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-file/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -3,3 +3,6 @@
 .project
 .settings
 target
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-ftp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -3,3 +3,6 @@
 .project
 .settings
 target
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-http/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -3,3 +3,6 @@
 .project
 .settings
 target
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -7,3 +7,6 @@
 cobertura.ser
 activemq-data
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-truezip/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -3,3 +3,6 @@
 .settings
 *.iml
 target
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -3,3 +3,6 @@
 target
 .settings
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/serviceengines/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -1,2 +1,5 @@
 *.iml
 target
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -3,3 +3,6 @@
 .project
 .settings
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bpe/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -4,3 +4,6 @@
 cobertura.ser
 *.iml
 .settings
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -0,0 +1,7 @@
+.classpath
+.project
+target
+.settings
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-cxf-se/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -1,3 +1,7 @@
 .classpath
 .project
 target
+.ruleset
+.checkstyle
+.pmd
+.settings

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-drools/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -4,3 +4,6 @@
 target
 *.iml
 .settings
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-eip/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -6,3 +6,6 @@
 ServiceMixFlow.dot
 *.iml
 .settings
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-jsr181/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -6,3 +6,6 @@
 cobertura.ser
 *.dot
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-lwcontainer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -5,3 +5,6 @@
 .settings
 cobertura.ser
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-quartz/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -5,3 +5,6 @@
 .classpath
 .project
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-saxon/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -3,3 +3,6 @@
 target
 .settings
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -3,3 +3,6 @@
 .project
 .settings
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -6,3 +6,6 @@
 .wtpmodules
 cobertura.ser
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/sharedlibraries/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -1 +1,4 @@
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/sharedlibraries/servicemix-shared/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -3,3 +3,6 @@
 target
 .settings
 *.iml
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/deployables/sharedlibraries/servicemix-shared-compat/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -1 +1,4 @@
 target
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/parent/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -1,2 +1,5 @@
 *.iml
 target
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/tooling/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -1,2 +1,6 @@
 *.iml
 target
+
+.ruleset
+.checkstyle
+.pmd

Propchange: incubator/servicemix/trunk/tooling/jbi-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -3,3 +3,6 @@
 .settings
 .classpath
 .project
+.ruleset
+.checkstyle
+.pmd

Modified: incubator/servicemix/trunk/tooling/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/pom.xml?view=diff&rev=565353&r1=565352&r2=565353
==============================================================================
--- incubator/servicemix/trunk/tooling/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/pom.xml Mon Aug 13 06:55:15 2007
@@ -35,6 +35,7 @@
     <packaging>pom</packaging>
   
     <modules>
+        <module>res-maven-plugin</module>
         <module>jbi-maven-plugin</module>
         <module>xfire-maven-plugin</module>
     </modules>

Propchange: incubator/servicemix/trunk/tooling/res-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 06:55:15 2007
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Added: incubator/servicemix/trunk/tooling/res-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/res-maven-plugin/pom.xml?view=auto&rev=565353
==============================================================================
--- incubator/servicemix/trunk/tooling/res-maven-plugin/pom.xml (added)
+++ incubator/servicemix/trunk/tooling/res-maven-plugin/pom.xml Mon Aug 13 06:55:15 2007
@@ -0,0 +1,67 @@
+<?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.tooling</groupId>
+        <artifactId>tooling</artifactId>
+        <version>3.2-incubating-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>res-maven-plugin</artifactId>
+    <packaging>maven-plugin</packaging>
+    <name>ServiceMix :: Maven2 Resource Plugin</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-project</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-archiver</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>1.0.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-script-ant</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+	    <dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+			<version>1.4.1</version>
+	    </dependency>        
+    </dependencies>
+
+</project>

Added: incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/InterpolationFilterReader.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/InterpolationFilterReader.java?view=auto&rev=565353
==============================================================================
--- incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/InterpolationFilterReader.java (added)
+++ incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/InterpolationFilterReader.java Mon Aug 13 06:55:15 2007
@@ -0,0 +1,204 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.maven.plugin.res;
+
+import java.io.FilterReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ */
+public class InterpolationFilterReader extends FilterReader {
+    /** replacement text from a token */
+    private String replaceData;
+
+    /** Index into replacement data */
+    private int replaceIndex = -1;
+
+    /** Hashtable to hold the replacee-replacer pairs (String to String). */
+    private Map variables = new HashMap();
+
+    /** Character marking the beginning of a token. */
+    private String beginToken;
+
+    /** Character marking the end of a token. */
+    private String endToken;
+
+    /** Length of begin token. */
+    private int beginTokenLength;
+
+    /** Length of end token. */
+    private int endTokenLength;
+
+    public InterpolationFilterReader(Reader in, Map variables, String beginToken, String endToken) {
+        super(in);
+
+        this.variables = variables;
+        this.beginToken = beginToken;
+        this.endToken = endToken;
+
+        beginTokenLength = beginToken.length();
+        endTokenLength = endToken.length();
+    }
+
+    /**
+     * Skips characters.  This method will block until some characters are
+     * available, an I/O error occurs, or the end of the stream is reached.
+     *
+     * @param  n  The number of characters to skip
+     *
+     * @return    the number of characters actually skipped
+     *
+     * @exception  IllegalArgumentException  If <code>n</code> is negative.
+     * @exception  IOException  If an I/O error occurs
+     */
+    public long skip(long n) throws IOException {
+        if (n < 0L) {
+            throw new IllegalArgumentException("skip value is negative");
+        }
+
+        for (long i = 0; i < n; i++) {
+            if (read() == -1) {
+                return i;
+            }
+        }
+        return n;
+    }
+
+    /**
+     * Reads characters into a portion of an array.  This method will block
+     * until some input is available, an I/O error occurs, or the end of the
+     * stream is reached.
+     *
+     * @param      cbuf  Destination buffer to write characters to.
+     *                   Must not be <code>null</code>.
+     * @param      off   Offset at which to start storing characters.
+     * @param      len   Maximum number of characters to read.
+     *
+     * @return     the number of characters read, or -1 if the end of the
+     *             stream has been reached
+     *
+     * @exception  IOException  If an I/O error occurs
+     */
+    public int read(char cbuf[], int off, int len) throws IOException {
+        for (int i = 0; i < len; i++) {
+            int ch = read();
+            if (ch == -1) {
+                if (i == 0) {
+                    return -1;
+                } else {
+                    return i;
+                }
+            }
+            cbuf[off + i] = (char)ch;
+        }
+        return len;
+    }
+
+    /**
+     * Returns the next character in the filtered stream, replacing tokens
+     * from the original stream.
+     *
+     * @return the next character in the resulting stream, or -1
+     * if the end of the resulting stream has been reached
+     *
+     * @exception IOException if the underlying stream throws an IOException
+     * during reading
+     */
+    public int read() throws IOException {
+        if (replaceIndex != -1) {
+            int ch = replaceData.charAt(replaceIndex++);
+            if (replaceIndex >= replaceData.length()) {
+                replaceIndex = -1;
+            }
+            return ch;
+        }
+
+        int ch = in.read();
+
+        if (ch == beginToken.charAt(0)) {
+            StringBuffer key = new StringBuffer();
+
+            int beginTokenMatchPos = 1;
+
+            do {
+                ch = in.read();
+                if (ch != -1) {
+                    key.append((char)ch);
+
+                    if ((beginTokenMatchPos < beginTokenLength)
+                        && (ch != beginToken.charAt(beginTokenMatchPos++))) {
+                        ch = -1; // not really EOF but to trigger code below
+                        break;
+                    }
+                } else {
+                    break;
+                }
+            } while (ch != endToken.charAt(0));
+
+            // now test endToken
+            if (ch != -1 && endTokenLength > 1) {
+                int endTokenMatchPos = 1;
+
+                do {
+                    ch = in.read();
+
+                    if (ch != -1) {
+                        key.append((char)ch);
+
+                        if (ch != endToken.charAt(endTokenMatchPos++)) {
+                            ch = -1; // not really EOF but to trigger code below
+                            break;
+                        }
+
+                    } else {
+                        break;
+                    }
+                } while (endTokenMatchPos < endTokenLength);
+            }
+
+            // There is nothing left to read so we have the situation where the begin/end token
+            // are in fact the same and as there is nothing left to read we have got ourselves
+            // end of a token boundary so let it pass through.
+            if (ch == -1) {
+                replaceData = key.toString();
+                replaceIndex = 0;
+                return beginToken.charAt(0);
+            }
+
+            String variableKey = key.substring(beginTokenLength - 1, key.length() - endTokenLength);
+
+            Object o = variables.get(variableKey);
+            if (o != null) {
+                String value = o.toString();
+                if (value.length() != 0) {
+                    replaceData = value;
+                    replaceIndex = 0;
+                }
+                return read();
+            } else {
+                replaceData = key.toString();
+                replaceIndex = 0;
+                return beginToken.charAt(0);
+            }
+        }
+
+        return ch;
+    }
+}



Mime
View raw message