Catch up with sample changes

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@945553 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 17 insertions, 28 deletions

diff --git a/sca-java-2.x/trunk/itest/distribution/calculator-equinox/build.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml
index c12e545753..de8ea977a9 100644
--- a/sca-java-2.x/trunk/itest/distribution/calculator-equinox/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml
@@ -18,6 +18,7 @@
 -->
 <project name="itest-samples" default="run"> 
 	
+	<echo>${java.home}</echo>
 	<!-- 
 	    compile and run each sample as though the user were running
 	    samples from the binary distribution. Here we use ant targets
@@ -30,9 +31,10 @@
     <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" />
 
     <target name="run"> 
-        <ant antfile="build.xml" 
-             target="run-equinox"
-             dir="${distro.root}/samples/calculator-equinox"/>  	
+    	
+        <ant antfile="build.xml"
+             dir="${distro.root}/samples/contribution-binding-ws-calculator"/>
+
     </target>
 
 </project>
diff --git a/sca-java-2.x/trunk/itest/distribution/calculator-equinox/pom.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/pom.xml
index d29f3cd513..c598f122e0 100644
--- a/sca-java-2.x/trunk/itest/distribution/calculator-equinox/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>itest-distribution-calculator-equinox</artifactId>
-    <name>Apache Tuscany SCA iTest Distribution calculator-equinox</name>
+    <artifactId>itest-distribution-contribution-binding-ws-calculator</artifactId>
+    <name>Apache Tuscany SCA iTest Distribution Contribution binding-ws Calculator</name>
 
     <profiles>
         <profile>
@@ -56,6 +56,7 @@
                         </goals>
                         <configuration>
                             <tasks> 
+                                <property name="java.home" value="${java.home}"/>
                                 <property name="tuscany.version" value="${version}" />
                                 <ant antfile="./build.xml" target="run"/>
                             </tasks>
@@ -63,21 +64,6 @@
                     </execution>
                 </executions>
             </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.5</version>
-                    <configuration>
-                        <includes>
-                            <include>**/*TestCase.java</include>
-                        </includes>
-                        <reportFormat>brief</reportFormat>
-                        <useFile>false</useFile>
-                        <forkMode>once</forkMode>
-                        <argLine>-ea -Xmx256m</argLine>
-                        <parallel>off</parallel>
-                    </configuration>
-                </plugin>
         </plugins>
     </build>
 </project>
diff --git a/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml
index aa5811e6da..4bf0367397 100644
--- a/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml
+++ b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml
@@ -33,7 +33,7 @@
     <target name="run"> 
     	
         <ant antfile="build.xml"
-             dir="${distro.root}/samples/binding-ws-calculator"/>
+             dir="${distro.root}/samples/launcher-embedded-jse"/>
 
     </target>
 
diff --git a/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/pom.xml
index 907bc69399..93bd2e3327 100644
--- a/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/pom.xml
@@ -25,8 +25,8 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>itest-distribution-binding-ws-calculator</artifactId>
-    <name>Apache Tuscany SCA iTest Distribution binding-ws-calculator</name>
+    <artifactId>itest-distribution-launcher-embedded-jse</artifactId>
+    <name>Apache Tuscany SCA iTest Distribution Launcher Embedded JSE</name>
 
     <profiles>
         <profile>
diff --git a/sca-java-2.x/trunk/itest/distribution/pom.xml b/sca-java-2.x/trunk/itest/distribution/pom.xml
index c1183aa45b..b164a4e765 100644
--- a/sca-java-2.x/trunk/itest/distribution/pom.xml
+++ b/sca-java-2.x/trunk/itest/distribution/pom.xml
@@ -55,15 +55,16 @@
     </profiles>
 
     <modules>
-        <module>implementation-java-calculator</module>
         <module>legal-checks</module>
-        <!-- comment out during sample re-org
-        <module>binding-ws-calculator</module>
-        -->
+        <module>contribution-binding-ws-calculator</module>
+        <module>launcher-embedded-jse</module>
+
+
+        <!--module>implementation-java-calculator</module-->
+
 <!--
         <module>calculator-rmi</module>
 -->
-        <module>calculator-equinox</module>
     </modules>
 
     <build>