svn commit: r1721645 - in /axis/axis2/java/rampart/branches/1_6/modules/rampart-samples: basic/build.xml src/test/java/org/apache/rampart/samples/runner/SampleTest.java

[veithen]

Author: veithen
Date: Thu Dec 24 17:06:06 2015
New Revision: 1721645

URL: http://svn.apache.org/viewvc?rev=1721645&view=rev
Log:
Also execute the basic configuration samples (which only exist on the 1.6 
branch).

Modified:
    axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml
    
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java

Modified: 
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml?rev=1721645&r1=1721644&r2=1721645&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml 
(original)
+++ 
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml 
Thu Dec 24 17:06:06 2015
@@ -17,11 +17,12 @@
  !-->
 <project basedir="." default="clean">
 
-       <property name="service.repos.dir" value="build/service_repositories"/>
-       <property name="client.repos.dir" value="build/client_repositories"/>
-       <property name="temp.dir" value="build/temp"/>
+       <property name="build.dir" value="build"/>
+       <property name="service.repos.dir" 
value="${build.dir}/service_repositories"/>
+       <property name="client.repos.dir" 
value="${build.dir}/client_repositories"/>
+       <property name="temp.dir" value="${build.dir}/temp"/>
        <property name="keys.dir" value="../keys"/>
-       <property name="temp.client.dir" value="build/temp_client"/>
+       <property name="temp.client.dir" value="${build.dir}/temp_client"/>
        
        <property name="client.port" value="8080"/>
        <property name="server.port" value="8080"/>
@@ -155,7 +156,7 @@
        
        
        <target name="clean">
-               <delete dir="build" />
+               <delete dir="${build.dir}" />
        </target>
        
        <!-- Macro to create a service repo for a given sample -->
@@ -182,7 +183,7 @@
                        <mkdir dir="${temp.dir}/META-INF"/>
                        
                        <!-- Compile service -->
-            <javac srcdir="sample@{sample.number}/src" destdir="${temp.dir}">
+            <javac srcdir="sample@{sample.number}/src" destdir="${temp.dir}" 
failonerror="true">
                     <classpath>
                             <fileset dir="${lib.dir}">
                                     <include name="**/*.jar"/>

Modified: 
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java?rev=1721645&r1=1721644&r2=1721645&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
 Thu Dec 24 17:06:06 2015
@@ -38,6 +38,17 @@ public class SampleTest extends TestCase
 
     public static TestSuite suite() {
         TestSuite suite = new TestSuite();
+        suite.addTest(new SampleTest("basic", "01"));
+        suite.addTest(new SampleTest("basic", "02"));
+        suite.addTest(new SampleTest("basic", "03"));
+        suite.addTest(new SampleTest("basic", "04"));
+        suite.addTest(new SampleTest("basic", "05"));
+        suite.addTest(new SampleTest("basic", "06"));
+        suite.addTest(new SampleTest("basic", "07"));
+        suite.addTest(new SampleTest("basic", "08"));
+        suite.addTest(new SampleTest("basic", "09"));
+        suite.addTest(new SampleTest("basic", "10"));
+        suite.addTest(new SampleTest("basic", "11"));
         // TODO: failing
 //        suite.addTest(new SampleTest("policy", "01"));
         suite.addTest(new SampleTest("policy", "02"));