diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-05 13:42:26 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-05 13:42:26 +0000 |
| commit | 161c5c34e4a3c6999578c833add2f60e2494dbb3 (patch) | |
| tree | cb4aa65ce8c8ec56129f22cd8e4c3fc642072619 /sca-java-2.x/trunk | |
| parent | 5b1513570240501b58a1a43a28c46cba5ab2dac9 (diff) | |
Fix lots of depricated maven variable warnings for Maven v3
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1067440 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
147 files changed, 191 insertions, 229 deletions
diff --git a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-aggregation/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-aggregation/pom.xml index 8b68f8a102..b23cdfa565 100644 --- a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-aggregation/pom.xml +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-aggregation/pom.xml @@ -31,7 +31,7 @@ <name>Apache Tuscany SCA Base Runtime Aggregation</name>
<properties>
- <bundle-symbolic-name>${project.groupId}.${artifactId}</bundle-symbolic-name>
+ <bundle-symbolic-name>${project.groupId}.${project.artifactId}</bundle-symbolic-name>
</properties>
@@ -45,7 +45,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime-pom</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>pom</type>
<optional>true</optional>
<exclusions>
diff --git a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml index 1765df5bea..6e896e93f5 100644 --- a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml +++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml @@ -34,7 +34,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jline</groupId>
diff --git a/sca-java-2.x/trunk/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml index 468bee8455..9c93d600ac 100644 --- a/sca-java-2.x/trunk/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml +++ b/sca-java-2.x/trunk/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml @@ -34,7 +34,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-rmi-runtime</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
</dependencies>
diff --git a/sca-java-2.x/trunk/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml index 33c7466a1b..2e6effbf4d 100644 --- a/sca-java-2.x/trunk/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml +++ b/sca-java-2.x/trunk/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml @@ -34,7 +34,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
</dependencies>
diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml index 92801a9a3c..7b23674c39 100644 --- a/sca-java-2.x/trunk/distribution/all/pom.xml +++ b/sca-java-2.x/trunk/distribution/all/pom.xml @@ -121,7 +121,7 @@ <descriptor>src/main/assembly/bin-default.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> - <finalName>apache-tuscany-sca-all-${version}</finalName> + <finalName>apache-tuscany-sca-all-${project.version}</finalName> <appendAssemblyId>true</appendAssemblyId> <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions> </configuration> @@ -163,7 +163,7 @@ <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> - <finalName>apache-tuscany-sca-all-${version}</finalName> + <finalName>apache-tuscany-sca-all-${project.version}</finalName> <appendAssemblyId>true</appendAssemblyId> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <attach>true</attach> @@ -470,7 +470,7 @@ <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> - <finalName>apache-tuscany-sca-all-${version}</finalName> + <finalName>apache-tuscany-sca-all-${project.version}</finalName> <appendAssemblyId>true</appendAssemblyId> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> </configuration> diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-client-webapp/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-client-webapp/pom.xml index 27816ddb00..3aa5aa3809 100644 --- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-client-webapp/pom.xml +++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-client-webapp/pom.xml @@ -40,7 +40,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml index d1ea28fc54..9497949fb5 100644 --- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml +++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml @@ -40,6 +40,6 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml index b11a6bb687..704ee91174 100644 --- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml +++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml @@ -40,7 +40,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml index d8a4831e82..67de9b020e 100644 --- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml +++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml @@ -46,7 +46,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-service-contribution/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-service-contribution/pom.xml index 3b43a4fa59..e37b2021cb 100644 --- a/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-service-contribution/pom.xml +++ b/sca-java-2.x/trunk/distribution/tomcat/testing/helloworld-service-contribution/pom.xml @@ -40,6 +40,6 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> diff --git a/sca-java-2.x/trunk/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml index 2ed94936a9..583ff605b6 100644 --- a/sca-java-2.x/trunk/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml +++ b/sca-java-2.x/trunk/maven/archetypes/binding/src/main/resources/archetype-resources/pom.xml @@ -26,9 +26,9 @@ <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>binding-${artifactId}</artifactId>
+ <artifactId>binding-${project.artifactId}</artifactId>
<groupId>${groupId}</groupId>
- <version>${version}</version>
+ <version>${project.version}</version>
<name>Apache Tuscany SCA ${bindingName} Binding Extension</name>
<dependencies>
diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml index 8b2ad3d3a9..5a2755a325 100644 --- a/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml +++ b/sca-java-2.x/trunk/maven/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml @@ -22,9 +22,9 @@ <modelVersion>4.0.0</modelVersion> <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <version>${version}</version> - <name>${artifactId}</name> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <name>${project.artifactId}</name> <dependencies> @@ -46,7 +46,7 @@ <build> <defaultGoal>install</defaultGoal> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml index 873b45ee39..76183eafc7 100644 --- a/sca-java-2.x/trunk/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml +++ b/sca-java-2.x/trunk/maven/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml @@ -22,9 +22,9 @@ <modelVersion>4.0.0</modelVersion> <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> + <artifactId>${project.artifactId}</artifactId> <packaging>jar</packaging> - <version>${version}</version> + <version>${project.version}</version> #literal() <!-- TODO project name --> <name>quickstart</name> <description></description> @@ -64,7 +64,7 @@ </dependencies> <build> <defaultGoal>install</defaultGoal> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <resources> <resource> <filtering>false</filtering> diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml index 30be6b66e3..ecc47712a9 100644 --- a/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml +++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml @@ -22,9 +22,9 @@ <modelVersion>4.0.0</modelVersion> <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> + <artifactId>${project.artifactId}</artifactId> <packaging>war</packaging> - <version>${version}</version> + <version>${project.version}</version> #literal()<!-- TODO project name --> <name>quickstart</name> <description></description> @@ -81,7 +81,7 @@ </dependencies> <build> <defaultGoal>install</defaultGoal> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <resources> <resource> <filtering>false</filtering> diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml index f252e602ab..19c1181f1b 100644 --- a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml +++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml @@ -22,9 +22,9 @@ <modelVersion>4.0.0</modelVersion> <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> + <artifactId>${project.artifactId}</artifactId> <packaging>war</packaging> - <version>${version}</version> + <version>${project.version}</version> #literal()<!-- TODO project name --> <name>quickstart-jsf</name> <description></description> @@ -89,7 +89,7 @@ <build> <defaultGoal>install</defaultGoal> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <resources> <resource> <filtering>false</filtering> diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml index 8fc4bde625..95c2f5800d 100644 --- a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml +++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml @@ -22,9 +22,9 @@ <modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
+ <artifactId>${project.artifactId}</artifactId>
<packaging>war</packaging>
- <version>${version}</version>
+ <version>${project.version}</version>
<name>quickstart-jsonp</name>
<dependencies>
@@ -92,7 +92,7 @@ </dependencies>
<build>
<defaultGoal>install</defaultGoal>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<resources>
<resource>
<filtering>false</filtering>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml index 312affaba9..8e8bbe128f 100644 --- a/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml +++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml @@ -22,9 +22,9 @@ <modelVersion>4.0.0</modelVersion> <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> + <artifactId>${project.artifactId}</artifactId> <packaging>war</packaging> - <version>${version}</version> + <version>${project.version}</version> #literal()<!-- TODO project name --> <name>quickstart-stripes</name> <description></description> @@ -59,7 +59,7 @@ <build> <defaultGoal>install</defaultGoal> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <resources> <resource> <filtering>false</filtering> diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml index bad07a995e..3ec16988b1 100644 --- a/sca-java-2.x/trunk/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml +++ b/sca-java-2.x/trunk/maven/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml @@ -22,9 +22,9 @@ <modelVersion>4.0.0</modelVersion> <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> + <artifactId>${project.artifactId}</artifactId> <packaging>war</packaging> - <version>${version}</version> + <version>${project.version}</version> <name>quickstart</name> <dependencies> @@ -81,7 +81,7 @@ </dependencies> <build> <defaultGoal>install</defaultGoal> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <resources> <resource> <filtering>false</filtering> diff --git a/sca-java-2.x/trunk/modules/core-spi/pom.xml b/sca-java-2.x/trunk/modules/core-spi/pom.xml index ec8f1a680f..ade0aa6170 100644 --- a/sca-java-2.x/trunk/modules/core-spi/pom.xml +++ b/sca-java-2.x/trunk/modules/core-spi/pom.xml @@ -86,7 +86,7 @@ <phase>process-resources</phase> <configuration> <tasks> - <filter token="version" value="${pom.version}"/> + <filter token="version" value="${project.version}"/> <filter token="svnRevision" value="${sources.version}"/> <filter token="buildtime" value="${build.timestamp}"/> <copy toDir="${basedir}/target/classes/org/apache/tuscany/sca/runtime" overwrite="true" diff --git a/sca-java-2.x/trunk/samples/applications/eightball-demo/eightball-process/pom.xml b/sca-java-2.x/trunk/samples/applications/eightball-demo/eightball-process/pom.xml index 38b52e183d..4f37c91d55 100644 --- a/sca-java-2.x/trunk/samples/applications/eightball-demo/eightball-process/pom.xml +++ b/sca-java-2.x/trunk/samples/applications/eightball-demo/eightball-process/pom.xml @@ -49,7 +49,7 @@ </dependencies>
<build>
<defaultGoal>install</defaultGoal>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<resources>
<resource>
<filtering>false</filtering>
@@ -106,4 +106,4 @@ <properties>
<tuscany.version>2.0-SNAPSHOT</tuscany.version>
</properties>
- </project>
\ No newline at end of file + </project>
diff --git a/sca-java-2.x/trunk/samples/applications/eightball-demo/eightball-webapp/pom.xml b/sca-java-2.x/trunk/samples/applications/eightball-demo/eightball-webapp/pom.xml index eeabfc5fa4..054d13c52f 100644 --- a/sca-java-2.x/trunk/samples/applications/eightball-demo/eightball-webapp/pom.xml +++ b/sca-java-2.x/trunk/samples/applications/eightball-demo/eightball-webapp/pom.xml @@ -133,19 +133,19 @@ <artifactItem>
<groupId>demo</groupId>
<artifactId>eightball</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<outputDirectory>src/main/webapp/WEB-INF/sca-contributions</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>demo</groupId>
<artifactId>eightball-process</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<outputDirectory>src/main/webapp/WEB-INF/sca-contributions</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>demo</groupId>
<artifactId>translator</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<outputDirectory>src/main/webapp/WEB-INF/sca-contributions</outputDirectory>
</artifactItem>
</artifactItems>
@@ -159,4 +159,4 @@ <tuscany.version>2.0-SNAPSHOT</tuscany.version>
<jetty.version>6.1.18</jetty.version>
</properties>
-</project>
\ No newline at end of file +</project>
diff --git a/sca-java-2.x/trunk/samples/applications/eightball-demo/eightball/pom.xml b/sca-java-2.x/trunk/samples/applications/eightball-demo/eightball/pom.xml index 5bd58d3dae..86a0407b24 100644 --- a/sca-java-2.x/trunk/samples/applications/eightball-demo/eightball/pom.xml +++ b/sca-java-2.x/trunk/samples/applications/eightball-demo/eightball/pom.xml @@ -49,7 +49,7 @@ </dependencies>
<build>
<defaultGoal>install</defaultGoal>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<resources>
<resource>
<filtering>false</filtering>
@@ -106,4 +106,4 @@ <properties>
<tuscany.version>2.0-SNAPSHOT</tuscany.version>
</properties>
- </project>
\ No newline at end of file + </project>
diff --git a/sca-java-2.x/trunk/samples/applications/eightball-demo/translator/pom.xml b/sca-java-2.x/trunk/samples/applications/eightball-demo/translator/pom.xml index 858fa1b4eb..0f04558eff 100644 --- a/sca-java-2.x/trunk/samples/applications/eightball-demo/translator/pom.xml +++ b/sca-java-2.x/trunk/samples/applications/eightball-demo/translator/pom.xml @@ -49,7 +49,7 @@ </dependencies>
<build>
<defaultGoal>install</defaultGoal>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<resources>
<resource>
<filtering>false</filtering>
@@ -106,4 +106,4 @@ <properties>
<tuscany.version>2.0-SNAPSHOT</tuscany.version>
</properties>
- </project>
\ No newline at end of file + </project>
diff --git a/sca-java-2.x/trunk/samples/applications/logging-scribe/helloworld-scribe/pom.xml b/sca-java-2.x/trunk/samples/applications/logging-scribe/helloworld-scribe/pom.xml index 6a99a1e13e..94234147e7 100644 --- a/sca-java-2.x/trunk/samples/applications/logging-scribe/helloworld-scribe/pom.xml +++ b/sca-java-2.x/trunk/samples/applications/logging-scribe/helloworld-scribe/pom.xml @@ -84,7 +84,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml b/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml index 1eb5160538..190ed73d98 100644 --- a/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml +++ b/sca-java-2.x/trunk/samples/applications/store-webapp/pom.xml @@ -95,7 +95,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -106,7 +106,7 @@ <server>tomcat</server> <!-- context for the webapp, as finalName is not being honored --> - <path>/${artifactId}</path> + <path>/${project.artifactId}</path> </configuration> </plugin> <plugin> diff --git a/sca-java-2.x/trunk/samples/applications/store/pom.xml b/sca-java-2.x/trunk/samples/applications/store/pom.xml index e3eadf8dc3..c9c6c2a639 100644 --- a/sca-java-2.x/trunk/samples/applications/store/pom.xml +++ b/sca-java-2.x/trunk/samples/applications/store/pom.xml @@ -107,7 +107,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml index 94dbe0ddb7..9490ff8c17 100644 --- a/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml +++ b/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml @@ -65,6 +65,6 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml index 4c9e17d553..cf9ca44ec8 100644 --- a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml @@ -45,7 +45,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml index 058ba84bd8..f7c375a8c3 100644 --- a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml @@ -66,7 +66,7 @@ <artifactItem> <groupId>org.apache.tuscany.sca</groupId> <artifactId>sample-helloworld-contribution</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> <!-- should really go in the target folder but i can't get jetty:run to work using that --> <outputDirectory>src/main/webapp/WEB-INF/sca-contributions</outputDirectory> </artifactItem> diff --git a/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml b/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml index a4afa47cb3..9d61acbd45 100644 --- a/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/getting-started/scdl-include-contribution/pom.xml @@ -46,7 +46,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
@@ -66,7 +66,7 @@ <configuration>
<contributions>
<!-- add the dependee contribution that this contribution uses -->
- <param>..\helloworld-contribution\target\helloworld-contribution.jar</param>
+ <param>..\helloworld-contribution\target\sample-helloworld-contribution.jar</param>
</contributions>
</configuration>
</plugin>
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml index 01555e08df..eca47cb8e8 100644 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml @@ -44,7 +44,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.apache.tuscany.maven.plugins</groupId> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml index c511880900..f611d71402 100644 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml @@ -45,7 +45,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml index bb56cd4eaf..eb3eda368a 100644 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml @@ -59,7 +59,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
@@ -80,7 +80,7 @@ <tasks>
<ant antfile="./build-dojo.xml" target="unpack-dojo-files">
<property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
+ <property name="artifactId" value="${project.artifactId}"/>
</ant>
</tasks>
</configuration>
@@ -95,7 +95,7 @@ <tasks>
<ant antfile="./build-dojo.xml" target="clean-dojo-files">
<property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
+ <property name="artifactId" value="${project.artifactId}"/>
</ant>
</tasks>
</configuration>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml index 4fda33803a..d8257ed8ee 100644 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml @@ -61,7 +61,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.apache.tuscany.maven.plugins</groupId> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml index 7c862beee7..01807f6b87 100644 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml @@ -61,7 +61,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.apache.tuscany.maven.plugins</groupId> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml index 6f08be42ed..fb102b7c32 100644 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml @@ -45,7 +45,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.apache.tuscany.maven.plugins</groupId> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml index 76cd542889..33ab0cde19 100644 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml @@ -45,7 +45,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
</plugins>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml index d2472291e1..3f2f9e4177 100644 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml @@ -100,7 +100,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml index 37e9fef9f7..c1b66724e9 100644 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml @@ -112,7 +112,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml index 1de7aff7a5..e0b5d6962e 100644 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml @@ -94,7 +94,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <artifactId>maven-eclipse-plugin</artifactId> @@ -132,7 +132,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> </dependencies> <executions> diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml index 9739662478..978ada93d0 100644 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml @@ -88,7 +88,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <artifactId>maven-eclipse-plugin</artifactId> @@ -126,7 +126,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> </dependencies> <executions> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml index f847ff9322..611b5a9366 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml @@ -46,7 +46,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml index 9aea2223b3..a6c338475f 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml @@ -52,7 +52,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<!-- plugin to support zip packaging for SCA contributions -->
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml index ab959a5f54..ef462dffba 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml @@ -46,7 +46,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml index 5b5375f6db..e43f92a862 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml @@ -44,7 +44,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml index 8aee7b735d..f084b0ec3c 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml @@ -94,7 +94,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <artifactId>maven-eclipse-plugin</artifactId> @@ -133,7 +133,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> </dependencies> <executions> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml index f15cab63b1..0a436fc560 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml @@ -88,7 +88,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <artifactId>maven-eclipse-plugin</artifactId> @@ -126,7 +126,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> </dependencies> <executions> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml index 11836ec19b..cd1be13214 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml @@ -45,7 +45,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml index a1e1c86706..b4cb31e1ef 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml @@ -45,7 +45,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<!-- plugin to support using mvn tuscany:run to run this contribution -->
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml index 2122876b47..a29fdc345d 100644 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml @@ -47,7 +47,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml index a123478729..a9c4ef0dc0 100644 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml @@ -47,7 +47,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml index c17594033b..e590286090 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml @@ -75,7 +75,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml index d20dd90b35..086b80a5fc 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml @@ -62,7 +62,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/pom.xml index 06b2945c17..5f68dc649f 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/pom.xml @@ -66,7 +66,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml index 82e0845349..13e52b91c2 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml @@ -45,7 +45,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml index d4e149f5a6..6df94d3e8d 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml @@ -52,7 +52,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <artifactId>maven-eclipse-plugin</artifactId> @@ -90,7 +90,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> </dependencies> <executions> diff --git a/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml index 99af50b3eb..c31324d21f 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml @@ -95,7 +95,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <artifactId>maven-eclipse-plugin</artifactId> @@ -144,7 +144,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> </dependencies> <executions> diff --git a/sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml index 650db484e7..e8df87a914 100644 --- a/sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml +++ b/sca-java-2.x/trunk/testing/compliance-tests/assembly/pom.xml @@ -73,7 +73,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml index 6964ecf1f9..34caab4ab6 100644 --- a/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml +++ b/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml @@ -89,7 +89,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> diff --git a/sca-java-2.x/trunk/testing/compliance-tests/binding-ws/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/binding-ws/pom.xml index f659186c75..f8a50f9c7d 100644 --- a/sca-java-2.x/trunk/testing/compliance-tests/binding-ws/pom.xml +++ b/sca-java-2.x/trunk/testing/compliance-tests/binding-ws/pom.xml @@ -74,7 +74,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> diff --git a/sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml index 1251437645..ec54decec3 100644 --- a/sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml +++ b/sca-java-2.x/trunk/testing/compliance-tests/java-caa/pom.xml @@ -78,7 +78,7 @@ <build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml index 5b8b938157..03ca3fe5bf 100644 --- a/sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml +++ b/sca-java-2.x/trunk/testing/compliance-tests/java-ci/pom.xml @@ -64,7 +64,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
diff --git a/sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml b/sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml index afdc97a1af..2e0bd8e6a7 100644 --- a/sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml +++ b/sca-java-2.x/trunk/testing/compliance-tests/policy/pom.xml @@ -73,7 +73,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml index cc2ea3676f..efef84de17 100644 --- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml @@ -90,7 +90,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-ws/pom.xml index dffbb4f9a9..7cc80fa468 100644 --- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-ws/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-ws/pom.xml @@ -81,7 +81,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml index ad5b69ec69..dcca2ebec9 100644 --- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml @@ -54,7 +54,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -65,6 +65,7 @@ <useFile>false</useFile> <trimStackTrace>false</trimStackTrace> <useSystemClassLoader>true</useSystemClassLoader> + <argLine>-Djava.endorsed.dirs=target/endorsed</argLine> </configuration> </plugin> <plugin> @@ -93,45 +94,6 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Djava.endorsed.dirs=target/endorsed</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>generate-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - <artifactItem> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> diff --git a/sca-java-2.x/trunk/testing/itest/builder/pom.xml b/sca-java-2.x/trunk/testing/itest/builder/pom.xml index 66ac4cd5dc..a16f3e12cd 100644 --- a/sca-java-2.x/trunk/testing/itest/builder/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/builder/pom.xml @@ -58,6 +58,6 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> diff --git a/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/pom.xml index d9793d810d..246119275f 100644 --- a/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/distribution/bin-distro-unzip/pom.xml @@ -62,7 +62,7 @@ <configuration>
<tasks>
<property name="java.home" value="${java.home}"/>
- <property name="tuscany.version" value="${version}" />
+ <property name="tuscany.version" value="${project.version}" />
<ant antfile="./build.xml" />
</tasks>
</configuration>
@@ -113,7 +113,7 @@ <configuration>
<tasks>
<property name="java.home" value="${java.home}"/>
- <property name="tuscany.version" value="${version}" />
+ <property name="tuscany.version" value="${project.version}" />
<ant antfile="./build.xml" />
</tasks>
</configuration>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml index 90151dc9b7..40515d69b5 100644 --- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml @@ -74,7 +74,7 @@ </goals>
<configuration>
<tasks>
- <property name="tuscany.version" value="${version}" />
+ <property name="tuscany.version" value="${project.version}" />
<property name="java.home" value="${java.home}"/>
<ant antfile="./build.xml" target="run"/>
</tasks>
diff --git a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml index 35058e8300..9a599ac695 100644 --- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml @@ -56,7 +56,7 @@ </goals> <configuration> <tasks> - <property name="tuscany.version" value="${version}" /> + <property name="tuscany.version" value="${project.version}" /> <ant antfile="./build.xml" target="run"/> </tasks> </configuration> diff --git a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml index 5ea30a20f7..69263cd54f 100644 --- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml @@ -74,7 +74,7 @@ </goals> <configuration> <tasks> - <property name="tuscany.version" value="${version}" /> + <property name="tuscany.version" value="${project.version}" /> <property name="java.home" value="${java.home}"/> <ant antfile="./build.xml" target="run"/> </tasks> diff --git a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml index c598f122e0..37ed0a2af2 100644 --- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml @@ -57,7 +57,7 @@ <configuration> <tasks> <property name="java.home" value="${java.home}"/> - <property name="tuscany.version" value="${version}" /> + <property name="tuscany.version" value="${project.version}" /> <ant antfile="./build.xml" target="run"/> </tasks> </configuration> diff --git a/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml index a0a1790c00..0dcd2866d8 100644 --- a/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml @@ -74,7 +74,7 @@ </goals> <configuration> <tasks> - <property name="tuscany.version" value="${version}" /> + <property name="tuscany.version" value="${project.version}" /> <property name="java.home" value="${java.home}"/> <ant antfile="./build.xml" target="run"/> </tasks> diff --git a/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/pom.xml index 93bd2e3327..f6d95e214e 100644 --- a/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-jse/pom.xml @@ -57,7 +57,7 @@ <configuration> <tasks> <property name="java.home" value="${java.home}"/> - <property name="tuscany.version" value="${version}" /> + <property name="tuscany.version" value="${project.version}" /> <ant antfile="./build.xml" target="run"/> </tasks> </configuration> diff --git a/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/pom.xml index 0e4a97a07f..44c9088237 100644 --- a/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/distribution/launcher-embedded-osgi/pom.xml @@ -57,7 +57,7 @@ <configuration> <tasks> <property name="java.home" value="${java.home}"/> - <property name="tuscany.version" value="${version}" /> + <property name="tuscany.version" value="${project.version}" /> <ant antfile="./build.xml" target="run"/> </tasks> </configuration> diff --git a/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/pom.xml b/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/pom.xml index c4b6e5eb5f..148208b508 100644 --- a/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/distribution/src-distro-unzip/pom.xml @@ -62,7 +62,7 @@ <configuration> <tasks> <property name="java.home" value="${java.home}"/> - <property name="tuscany.version" value="${version}" /> + <property name="tuscany.version" value="${project.version}" /> <ant antfile="./build.xml" /> </tasks> </configuration> @@ -113,7 +113,7 @@ <configuration> <tasks> <property name="java.home" value="${java.home}"/> - <property name="tuscany.version" value="${version}" /> + <property name="tuscany.version" value="${project.version}" /> <ant antfile="./build.xml" /> </tasks> </configuration> diff --git a/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml b/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml index 61073b8990..9abd2df2ba 100644 --- a/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml @@ -45,7 +45,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/domains/helloworld/pom.xml b/sca-java-2.x/trunk/testing/itest/domains/helloworld/pom.xml index ab3e8ecd8f..458f5d44d1 100644 --- a/sca-java-2.x/trunk/testing/itest/domains/helloworld/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/domains/helloworld/pom.xml @@ -49,7 +49,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/sca-java-2.x/trunk/testing/itest/domains/interfaces/pom.xml b/sca-java-2.x/trunk/testing/itest/domains/interfaces/pom.xml index 73ee94fef1..f6f7112a61 100644 --- a/sca-java-2.x/trunk/testing/itest/domains/interfaces/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/domains/interfaces/pom.xml @@ -46,6 +46,6 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/domains/standalone/pom.xml b/sca-java-2.x/trunk/testing/itest/domains/standalone/pom.xml index d434ce9816..ab1897793e 100644 --- a/sca-java-2.x/trunk/testing/itest/domains/standalone/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/domains/standalone/pom.xml @@ -51,7 +51,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/DynamicReplyQ/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/DynamicReplyQ/pom.xml index fac000bb9c..9c7ac27e02 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/DynamicReplyQ/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/DynamicReplyQ/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS with dynamic replyq</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/callbacks/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/callbacks/pom.xml index e7ee6b3a69..ec035111d1 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/callbacks/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/callbacks/pom.xml @@ -29,6 +29,6 @@ <name>Apache Tuscany SCA iTest JMS Tests For Callbacks</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/defaults/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/defaults/pom.xml index a1ebdf2a38..975cbc8402 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/defaults/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/defaults/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS with Defaults</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/definitions/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/definitions/pom.xml index 041b0a11bf..c90b9a8eba 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/definitions/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/definitions/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Tests For Properties</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/exceptions/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/exceptions/pom.xml index 8bb3f33174..7f6f0512e0 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/exceptions/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/exceptions/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS NonSCA Client Exceptions</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/exceptions1/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/exceptions1/pom.xml index 7cfc4cdfb3..56a18e111e 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/exceptions1/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/exceptions1/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS with Exceptions1</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/externalBroker/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/externalBroker/pom.xml index ca14525f3b..0342a115f8 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/externalBroker/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/externalBroker/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS with External JMS Broker</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytes/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytes/pom.xml index e1d3acf970..9834ac5793 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytes/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytes/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Message Format jmsbytes</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytesxml/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytesxml/pom.xml index ad7f5abd0a..9e1410860b 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytesxml/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmsbytesxml/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Message Format jmsbytesxml</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmsdefault/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmsdefault/pom.xml index 2b19a2a1ca..034b3b8422 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/format-jmsdefault/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmsdefault/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Message Format jmsdefault</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmsmessage/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmsmessage/pom.xml index 8c03593421..f1c145fe2c 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/format-jmsmessage/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmsmessage/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Message Format jmsmessage</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmsobject/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmsobject/pom.xml index 78fd4a2ff7..6b4b6cf777 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/format-jmsobject/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmsobject/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Message Format jmsobject</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmstext/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmstext/pom.xml index 6d7b1514ba..0e3a390b6d 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/format-jmstext/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmstext/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Message Format jmstext</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxml/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxml/pom.xml index 1d9730df35..b675c08cab 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxml/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxml/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Message Format jmstextxml</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml index 51b5ed7827..82c877065b 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Message Format jmstextxmlinjmsobjectout</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/non-sca-client/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/non-sca-client/pom.xml index b27ad7fb36..4df87a7b79 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/non-sca-client/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/non-sca-client/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS with Non SCA Client</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/noreplyto/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/noreplyto/pom.xml index 84a48c47a9..0cea656978 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/noreplyto/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/noreplyto/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS No replyTo</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/nulls/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/nulls/pom.xml index 65757ba29f..743f147c82 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/nulls/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/nulls/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Nulls</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/oneway-nocf/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/oneway-nocf/pom.xml index ed9140a151..8f0fbf861b 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/oneway-nocf/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/oneway-nocf/pom.xml @@ -29,6 +29,6 @@ <name>Apache Tuscany SCA iTest JMS for a oneway service</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/oneway/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/oneway/pom.xml index c5ebc91c10..f0cea616c8 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/oneway/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/oneway/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS with Oneway</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/policy-headers/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/policy-headers/pom.xml index 4a51e46671..a70769d850 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/policy-headers/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/policy-headers/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS with Policy Headers</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/properties/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/properties/pom.xml index 0876ca5437..e66d7a5baf 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/properties/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/properties/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS with Properties</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/responsecf/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/responsecf/pom.xml index 2f3af332b4..4b0d701f93 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/responsecf/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/responsecf/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Response ConnectionFactory</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/rpc/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/rpc/pom.xml index 3de74914f9..3c9effe9e2 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/rpc/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/rpc/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS with RPC</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/selectors/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/selectors/pom.xml index 4b3eee5c5d..17b7a42bc7 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/selectors/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/selectors/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Tests For Selectors</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/topics/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/topics/pom.xml index 3b9fa3022e..01f6a570c0 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/topics/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/topics/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Tests for topics</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/ttl/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/ttl/pom.xml index 4f9f9d804c..5c845d4a52 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/ttl/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/ttl/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS Time To Live</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/jms/uri-rpc/pom.xml b/sca-java-2.x/trunk/testing/itest/jms/uri-rpc/pom.xml index 87f0063b56..a30d518648 100644 --- a/sca-java-2.x/trunk/testing/itest/jms/uri-rpc/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/jms/uri-rpc/pom.xml @@ -30,6 +30,6 @@ <name>Apache Tuscany SCA iTest JMS with URI RPC</name>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/node-launcher-equinox/pom.xml b/sca-java-2.x/trunk/testing/itest/node-launcher-equinox/pom.xml index 8e80bd658c..f3c419c978 100644 --- a/sca-java-2.x/trunk/testing/itest/node-launcher-equinox/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/node-launcher-equinox/pom.xml @@ -71,6 +71,6 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/three-nodes-three-vms-test/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/three-nodes-three-vms-test/pom.xml index 337a4ba5c1..2b4e9f5e51 100644 --- a/sca-java-2.x/trunk/testing/itest/nodes/three-nodes-three-vms-test/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/nodes/three-nodes-three-vms-test/pom.xml @@ -91,7 +91,7 @@ </goals> <configuration> <tasks unless="maven.test.skip"> - <property name="tuscany.version" value="${version}" /> + <property name="tuscany.version" value="${project.version}" /> <property name="runtime_classpath" refid="maven.runtime.classpath"/> <ant antfile="./build.xml" target="run"/> </tasks> diff --git a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml index 8f5a4d3ed8..50ca875f98 100644 --- a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml @@ -96,7 +96,7 @@ </goals>
<configuration>
<tasks unless="maven.test.skip">
- <property name="tuscany.version" value="${version}" />
+ <property name="tuscany.version" value="${project.version}" />
<property name="runtime_classpath" refid="maven.runtime.classpath"/>
<ant antfile="./build.xml" target="run"/>
</tasks>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/pom.xml index 2f80274c47..6380733e6d 100644 --- a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-test/pom.xml @@ -91,7 +91,7 @@ </goals> <configuration> <tasks unless="maven.test.skip"> - <property name="tuscany.version" value="${version}" /> + <property name="tuscany.version" value="${project.version}" /> <property name="runtime_classpath" refid="maven.runtime.classpath"/> <ant antfile="./build.xml" target="run"/> </tasks> diff --git a/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml index 318942d21f..53758ef427 100644 --- a/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml @@ -47,6 +47,6 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> diff --git a/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml index 73526d0200..2e04d32802 100644 --- a/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml @@ -59,6 +59,6 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> diff --git a/sca-java-2.x/trunk/testing/itest/recursive-ws/pom.xml b/sca-java-2.x/trunk/testing/itest/recursive-ws/pom.xml index 46eeeafb18..667abb5864 100644 --- a/sca-java-2.x/trunk/testing/itest/recursive-ws/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/recursive-ws/pom.xml @@ -33,40 +33,40 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-api</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-impl</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-interface-wsdl</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-databinding-axiom</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> <scope>runtime</scope> </dependency> </dependencies> diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api-osgi/pom.xml b/sca-java-2.x/trunk/testing/itest/scaclient-api-osgi/pom.xml index b75879bcad..0c29c06c97 100644 --- a/sca-java-2.x/trunk/testing/itest/scaclient-api-osgi/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/scaclient-api-osgi/pom.xml @@ -52,7 +52,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <artifactId>maven-eclipse-plugin</artifactId> @@ -90,7 +90,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> </dependencies> <executions> diff --git a/sca-java-2.x/trunk/testing/itest/spi/pom.xml b/sca-java-2.x/trunk/testing/itest/spi/pom.xml index 0a12e2c292..73d33aa041 100644 --- a/sca-java-2.x/trunk/testing/itest/spi/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/spi/pom.xml @@ -55,7 +55,7 @@ </goals>
<configuration>
<tasks unless="maven.test.skip">
- <property name="tuscany.version" value="${version}" />
+ <property name="tuscany.version" value="${project.version}" />
<property name="runtime_classpath" refid="maven.runtime.classpath"/>
<ant antfile="./build.xml" target="run"/>
</tasks>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml index 05be037e27..c328a9dc1e 100644 --- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml @@ -53,7 +53,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml index 7fa5daf66e..892976cd12 100644 --- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml @@ -53,7 +53,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml index 915b17e1fe..d92d8d6fcf 100644 --- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml @@ -53,7 +53,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml index d00b8168d2..0bd8a2f4e1 100644 --- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml @@ -35,7 +35,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> <plugins> <plugin> diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml index 2ed9ff1742..dc08db9fac 100644 --- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml @@ -53,7 +53,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> diff --git a/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml index dbf22ae810..399559fc02 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml @@ -58,6 +58,6 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml index ad26d7cac5..c30e5c00ea 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml @@ -53,7 +53,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml index 24c4982f6b..149151f638 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml @@ -53,7 +53,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml index 3e4afac711..af21f0e0dd 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml @@ -53,7 +53,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml index 44e9465e3b..4fa4b2a6a3 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml @@ -53,7 +53,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml index fd0d1aa7ee..abc005a413 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml @@ -53,7 +53,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml index 681230b82a..59e95a35b4 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml @@ -53,7 +53,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml index ee9ebe2dd2..2f5ad0e4bf 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml @@ -53,7 +53,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml index ca6a18d3d4..c71cb76b69 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml @@ -53,7 +53,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml index 5d56c5cae3..10bfadb083 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml @@ -53,7 +53,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml index fc9c228371..36a664af94 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml @@ -53,6 +53,6 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> diff --git a/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml index 095a20f797..3895a742dc 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml @@ -59,6 +59,6 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> diff --git a/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml index d2c922e8aa..24a38b1ac0 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml @@ -53,6 +53,6 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> diff --git a/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml index 457ed42035..a4c0851e08 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml @@ -42,7 +42,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml index cf161681ba..aea326ef4d 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml @@ -35,7 +35,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml index e26b81edfb..39994fa28f 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml @@ -111,7 +111,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml index 0fd407ec66..cb3880d575 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml @@ -53,6 +53,6 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> diff --git a/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml index 9458ba7f0b..6b72686395 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml @@ -65,7 +65,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml index 0f3c126281..72a732f8e6 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml @@ -52,7 +52,7 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml index 75ce482a4b..4c303c596b 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml @@ -53,6 +53,6 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/pom.xml b/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/pom.xml index c25184e295..a81b2497e4 100644 --- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/pom.xml +++ b/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-add/pom.xml @@ -61,7 +61,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/pom.xml b/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/pom.xml index 63c2220108..daa747bcf2 100644 --- a/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/pom.xml +++ b/sca-java-2.x/trunk/unreleased/samples/domain/distributed-calculator/contribution-calculator/pom.xml @@ -61,7 +61,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
diff --git a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/pom.xml b/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/pom.xml index 15834ce073..cf996d32a8 100644 --- a/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/pom.xml +++ b/sca-java-2.x/trunk/unreleased/samples/implementation-sample-async/pom.xml @@ -65,6 +65,6 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/pom.xml b/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/pom.xml index b1f8e5c15c..fc003d991c 100644 --- a/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/pom.xml +++ b/sca-java-2.x/trunk/unreleased/samples/launcher-embedded-jse-spec/pom.xml @@ -74,7 +74,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
diff --git a/sca-java-2.x/trunk/unreleased/samples/reporting/pom.xml b/sca-java-2.x/trunk/unreleased/samples/reporting/pom.xml index 103734b9f7..1c82f4be5a 100644 --- a/sca-java-2.x/trunk/unreleased/samples/reporting/pom.xml +++ b/sca-java-2.x/trunk/unreleased/samples/reporting/pom.xml @@ -85,7 +85,7 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
|