From 161c5c34e4a3c6999578c833add2f60e2494dbb3 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 5 Feb 2011 13:42:26 +0000
Subject: 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
---
 .../testing/compliance-tests/assembly/pom.xml      |  2 +-
 .../testing/compliance-tests/binding-jms/pom.xml   |  2 +-
 .../testing/compliance-tests/binding-ws/pom.xml    |  2 +-
 .../testing/compliance-tests/java-caa/pom.xml      |  2 +-
 .../trunk/testing/compliance-tests/java-ci/pom.xml |  2 +-
 .../trunk/testing/compliance-tests/policy/pom.xml  |  2 +-
 .../itest/bpel/helloworld-reference/pom.xml        |  2 +-
 .../trunk/testing/itest/bpel/helloworld-ws/pom.xml |  2 +-
 .../trunk/testing/itest/bpel/helloworld/pom.xml    | 42 ++--------------------
 sca-java-2.x/trunk/testing/itest/builder/pom.xml   |  2 +-
 .../itest/distribution/bin-distro-unzip/pom.xml    |  4 +--
 .../pom.xml                                        |  2 +-
 .../contribution-binding-rmi-calculator/pom.xml    |  2 +-
 .../contribution-binding-sca-calculator/pom.xml    |  2 +-
 .../contribution-binding-ws-calculator/pom.xml     |  2 +-
 .../pom.xml                                        |  2 +-
 .../distribution/launcher-embedded-jse/pom.xml     |  2 +-
 .../distribution/launcher-embedded-osgi/pom.xml    |  2 +-
 .../itest/distribution/src-distro-unzip/pom.xml    |  4 +--
 .../testing/itest/domains/distributed/pom.xml      |  2 +-
 .../trunk/testing/itest/domains/helloworld/pom.xml |  2 +-
 .../trunk/testing/itest/domains/interfaces/pom.xml |  2 +-
 .../trunk/testing/itest/domains/standalone/pom.xml |  2 +-
 .../trunk/testing/itest/jms/DynamicReplyQ/pom.xml  |  2 +-
 .../trunk/testing/itest/jms/callbacks/pom.xml      |  2 +-
 .../trunk/testing/itest/jms/defaults/pom.xml       |  2 +-
 .../trunk/testing/itest/jms/definitions/pom.xml    |  2 +-
 .../trunk/testing/itest/jms/exceptions/pom.xml     |  2 +-
 .../trunk/testing/itest/jms/exceptions1/pom.xml    |  2 +-
 .../trunk/testing/itest/jms/externalBroker/pom.xml |  2 +-
 .../testing/itest/jms/format-jmsbytes/pom.xml      |  2 +-
 .../testing/itest/jms/format-jmsbytesxml/pom.xml   |  2 +-
 .../testing/itest/jms/format-jmsdefault/pom.xml    |  2 +-
 .../testing/itest/jms/format-jmsmessage/pom.xml    |  2 +-
 .../testing/itest/jms/format-jmsobject/pom.xml     |  2 +-
 .../trunk/testing/itest/jms/format-jmstext/pom.xml |  2 +-
 .../testing/itest/jms/format-jmstextxml/pom.xml    |  2 +-
 .../jms/format-jmstextxmlinjmsobjectout/pom.xml    |  2 +-
 .../trunk/testing/itest/jms/non-sca-client/pom.xml |  2 +-
 .../trunk/testing/itest/jms/noreplyto/pom.xml      |  2 +-
 sca-java-2.x/trunk/testing/itest/jms/nulls/pom.xml |  2 +-
 .../trunk/testing/itest/jms/oneway-nocf/pom.xml    |  2 +-
 .../trunk/testing/itest/jms/oneway/pom.xml         |  2 +-
 .../trunk/testing/itest/jms/policy-headers/pom.xml |  2 +-
 .../trunk/testing/itest/jms/properties/pom.xml     |  2 +-
 .../trunk/testing/itest/jms/responsecf/pom.xml     |  2 +-
 sca-java-2.x/trunk/testing/itest/jms/rpc/pom.xml   |  2 +-
 .../trunk/testing/itest/jms/selectors/pom.xml      |  2 +-
 .../trunk/testing/itest/jms/topics/pom.xml         |  2 +-
 sca-java-2.x/trunk/testing/itest/jms/ttl/pom.xml   |  2 +-
 .../trunk/testing/itest/jms/uri-rpc/pom.xml        |  2 +-
 .../testing/itest/node-launcher-equinox/pom.xml    |  2 +-
 .../itest/nodes/three-nodes-three-vms-test/pom.xml |  2 +-
 .../nodes/two-nodes-two-vms-hazelcast/pom.xml      |  2 +-
 .../itest/nodes/two-nodes-two-vms-test/pom.xml     |  2 +-
 .../trunk/testing/itest/policy/matching/pom.xml    |  2 +-
 .../trunk/testing/itest/policy/wspolicy/pom.xml    |  2 +-
 .../trunk/testing/itest/recursive-ws/pom.xml       | 12 +++----
 .../trunk/testing/itest/scaclient-api-osgi/pom.xml |  4 +--
 sca-java-2.x/trunk/testing/itest/spi/pom.xml       |  2 +-
 .../itest/ws-jaxws/contribution-java-first/pom.xml |  2 +-
 .../itest/ws-jaxws/contribution-wsdl-first/pom.xml |  2 +-
 .../testing/itest/ws-jaxws/external-client/pom.xml |  2 +-
 .../itest/ws-jaxws/external-service/pom.xml        |  2 +-
 .../testing/itest/ws-jaxws/launcher-ri/pom.xml     |  2 +-
 .../testing/itest/ws/authentication-basic/pom.xml  |  2 +-
 .../ws/contribution-callback-forwardspec/pom.xml   |  2 +-
 .../ws/contribution-callback-fullspec/pom.xml      |  2 +-
 .../ws/contribution-callback-promotion/pom.xml     |  2 +-
 .../testing/itest/ws/contribution-callback/pom.xml |  2 +-
 .../itest/ws/contribution-doc-lit-wrapped/pom.xml  |  2 +-
 .../testing/itest/ws/contribution-doc-lit/pom.xml  |  2 +-
 .../itest/ws/contribution-java-first/pom.xml       |  2 +-
 .../testing/itest/ws/contribution-rpc-lit/pom.xml  |  2 +-
 .../itest/ws/contribution-wsdl-first/pom.xml       |  2 +-
 .../trunk/testing/itest/ws/defaults/pom.xml        |  2 +-
 .../testing/itest/ws/endpoint-references/pom.xml   |  2 +-
 .../trunk/testing/itest/ws/endpoints/pom.xml       |  2 +-
 .../trunk/testing/itest/ws/external-client/pom.xml |  2 +-
 .../testing/itest/ws/external-service/pom.xml      |  2 +-
 .../ws/holder-ws-service-multiple-outputs/pom.xml  |  2 +-
 .../trunk/testing/itest/ws/http-ssl/pom.xml        |  2 +-
 .../trunk/testing/itest/ws/launcher-axis2/pom.xml  |  2 +-
 .../trunk/testing/itest/ws/launcher-base/pom.xml   |  2 +-
 sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml   |  2 +-
 85 files changed, 94 insertions(+), 132 deletions(-)

(limited to 'sca-java-2.x/trunk/testing')

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>
-- 
cgit v1.2.3