river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcost...@apache.org
Subject svn commit: r821549 - in /incubator/river/jtsk/trunk: build.xml common.xml qa/build.xml qa/jtreg/ test/
Date Sun, 04 Oct 2009 16:00:48 GMT
Author: jcosters
Date: Sun Oct  4 16:00:48 2009
New Revision: 821549

URL: http://svn.apache.org/viewvc?rev=821549&view=rev
Log:
RIVER-317:
- fixed deploy-artifacts target in build.xml, after earlier move of poms 
- changed version in commons.xml to 2.2-SNAPSHOT
RIVER-301:
- various small fixes to build.xml
- added support for building and running contributed JUnit test, and generating XML reports
- created macro for jarwrapper in commons.xml and applied in build.xml
- created one reference fileset for distribution packaging (one for -src and one for -bin, to be used by both zip and tar tasks)
- add more QA test categories to run by qa.run target in build.xml
RIVER-304: modified jtreg integration a bit to be more robust (i.e. move libs back even if tests fail)

Modified:
    incubator/river/jtsk/trunk/build.xml
    incubator/river/jtsk/trunk/common.xml
    incubator/river/jtsk/trunk/qa/build.xml
    incubator/river/jtsk/trunk/qa/jtreg/   (props changed)
    incubator/river/jtsk/trunk/test/   (props changed)

Modified: incubator/river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/build.xml?rev=821549&r1=821548&r2=821549&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/build.xml (original)
+++ incubator/river/jtsk/trunk/build.xml Sun Oct  4 16:00:48 2009
@@ -54,197 +54,144 @@
 		depends="start.copy-resources, tools.copy-resources">
     </target>
 
-    <target name="release" description="Create a release"
+    <target name="release" description="Create source and binary release packages"
 		depends="release-src, release-bin">
     </target>
 
+    <fileset id="river.bin.files" dir="${basedir}">
+        <include name="index.html"/>
+        <include name="DISCLAIMER"/>
+        <include name="LICENSE"/>
+        <include name="NOTICE"/>
+        <include name="${doc}/arch2_0.html"/>
+        <include name="${doc}/info-index.html"/>
+        <include name="${doc}/manpages-index.html"/>
+        <include name="${doc}/proxypreparation.pdf"/>
+        <include name="${doc}/release-notes/**"/>
+        <exclude name="${doc}/release-notes/new.html"/>
+        <include name="${doc}/simpleproxyverification.pdf"/>
+        <include name="${doc}/smartproxyverification.pdf"/>
+        <include name="${doc}/spec-index.html"/>
+        <include name="${doc}/specs/**"/>
+        <include name="${doc.api}/**"/>
+        <include name="${lib}/**"/>
+        <include name="${lib-dl}/**"/>
+        <include name="${lib-ext}/**"/>
+        <include name="${configentry}/**"/>
+        <include name="tools/**"/>
+    </fileset>
+
+    <fileset id="examples.bin.files" dir="${basedir}/examples">
+        <include name="**/${lib}/**"/>
+        <include name="**/config/**"/>
+        <exclude name="**/config/META-INF/"/>
+        <include name="**/prebuiltkeys/**"/>
+        <include name="**/scripts/*.bat"/>
+        <include name="**/${doc}/**"/>
+        <include name="**/*.html"/>
+    </fileset>
+    
+    <fileset id="examples.bin.exec.files" dir="${basedir}/examples">
+        <include name="**/scripts/*.sh"/>
+    </fileset>
+
+    <!-- TODO create separate bin distribution for the qa tests? -->
+    <!--<fileset id="qa.bin.files" dir="${basedir}/qa">
+        <include name="${lib}/**"/>
+        <include name="${lib-ext}/**"/>
+        <include name="${doc}/**"/>
+        <include name="harness/**"/>
+        <include name="README.txt"/>
+    </fileset>-->
+
     <target name="release-bin" description="Create a binary release"
 		depends="all.build">
         <mkdir dir="${dist.dir}"/>
         <delete file="${bin.zip.bundle}"/>
         <zip destfile="${bin.zip.bundle}" roundup="yes">
-            <zipfileset dir="${basedir}" prefix="${product.name}">
-                <include name="index.html"/>
-                <include name="DISCLAIMER"/>
-                <include name="LICENSE"/>
-                <include name="NOTICE"/>
-                <include name="${doc}/arch2_0.html"/>
-                <include name="${doc}/info-index.html"/>
-                <include name="${doc}/manpages-index.html"/>
-                <include name="${doc}/proxypreparation.pdf"/>
-                <include name="${doc}/release-notes/**"/>
-                <exclude name="${doc}/release-notes/new.html"/>
-                <include name="${doc}/simpleproxyverification.pdf"/>
-                <include name="${doc}/smartproxyverification.pdf"/>
-                <include name="${doc}/spec-index.html"/>
-                <include name="${doc}/specs/**"/>
-                <include name="${doc.api}/**"/>
-                <include name="${lib}/**"/>
-                <include name="${lib-dl}/**"/>
-                <include name="${lib-ext}/**"/>
-                <include name="${configentry}/**"/>
-                <include name="tools/**"/>
-            </zipfileset>
-            <zipfileset dir="${basedir}/examples" prefix="${product.name}/examples">
-                <include name="**/${lib}/**"/>
-                <include name="**/config/**"/>
-                <exclude name="**/config/META-INF/"/>
-                <include name="**/prebuiltkeys/**"/>
-                <include name="**/scripts/**"/>
-                <include name="**/${doc}/**"/>
-                <include name="**/*.html"/>
-            </zipfileset>
-            <zipfileset dir="${basedir}/examples"
-				    prefix="${product.name}/examples"
-				    includes="**/*.sh"
-				    filemode="755"/>
-            <!-- TODO create separate bin distribution for the qa tests -->
-            <!--<zipfileset dir="${basedir}/qa" prefix="${product.name}/qa">
-                <include name="${lib}/**"/>
-                <include name="${lib-ext}/**"/>
-                <include name="${doc}/**"/>
-                <include name="harness/**"/>
-                <include name="README.txt"/>
-            </zipfileset>-->
+            <zipfileset prefix="${product.name}" refid="river.bin.files" />
+            <zipfileset prefix="${product.name}/examples" refid="examples.bin.files" />
+            <zipfileset prefix="${product.name}/examples"
+                refid="examples.bin.exec.files" filemode="755"/>
+            <!--<zipfileset prefix="${product.name}/qa" refid="qa.bin.files" />-->
         </zip>
         <delete file="${bin.tar.bundle}"/>
         <tar destfile="${bin.tar.bundle}" compression="gzip" longfile="gnu">
-            <tarfileset dir="${basedir}" prefix="${product.name}">
-                <include name="index.html"/>
-                <include name="DISCLAIMER"/>
-                <include name="LICENSE"/>
-                <include name="NOTICE"/>
-                <include name="${doc}/arch2_0.html"/>
-                <include name="${doc}/info-index.html"/>
-                <include name="${doc}/manpages-index.html"/>
-                <include name="${doc}/proxypreparation.pdf"/>
-                <include name="${doc}/release-notes/**"/>
-                <exclude name="${doc}/release-notes/new.html"/>
-                <include name="${doc}/simpleproxyverification.pdf"/>
-                <include name="${doc}/smartproxyverification.pdf"/>
-                <include name="${doc}/spec-index.html"/>
-                <include name="${doc}/specs/**/*"/>
-                <include name="${doc.api}/**"/>
-                <include name="${lib}/**"/>
-                <include name="${lib-dl}/**"/>
-                <include name="${lib-ext}/**"/>
-                <include name="${configentry}/**"/>
-                <include name="tools/**"/>
-            </tarfileset>
-            <tarfileset dir="${basedir}/examples" prefix="${product.name}/examples">
-                <include name="**/${lib}/**"/>
-                <include name="**/config/**"/>
-                <exclude name="**/config/META-INF/"/>
-                <include name="**/scripts/**"/>
-                <include name="**/${doc}/**"/>
-                <include name="**/*.html"/>
-            </tarfileset>
-            <tarfileset dir="${basedir}/examples"
-				    prefix="${product.name}/examples"
-				    includes="**/*.sh"
-				    filemode="755"/>
-            <!-- TODO create separate bin distribution for the qa tests -->
-            <!--<tarfileset dir="${basedir}/qa" prefix="${product.name}/qa">
-                <include name="${lib}/**"/>
-                <include name="${lib-ext}/**"/>
-                <include name="${doc}/**"/>
-                <include name="harness/**"/>
-                <include name="README.txt"/>
-            </tarfileset>-->
+            <tarfileset prefix="${product.name}" refid="river.bin.files" />
+            <tarfileset prefix="${product.name}/examples" refid="examples.bin.files" />
+            <tarfileset prefix="${product.name}/examples"
+                refid="examples.bin.exec.files" filemode="755"/>
+            <!--<tarfileset prefix="${product.name}/qa" refid="qa.bin.files" />-->
         </tar>
     </target>
 
+    <fileset id="river.src.files" dir="${basedir}">
+        <include name="index.html"/>
+        <include name="build.xml"/>
+        <include name="common.xml"/>
+        <include name="DISCLAIMER"/>
+        <include name="LICENSE"/>
+        <include name="NOTICE"/>
+        <include name="${doc}/info-index.html"/>
+        <include name="${doc}/build.html"/>
+        <include name="${doc}/j2se/**"/>
+        <include name="${doc}/manpages-index.html"/>
+        <include name="${doc}/proxypreparation.pdf"/>
+        <include name="${doc}/release-notes/**"/>
+        <exclude name="${doc}/release-notes/new.html"/>
+        <include name="${doc}/simpleproxyverification.pdf"/>
+        <include name="${doc}/smartproxyverification.pdf"/>
+        <include name="${doc}/spec-index.html"/>
+        <include name="${doc}/specs/html/**"/>
+        <include name="${src}/**"/>
+        <exclude name="${src}/**/*.sh"/>
+        <include name="tools/**"/>
+        <include name="${poms}/**"/>
+        <include name="${test.src}/**"/>
+        <include name="${test.lib}/**"/>
+    </fileset>
+
+    <fileset id="examples.src.files" dir="${basedir}/examples">
+        <include name="**"/>
+        <exclude name="**/${lib}/"/>
+        <exclude name="**/${build}/"/>
+        <exclude name="**/prebuiltkeys/"/>
+        <exclude name="**/${doc}/"/>
+    </fileset>
+
+    <fileset id="examples.src.exec.files" dir="${basedir}/examples">
+        <include name="**/scripts/*.sh"/>
+    </fileset>
+
+    <fileset id="qa.src.files" dir="${basedir}/qa">
+        <include name="${src}/**"/>
+        <include name="harness/**"/>
+        <include name="jtreg/**"/>
+        <exclude name="jtreg/JT*"/>
+        <include name="${doc}/**"/>
+        <exclude name="${doc.api}/"/>
+        <include name="build.xml"/>
+        <include name="README*.txt"/>
+    </fileset>
+
     <target name="release-src" description="Create a source release">
         <mkdir dir="${dist.dir}"/>
         <delete file="${src.zip.bundle}"/>
         <zip destfile="${src.zip.bundle}" roundup="yes">
-            <zipfileset dir="${basedir}" prefix="${product.name}" >
-                <include name="index.html"/>
-                <include name="build.xml"/>
-                <include name="common.xml"/>
-                <include name="DISCLAIMER"/>
-                <include name="LICENSE"/>
-                <include name="NOTICE"/>
-                <include name="${doc}/info-index.html"/>
-                <include name="${doc}/build.html"/>
-                <include name="${doc}/j2se/**"/>
-                <include name="${doc}/manpages-index.html"/>
-                <include name="${doc}/proxypreparation.pdf"/>
-                <include name="${doc}/release-notes/**"/>
-                <exclude name="${doc}/release-notes/new.html"/>
-                <include name="${doc}/simpleproxyverification.pdf"/>
-                <include name="${doc}/smartproxyverification.pdf"/>
-                <include name="${doc}/spec-index.html"/>
-                <include name="${doc}/specs/html/**"/>
-                <include name="${src}/**"/>
-                <exclude name="${src}/**/*.sh"/>
-                <include name="tools/**"/>
-            </zipfileset>
-            <zipfileset dir="${basedir}/examples" prefix="${product.name}/examples">
-                <include name="**"/>
-                <exclude name="**/${lib}/"/>
-                <exclude name="**/${build}/"/>
-                <exclude name="**/prebuiltkeys/"/>
-                <exclude name="**/${doc}/"/>
-            </zipfileset>
-            <zipfileset dir="${basedir}/examples"
-				    prefix="${product.name}/examples"
-				    includes="**/*.sh"
-				    filemode="755"/>
-            <zipfileset dir="${basedir}/qa" prefix="${product.name}/qa">
-                <include name="${src}/**"/>
-                <include name="harness/**"/>
-                <include name="jtreg/**"/>
-                <include name="${doc}/**"/>
-                <exclude name="${doc.api}/"/>
-                <include name="build.xml"/>
-                <include name="README.txt"/>
-            </zipfileset>
+            <zipfileset prefix="${product.name}" refid="river.src.files"/>
+            <zipfileset prefix="${product.name}/examples" refid="examples.src.files"/>
+            <zipfileset prefix="${product.name}/examples"
+                    refid="examples.src.exec.files" filemode="755"/>
+            <zipfileset prefix="${product.name}/qa" refid="qa.src.files" />
         </zip>
         <delete file="${src.tar.bundle}"/>
         <tar destfile="${src.tar.bundle}" compression="gzip" longfile="gnu">
-            <tarfileset dir="${basedir}" prefix="${product.name}">
-                <include name="index.html"/>
-                <include name="build.xml"/>
-                <include name="common.xml"/>
-                <include name="DISCLAIMER"/>
-                <include name="LICENSE"/>
-                <include name="NOTICE"/>
-                <include name="${doc}/arch2_0.html"/>
-                <include name="${doc}/build.html"/>
-                <include name="${doc}/info-index.html"/>
-                <include name="${doc}/j2se/**"/>
-                <include name="${doc}/manpages-index.html"/>
-                <include name="${doc}/proxypreparation.pdf"/>
-                <include name="${doc}/release-notes/**"/>
-                <exclude name="${doc}/release-notes/new.html"/>
-                <include name="${doc}/simpleproxyverification.pdf"/>
-                <include name="${doc}/smartproxyverification.pdf"/>
-                <include name="${doc}/spec-index.html"/>
-                <include name="${doc}/specs/html/**"/>
-                <include name="${src}/**"/>
-                <include name="tools/**"/>
-            </tarfileset>
-            <tarfileset dir="${basedir}/examples" prefix="${product.name}/examples">
-                <include name="**"/>
-                <exclude name="**/${lib}/"/>
-                <exclude name="**/${build}/"/>
-                <exclude name="**/prebuiltkeys/"/>
-                <exclude name="**/${doc}/"/>
-            </tarfileset>
-            <tarfileset dir="${basedir}/examples"
-				    prefix="${product.name}/examples"
-				    includes="**/*.sh"
-				    filemode="755"/>
-            <tarfileset dir="${basedir}/qa" prefix="${product.name}/qa">
-                <include name="${src}/**"/>
-                <include name="harness/**"/>
-                <include name="jtreg/**"/>
-                <include name="${doc}/**"/>
-                <exclude name="${doc.api}/"/>
-                <include name="build.xml"/>
-                <include name="README.txt"/>
-            </tarfileset>
+            <tarfileset prefix="${product.name}" refid="river.src.files" />
+            <tarfileset prefix="${product.name}/examples"
+                    refid="examples.src.files" />
+            <tarfileset prefix="${product.name}/examples"
+                    refid="examples.src.exec.files" filemode="755"/>
+            <tarfileset prefix="${product.name}/qa" refid="qa.src.files" />
         </tar>
     </target>
 
@@ -497,7 +444,6 @@
         <delete dir="${configentry.dir}" quiet="true"/>
         <delete dir="${doc.api.dir}" quiet="true"/>
         <delete dir="${doc.spec.api.dir}" quiet="true"/>
-        <delete dir="${src.dir}/com/sun/jini/example/hello/lib"	quiet="true"/>
     </target>
 
     <target name="clean-dist"
@@ -514,6 +460,7 @@
 
     <target name="toolswrappers.jars" description="Generate tools JARS"
 		depends="tools.jar,
+             jarwrapper.jar,
 			 checkconfigurationfile.jar,
 			 checkser.jar,
 			 classdep.jar,
@@ -521,117 +468,98 @@
 			 computedigest.jar,
 			 computehttpmdcodebase.jar,
 			 jsk-debug-policy.jar,
-			 jarwrapper.jar,
 			 preferredlistgen.jar,
 			 envcheck.jar">
     </target>
 
     <target name="checkconfigurationfile.jar"
-		depends="tools.jar,start.jar">
+		depends="jarwrapper.jar,start.jar">
         <delete file="${lib.dir}/checkconfigurationfile.jar" quiet="true"/>
-        <java classname="com.sun.jini.tool.JarWrapper"
-		      classpath="${build.classes.dir}"
-		      failonerror="true">
+        <jarwrapper>
             <arg value="-manifest=${src.manifest.dir}/checkconfigurationfile.mf"/>
             <arg path="${lib.dir}/checkconfigurationfile.jar"/>
             <arg path="${lib.dir}"/>
             <arg value="tools.jar"/>
-        </java>
+        </jarwrapper>
     </target>
 
-    <target name="checkser.jar"	depends="tools.jar">
+    <target name="checkser.jar"	depends="jarwrapper.jar">
         <delete file="${lib.dir}/checkser.jar" quiet="true"/>
-        <java classname="com.sun.jini.tool.JarWrapper"
-		      classpath="${build.classes.dir}"
-		      failonerror="true">
+        <jarwrapper>
             <arg value="-manifest=${src.manifest.dir}/checkser.mf"/>
             <arg path="${lib.dir}/checkser.jar"/>
             <arg path="${lib.dir}"/>
             <arg value="tools.jar"/>
-        </java>
+        </jarwrapper>
     </target>
 
-    <target name="classdep.jar"	depends="tools.jar">
+    <target name="classdep.jar"	depends="jarwrapper.jar">
         <delete file="${lib.dir}/classdep.jar" quiet="true"/>
-        <java classname="com.sun.jini.tool.JarWrapper"
-		      classpath="${build.classes.dir}"
-		      failonerror="true">
+        <jarwrapper>
             <arg value="-manifest=${src.manifest.dir}/classdep.mf"/>
             <arg path="${lib.dir}/classdep.jar"/>
             <arg path="${lib.dir}"/>
             <arg value="tools.jar"/>
-        </java>
+        </jarwrapper>
     </target>
 
-    <target name="classserver.jar" depends="tools.jar">
+    <target name="classserver.jar" depends="jarwrapper.jar">
         <delete file="${lib.dir}/classserver.jar" quiet="true"/>
-        <java classname="com.sun.jini.tool.JarWrapper"
-		      classpath="${build.classes.dir}"
-		      failonerror="true">
+        <jarwrapper>
             <arg path="${lib.dir}/classserver.jar"/>
             <arg path="${lib.dir}"/>
             <arg value="tools.jar"/>
-        </java>
+        </jarwrapper>
     </target>
 
-    <target name="computedigest.jar" depends="tools.jar">
+    <target name="computedigest.jar" depends="jarwrapper.jar">
         <delete file="${lib.dir}/computedigest.jar" quiet="true"/>
-        <java classname="com.sun.jini.tool.JarWrapper"
-		      classpath="${build.classes.dir}"
-		      failonerror="true">
+        <jarwrapper>
             <arg value="-manifest=${src.manifest.dir}/computedigest.mf"/>
             <arg path="${lib.dir}/computedigest.jar"/>
             <arg path="${lib.dir}"/>
             <arg value="tools.jar"/>
-        </java>
+        </jarwrapper>
     </target>
 
-    <target name="computehttpmdcodebase.jar" depends="tools.jar">
+    <target name="computehttpmdcodebase.jar" depends="jarwrapper.jar">
         <delete file="${lib.dir}/computehttpmdcodebase.jar" quiet="true"/>
-        <java classname="com.sun.jini.tool.JarWrapper"
-		      classpath="${build.classes.dir}"
-		      failonerror="true">
+        <jarwrapper>
             <arg value="-manifest=${src.manifest.dir}/computehttpmdcodebase.mf"/>
             <arg path="${lib.dir}/computehttpmdcodebase.jar"/>
             <arg path="${lib.dir}"/>
             <arg value="tools.jar"/>
-        </java>
+        </jarwrapper>
     </target>
 
     <target name="jarwrapper.jar" depends="tools.jar">
         <delete file="${lib.dir}/jarwrapper.jar" quiet="true"/>
-        <java classname="com.sun.jini.tool.JarWrapper"
-		      classpath="${build.classes.dir}"
-		      failonerror="true">
+        <jarwrapper classpathref="jarwrapper.classes.classpath">
             <arg value="-manifest=${src.manifest.dir}/jarwrapper.mf"/>
             <arg path="${lib.dir}/jarwrapper.jar"/>
             <arg path="${lib.dir}"/>
             <arg value="tools.jar"/>
-        </java>
+        </jarwrapper>
     </target>
 
-    <target name="preferredlistgen.jar" depends="tools.jar">
+    <target name="preferredlistgen.jar" depends="jarwrapper.jar">
         <delete file="${lib.dir}/preferredlistgen.jar" quiet="true"/>
-        <java classname="com.sun.jini.tool.JarWrapper"
-		      classpath="${build.classes.dir}"
-		      failonerror="true">
+        <jarwrapper>
             <arg value="-manifest=${src.manifest.dir}/preferredlistgen.mf"/>
             <arg path="${lib.dir}/preferredlistgen.jar"/>
             <arg path="${lib.dir}"/>
             <arg value="tools.jar"/>
-        </java>
+        </jarwrapper>
     </target>
 
-    <target name="envcheck.jar"	depends="tools.jar">
+    <target name="envcheck.jar"	depends="jarwrapper.jar">
         <delete file="${lib.dir}/envcheck.jar" quiet="true"/>
-        <java classname="com.sun.jini.tool.JarWrapper"
-		      classpath="${build.classes.dir}"
-		      failonerror="true">
+        <jarwrapper>
             <arg value="-manifest=${src.manifest.dir}/envcheck.mf"/>
             <arg path="${lib.dir}/envcheck.jar"/>
             <arg path="${lib.dir}"/>
             <arg value="tools.jar"/>
-        </java>
+        </jarwrapper>
         <jar destfile="${lib.dir}/envcheck.jar"
 	       update="true"
 	       index="false">
@@ -2073,11 +2001,15 @@
     <target name="qa.run" depends="" description="Run QA tests">
         <!-- Call qa subcomponent build -->
         <ant dir="qa" target="run-categories" inheritall="false">
-            <property name="run.categories" value="joinmanager"/>
+            <!-- these run OK -->
+            <property name="run.categories" value="id,loader,policyprovider,
+                locatordiscovery,activation,config,discoverymanager,
+                discoveryservice,joinmanager,url,iiop,jrmp,reliability,
+                thread"/>
         </ant>
     </target>
 
-    <target name="build" depends="configentry,jars,doc,spec-doc"/>
+    <target name="build" depends="configentry,test,jars,doc,spec-doc"/>
 
     <target name="all.build" depends="build"
             description="Build all, including subcomponents">
@@ -2087,7 +2019,7 @@
         <ant dir="examples/hello" target="build" inheritall="false" />
     </target>
 
-    <target name="all.clean" depends="clean" 
+    <target name="all.clean" depends="clean,clean-tests"
             description="Clean all, including subcomponents">
         <!-- Call qa subcomponent build -->
         <ant dir="qa" target="clean" inheritall="false" />
@@ -2122,10 +2054,11 @@
     <!-- TODO cleanup and find out where exactly to publish to -->
     <!-- Note that you need the Maven Ant tasks (http://maven.apache.org/ant-tasks/)
         installed to use this task -->
-    <target name="deploy-artifacts" depends="build">
+    <target name="deploy-artifacts" depends="jars">
         <!--<artifact:install-provider artifactId="wagon-file" version="1.0-beta-2"/>
         <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/>
         <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>-->
+        <!-- Override this in <river src distr. home>/build.properties to try out -->
         <property name="m2.repository" value="file:///home/jonathan/maven" />
         <macrodef name="deploy">
             <attribute name="file" />
@@ -2137,18 +2070,18 @@
                 </artifact:deploy>
             </sequential>
         </macrodef>
-        <artifact:pom id="parent" file="${src.poms.dir}/pom.xml" />
-        <artifact:pom id="jini-core" file="${src.poms.dir}/jini-core/pom.xml" />
-        <artifact:pom id="jini-ext" file="${src.poms.dir}/jini-ext/pom.xml" />
-        <artifact:pom id="jsk-lib" file="${src.poms.dir}/jsk-lib/pom.xml" />
-        <artifact:pom id="jsk-dl" file="${src.poms.dir}/jsk-dl/pom.xml" />
-        <artifact:pom id="jsk-resources" file="${src.poms.dir}/jsk-resources/pom.xml" />
-        <artifact:pom id="jsk-platform" file="${src.poms.dir}/jsk-platform/pom.xml" />
-        <artifact:pom id="jsk-policy" file="${src.poms.dir}/jsk-policy/pom.xml" />
-        <artifact:pom id="serviceui" file="${src.poms.dir}/serviceui/pom.xml" />
-        <artifact:pom id="sun-util" file="${src.poms.dir}/sun-util/pom.xml" />
-        <artifact:pom id="start" file="${src.poms.dir}/start/pom.xml" />
-        <artifact:pom id="tools" file="${src.poms.dir}/tools/pom.xml" />
+        <artifact:pom id="parent" file="${poms.dir}/pom.xml" />
+        <artifact:pom id="jini-core" file="${poms.dir}/jini-core/pom.xml" />
+        <artifact:pom id="jini-ext" file="${poms.dir}/jini-ext/pom.xml" />
+        <artifact:pom id="jsk-lib" file="${poms.dir}/jsk-lib/pom.xml" />
+        <artifact:pom id="jsk-dl" file="${poms.dir}/jsk-dl/pom.xml" />
+        <artifact:pom id="jsk-resources" file="${poms.dir}/jsk-resources/pom.xml" />
+        <artifact:pom id="jsk-platform" file="${poms.dir}/jsk-platform/pom.xml" />
+        <artifact:pom id="jsk-policy" file="${poms.dir}/jsk-policy/pom.xml" />
+        <artifact:pom id="serviceui" file="${poms.dir}/serviceui/pom.xml" />
+        <artifact:pom id="sun-util" file="${poms.dir}/sun-util/pom.xml" />
+        <artifact:pom id="start" file="${poms.dir}/start/pom.xml" />
+        <artifact:pom id="tools" file="${poms.dir}/tools/pom.xml" />
         <deploy file="${lib.dir}/jini-core.jar" pom="jini-core" />
         <deploy file="${lib.dir}/jini-ext.jar" pom="jini-ext" />
         <deploy file="${lib.dir}/jsk-lib.jar" pom="jsk-lib" />
@@ -2162,4 +2095,32 @@
         <deploy file="${lib.dir}/tools.jar" pom="tools" />
     </target>
 
+    <target name="prep-tests" depends="">
+        <mkdir dir="${test.classes.dir}"/>
+        <mkdir dir="${test.results.dir}"/>
+    </target>
+
+    <target name="clean-tests" depends="">
+        <delete dir="${test.classes.dir}" quiet="true"/>
+        <delete dir="${test.results.dir}" quiet="true"/>
+    </target> 
+    
+    <target name="compile-tests" depends="compile,prep-tests">
+        <javac-cmd source.dir="${test.src.dir}" dest.dir="${test.classes.dir}"
+                source="5" target="5">
+            <classpath refid="test.compile.classpath" />
+        </javac-cmd>
+    </target>
+
+    <target name="test" depends="compile-tests">
+        <junit printsummary="false">
+            <classpath refid="test.classpath"/>
+            <formatter type="brief" usefile="false"/>
+            <formatter type="xml" />
+            <batchtest todir="${test.results.dir}">
+                <fileset dir="${test.classes.dir}" includes="**/*Test.class" />
+            </batchtest>
+        </junit>
+    </target>
+
 </project>

Modified: incubator/river/jtsk/trunk/common.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/common.xml?rev=821549&r1=821548&r2=821549&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/common.xml (original)
+++ incubator/river/jtsk/trunk/common.xml Sun Oct  4 16:00:48 2009
@@ -25,14 +25,14 @@
     <property file="${root}/build.properties" />
 
     <!-- Product version info -->
-    <property name="version" value="2.1.1"/>
+    <property name="version" value="2.2-SNAPSHOT"/>
     <property name="product.name" value="apache-river-${version}-incubating"/>
     <property name="product.title" value="Apache River v${version}"/>
 
     <!-- Standard directory names -->
     <property name="doc" value="doc"/>
     <property name="src" value="src"/>
-    <property name="src.poms" value="${src}/poms"/>
+    <property name="poms" value="poms"/>
     <property name="configentry" value="configentry"/>
     <property name="lib" value="lib"/>
     <property name="lib-dl" value="lib-dl"/>
@@ -42,6 +42,11 @@
     <property name="build" value="build"/>
     <property name="build.classes" value="${build}/classes"/>
     <property name="dist" value="dist"/>
+    <property name="test" value="test"/>
+    <property name="test.src" value="${test}/src"/>
+    <property name="test.lib" value="${test}/lib"/>
+    <property name="test.classes" value="${test}/classes"/>
+    <property name="test.results" value="${test}/results"/>
 
     <!-- Standard directory locations -->
     <property name="doc.api.dir" location="${doc.api}"/>
@@ -49,7 +54,7 @@
     <property name="src.dir" location="${src}"/>
     <property name="src.manifest.dir" location="${src}/manifest"/>
     <property name="src.configentry.dir" location="${src}/configentry"/>
-    <property name="src.poms.dir" location="${src.poms}"/>
+    <property name="poms.dir" location="${poms}"/>
     <property name="build.dir" location="${build}"/>
     <property name="build.classes.dir" location="${build.classes}"/>
     <property name="build.deps.dir" location="${build.dir}/deps"/>
@@ -58,6 +63,11 @@
     <property name="lib.dir" location="${lib}"/>
     <property name="lib-dl.dir" location="${lib-dl}"/>
     <property name="lib-ext.dir" location="${lib-ext}"/>
+    <property name="test.dir" value="${test}"/>
+    <property name="test.src.dir" value="${test.src}"/>
+    <property name="test.lib.dir" value="${test.lib}"/>
+    <property name="test.classes.dir" value="${test.classes}"/>
+    <property name="test.results.dir" value="${test.results}"/>
 
     <!-- Standard javadoc options and settings -->
     <property name="jdk.doc.url" value="http://java.sun.com/j2se/1.4.2/docs/api"/>
@@ -120,6 +130,30 @@
         <path refid="classdep.jar.classpath" />
     </path>
 
+    <path id="jarwrapper.classes.classpath">
+        <path refid="river.classes"/>
+    </path>
+
+    <path id="jarwrapper.jar.classpath">
+        <pathelement location="${river.lib.dir}/jarwrapper.jar"/>
+    </path>
+
+    <path id="jarwrapper.classpath">
+        <path refid="jarwrapper.jar.classpath" />
+    </path>
+
+    <path id="test.compile.classpath">
+        <path location="${build.classes.dir}"/>
+        <fileset dir="${test.lib.dir}">
+            <include name="*.jar"/>
+        </fileset>
+    </path>
+
+    <path id="test.classpath">
+        <path location="${test.classes.dir}"/>
+        <path refid="test.compile.classpath"/>
+    </path>
+
     <property name="jre.ext.dir" location="${java.home}/lib/ext"/>
 
     <!-- Possible values for 'debug': lines,source,vars -->
@@ -130,6 +164,8 @@
         <attribute name="source.dir"/>
         <attribute name="dest.dir"/>
         <attribute name="debug" default="${debug}"/>
+        <attribute name="source" default="1.4"/>
+        <attribute name="target" default="1.4"/>
         <element name="javac-cmd-elements" implicit="true" optional="true"/>
         <sequential>
             <javac fork="yes"
@@ -138,9 +174,9 @@
                     deprecation="yes"
                     destdir="@{dest.dir}"
                     nowarn="no"
-                    source="1.4"
+                    source="@{source}"
                     srcdir="@{source.dir}"
-                    target="1.4"
+                    target="@{target}"
                     verbose="no">
                 <patternset refid="@{source.pat}"/>
                 <javac-cmd-elements/>
@@ -172,6 +208,18 @@
         </sequential>
     </macrodef>
 
+    <macrodef name="jarwrapper" description="Run JarWrapper">
+        <attribute name="classpathref" default="jarwrapper.classpath" />
+        <element name="jw-elements" implicit="yes" />
+        <sequential>
+            <java classname="com.sun.jini.tool.JarWrapper"
+                    failonerror="true">
+                <classpath refid="@{classpathref}"/>
+                <jw-elements />
+            </java>
+        </sequential>
+    </macrodef>
+
     <macrodef name="truststore">
         <attribute name="target" />
         <attribute name="dir" default="trust" />

Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=821549&r1=821548&r2=821549&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Sun Oct  4 16:00:48 2009
@@ -7,9 +7,9 @@
  ! to you under the Apache License, Version 2.0 (the
  ! "License"); you may not use this file except in compliance
  ! with the License. You may obtain a copy of the License at
- ! 
+ !
  !      http://www.apache.org/licenses/LICENSE-2.0
- ! 
+ !
  ! Unless required by applicable law or agreed to in writing, software
  ! distributed under the License is distributed on an "AS IS" BASIS,
  ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,10 +17,10 @@
  ! limitations under the License.
  !-->
 <project name="qa" basedir="." default="build" >
-    
+
     <description>This Ant scripts provides numerous tasks to build and run the
         the River QA test harness and tests</description>
-    
+
     <!-- Root of the River source distribution -->
     <property name="root" location=".." />
 
@@ -49,6 +49,17 @@
     <property name="jdk1.5.home" location="${env.JAVA_HOME}"/>
     <property name="jtlib.tmp" location="${jtreg.dir}/JTlib-tmp"/>
 
+    <!-- jtreg environment setup -->
+    <property environment="env"/>
+    <!-- location of the River jtreg tests -->
+    <property name="jtreg.dir" location="jtreg" />
+    <!-- location of the jtreg distribution, override in <river root>/build.properties -->
+    <property name="jtreg.home" location="${env.JT_HOME}" />
+    <!-- probably should rename the environment variable, to enable using the correct -->
+    <!-- jdk version for the jtreg tests which depend on jdk1.5 -->
+    <property name="jdk1.5.home" location="${env.JAVA_HOME}"/>
+    <property name="jtlib.tmp" location="${jtreg.dir}/JTlib-tmp"/>
+
     <!-- classpath for use by ClassDep in this build -->
     <path id="classdep.cp">
         <path refid="river.jars"/>
@@ -127,35 +138,42 @@
     </target>
 
     <target name="build" depends="jars,doc" />
-   
-    
-    <target name="jtreg-setup" depends="" description="Move libraries">
+
+    <target name="jtreg" depends="" description="Run jtreg tests">
+        <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
+                classpath="${jtreg.home}/lib/jtreg.jar" />
         <mkdir dir="${jtreg.dir}/JTlib-tmp" />
         <move todir="${jtreg.dir}/JTlib-tmp">
-            <filelist dir="${river.home}/lib">
+            <filelist dir="${river.lib.dir}">
                 <file name="jsk-lib.jar"/>
                 <file name="jsk-platform.jar"/>
                 <file name="jsk-resources.jar"/>
                 <file name="phoenix-init.jar"/>
-                </filelist>
+            </filelist>
         </move>
-        <move file="${river.home}/lib-ext/jsk-policy.jar" todir="${jtreg.dir}/JTlib-tmp"/>
-    </target>
-    
-    <target name="jtreg" depends="jtreg-setup" description="Run jtreg tests">
-        <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
-                classpath="${jtreg.home}/lib/jtreg.jar" />
-        <jtreg dir="${jtreg.dir}" verbose="all,nopass"
-                reportdir="${jtreg.dir}/JTreport"
-                workdir="${jtreg.dir}/JTwork"
+        <move file="${river.lib-ext.dir}/jsk-policy.jar" todir="${jtreg.dir}/JTlib-tmp"/>
+        <jtreg dir="${jtreg.dir}" verbose="all,nopass" failonerror="false"
+                errorproperty="jtreg.fail" failureproperty="jtreg.fail"
+                reportdir="${jtreg.dir}/JTreport" workdir="${jtreg.dir}/JTwork"
                 jdk="${jdk1.5.home}">
-                    <arg value="-cpa:${jtlib.tmp}/jsk-policy.jar:${jtlib.tmp}/jsk-lib.jar:${jtlib.tmp}/jsk-platform.jar:${jtlib.tmp}/jsk-resources.jar:${jtlib.tmp}/phoenix-init.jar"/>
-                    <arg value="-Djsk.home=${river.home}"/>
-                    <arg value="-Djtlib.tmp=${jtlib.tmp}"/>
-                    <arg value="-Djava.security.debug=access,failure"/>
-                    <arg value="-Djavatest.maxOutputSize=500000"/>
-                <!-- arg line="-verbose:all,nopass -workDir:${jtreg.dir}/JTwork -reportDir:${jtreg.dir}/JTreport -cpa:${jtreg.dir}/JTlib-tmp/* -Djsk.home=${river.home} -Djtreg.dir=${jtreg.dir} ${jtreg.dir}" /-->
-        </jtreg>  
+            <arg value="-cpa:${jtlib.tmp}/jsk-policy.jar:${jtlib.tmp}/jsk-lib.jar:${jtlib.tmp}/jsk-platform.jar:${jtlib.tmp}/jsk-resources.jar:${jtlib.tmp}/phoenix-init.jar"/>
+            <arg value="-Djsk.home=${river.home}"/>
+            <arg value="-Djtlib.tmp=${jtlib.tmp}"/>
+            <!--<arg value="-Djava.security.debug=access,failure"/>
+            <arg value="-Djavatest.maxOutputSize=500000"/>-->
+            <!--<arg value="net/jini/activation/Activatable/inactiveGroup" />-->
+        </jtreg>
+        <move todir="${river.lib.dir}">
+            <filelist dir="${jtreg.dir}/JTlib-tmp">
+                <file name="jsk-lib.jar"/>
+                <file name="jsk-platform.jar"/>
+                <file name="jsk-resources.jar"/>
+                <file name="phoenix-init.jar"/>
+            </filelist>
+        </move>
+        <move file="${jtreg.dir}/JTlib-tmp/jsk-policy.jar" todir="${river.lib-ext.dir}"/>
+        <delete dir="${jtreg.dir}/JTlib-tmp"/>
+        <fail if="jtreg.fail"/>
     </target>
     
     <target name="jtreg-teardown" depends="" description="Move libaries back">
@@ -174,7 +192,7 @@
     <macrodef name="testrun">
         <element name="tr-elements" optional="true" implicit="true"/>
         <sequential>
-            <java classname="com.sun.jini.qa.harness.QARunner" fork="yes">
+            <java classname="com.sun.jini.qa.harness.QARunner" fork="yes" failOnError="true">
                 <!-- JDK extension directories (include our lib-ext dirs, for the custom policy providers) -->
                 <jvmarg value="-Djava.ext.dirs=${ext.dirs}" />
                 <jvmarg value="-Djava.security.policy=${security.policy}" />
@@ -262,18 +280,18 @@
     </target>
 
     <target name="jars" depends="stubs, trust,
-        harness-killer.jar, 
-        harness-killer-dl.jar, 
-        nonactivatablegroup.jar, 
-        nonactivatablegroup-dl.jar, 
+        harness-killer.jar,
+        harness-killer-dl.jar,
+        nonactivatablegroup.jar,
+        nonactivatablegroup-dl.jar,
         mergedpolicyprovider.jar,
-        qa1-end2end.jar, 
-        qa1-fiddler-dl.jar, 
-        qa1-joinmanager-dl.jar, 
-        qa1-mahalo-dl.jar, 
-        qa1-mercury.jar, 
-        qa1-mercury-dl.jar, 
-        qa1-mercury-bogusimpl.jar, 
+        qa1-end2end.jar,
+        qa1-fiddler-dl.jar,
+        qa1-joinmanager-dl.jar,
+        qa1-mahalo-dl.jar,
+        qa1-mercury.jar,
+        qa1-mercury-dl.jar,
+        qa1-mercury-bogusimpl.jar,
         qa1-wrapper.jar,
         qa1-norm-dl.jar,
         qa1-outrigger-dl.jar,
@@ -325,9 +343,9 @@
 
     <target name="stubs" depends="compile,
         harness-killer.stubs,
-        nonactivatablegroup.stubs, 
-        qa1-fiddler.stubs, 
-        qa1-joinmanager.stubs, 
+        nonactivatablegroup.stubs,
+        qa1-fiddler.stubs,
+        qa1-joinmanager.stubs,
         qa1-mercury.stubs,
         qa1-norm.stubs,
         qa1-outrigger.stubs,
@@ -377,7 +395,7 @@
             <arg line="-in com.sun.jini"/>
             <arg value="com.sun.jini.qa.harness.VMKiller"/>
             <arg value="com.sun.jini.qa.harness.KillerImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/harness-killer-dl.jar" index="false">
             <fileset dir="${river.classes.dir}"  includesfile="${harness-killer-dl.deps}" />
@@ -403,7 +421,7 @@
             <arg line="-out com.sun.jini.start"	/>
             <arg value="com.sun.jini.qa.harness.NonActivatableGroupImpl"/>
             <arg value="com.sun.jini.qa.harness.NonActivatableGroupImpl$$GroupImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/nonactivatablegroup.jar" index="false">
             <fileset dir="${river.classes.dir}"  includesfile="${nonactivatablegroup.deps}" />
@@ -420,7 +438,7 @@
             <arg value="-files"/>
             <arg line="-in com.sun.jini"/>
             <arg value="com.sun.jini.qa.harness.NonActivatableGroupImpl$$GroupImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/nonactivatablegroup-dl.jar" index="false">
             <fileset dir="${river.classes.dir}"  includesfile="${nonactivatablegroup-dl.deps}" />
@@ -437,7 +455,7 @@
             <arg value="-files"/>
             <arg line="-in com.sun.jini.qa"/>
             <arg value="com.sun.jini.qa.harness.MergedPolicyProvider"/>
-            
+
         </classdep>
         <jar destfile="${lib-ext.dir}/mergedpolicyprovider.jar" index="false" >
             <fileset dir="${river.classes.dir}" includesfile="${mergedpolicyprovider.deps}"/>
@@ -485,7 +503,7 @@
             <arg value="com.sun.jini.test.share.AttributesUtil$$TestAttrSC00"/>
             <arg value="com.sun.jini.test.share.DiscoveryServiceUtil$$BasicEventListener_Stub"/>
             <arg value="com.sun.jini.test.spec.discoveryservice.AbstractBaseTest$$LDSEventListener_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-fiddler-dl.jar" index="false" >
             <fileset dir="${build.classes.dir}" includesfile="${qa1-fiddler-dl.deps}" />
@@ -514,7 +532,7 @@
             <arg value="com.sun.jini.test.share.AttributesUtil$$TestAttr00"/>
             <arg value="com.sun.jini.test.share.AttributesUtil$$TestAttrSC00"/>
             <arg value="com.sun.jini.test.impl.joinmanager.LeaseRenewDurRFE$$RemoteTestServiceImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-joinmanager-dl.jar" index="false" >
             <fileset dir="${build.classes.dir}" includesfile="${qa1-joinmanager-dl.deps}" />
@@ -564,7 +582,7 @@
             <arg value="com.sun.jini.test.impl.mercury.TestPullListenerImpl_Stub"/>
             <arg value="com.sun.jini.test.impl.mercury.TestGeneratorImpl"/>
             <arg value="com.sun.jini.test.impl.mercury.TestGeneratorImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-mercury.jar" index="false" >
             <fileset dir="${build.classes.dir}" includesfile="${qa1-mercury.deps}" />
@@ -590,7 +608,7 @@
             <arg value="com.sun.jini.test.impl.mercury.TestPullListenerImpl_Stub"/>
             <arg value="com.sun.jini.test.impl.mercury.TestGeneratorImpl"/>
             <arg value="com.sun.jini.test.impl.mercury.TestGeneratorImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-mercury.jar" index="false" update="true">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-mercury.deps}" />
@@ -611,7 +629,7 @@
             <arg value="com.sun.jini.test.impl.mercury.TestListenerImpl_Stub"/>
             <arg value="com.sun.jini.test.impl.mercury.TestPullListenerImpl_Stub"/>
             <arg value="com.sun.jini.test.impl.mercury.TestGeneratorImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-mercury-dl.jar" index="false">
             <metainf dir="${src.dir}/manifest/mercury-dl/META-INF">
@@ -641,7 +659,7 @@
             <arg value="com.sun.jini.test.impl.mercury.TestListenerImpl_Stub"/>
             <arg value="com.sun.jini.test.impl.mercury.TestPullListenerImpl_Stub"/>
             <arg value="com.sun.jini.test.impl.mercury.TestGeneratorImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-mercury-dl.jar" index="false" update="true">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-mercury-dl.deps}" />
@@ -659,7 +677,7 @@
             <arg line="-in com.sun.jini.test"/>
             <arg value="com.sun.jini.test.impl.mercury.DelayedBasicJeriExporter"/>
             <arg value="com.sun.jini.test.impl.mercury.MyLocalRemoteEvent"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-mercury-bogusimpl.jar" index="false" >
             <fileset dir="${build.classes.dir}" includesfile="${qa1-mercury-bogusimpl.deps}" />
@@ -697,7 +715,7 @@
             <arg value="com.sun.jini.test.impl.norm.LeaseBackEndImpl_Stub"/>
             <arg value="com.sun.jini.test.impl.norm.RemoteListener_Stub"/>
             <arg value="com.sun.jini.test.impl.norm.TestLease"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-norm-dl.jar" index="false" >
             <fileset dir="${build.classes.dir}" includesfile="${qa1-norm-dl.deps}" />
@@ -739,7 +757,7 @@
             <arg value="com.sun.jini.test.impl.outrigger.matching.TestSpaceListener_Stub"/>
             <arg value="com.sun.jini.test.impl.outrigger.notify.ThrowRuntimeException$$Listener_Stub"/>
             <arg value="com.sun.jini.test.impl.outrigger.leasing.LeasedSpaceListener_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-outrigger-dl.jar" index="false" >
             <fileset dir="${build.classes.dir}" includesfile="${qa1-outrigger-dl.deps}" />
@@ -773,7 +791,7 @@
             <arg line="-in com.sun.jini.fiddler"/>
             <arg line="${jskprivate.include}" />
             <arg path="${build.classes.dir}/com/sun/jini/test/impl"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/jinitests.jar" index="false" >
             <metainf dir="${src.dir}/manifest/qa1/META-INF">
@@ -792,7 +810,7 @@
             <arg line="-in com.sun.jini.fiddler"/>
             <arg line="${jskprivate.include}" />
             <arg path="${build.classes.dir}/com/sun/jini/test/spec"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/jinitests.jar" index="false" update="true">
             <fileset dir="${build.classes.dir}" includesfile="${jinitests.deps}" />
@@ -810,7 +828,7 @@
             <arg path="${build.classes.dir}/com/sun/jini/test/services/lookupsimulator/LookupSimulatorProxyInterface.class"/>
             <arg path="${build.classes.dir}/com/sun/jini/fiddler/FiddlerAdmin.class"/>
             <arg path="${build.classes.dir}/com/sun/jini/fiddler/JavaSpaceAdmin.class"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/jinitests.jar" index="false" update="true">
             <fileset dir="${build.classes.dir}" includesfile="${jinitests.deps}" />
@@ -834,7 +852,7 @@
             <arg value="-files"/>
             <arg line="-in com.sun.jini"/>
             <arg line="com.sun.jini.qa.harness.MainWrapper"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-mainwrapper.jar" index="false" >
             <fileset dir="${build.classes.dir}" includesfile="${qa1-mainwrapper.deps}"/>
@@ -855,7 +873,7 @@
             <arg line="-in com.sun.jini.qa"/>
             <arg line="-in com.sun.jini.tool"/>
             <arg line="com.sun.jini.start.DestroySharedGroup"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/jiniharness.jar" index="false" >
             <fileset dir="${build.classes.dir}" includesfile="${jiniharness.deps}"/>
@@ -882,7 +900,7 @@
             <arg line="-show com.sun.jini.qa"/>
             <arg line="-show com.sun.jini.qaman"/>
             <arg line="com.sun.jini.qa.harness.QARunner"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qaman.jar" index="false" manifest="${src.dir}/manifest/qa1.mf">
             <fileset dir="${build.classes.dir}" includesfile="${qaman.deps}"/>
@@ -916,7 +934,7 @@
             <arg line="com.sun.jini.test.impl.start.BadServiceProxyAccessorImpl"/>
             <arg line="com.sun.jini.test.impl.start.ProbeImpl_Stub"/>
             <arg line="com.sun.jini.test.impl.start.BadServiceProxyAccessorImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-start-probe-dl.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-start-probe-dl.deps}"/>
@@ -938,7 +956,7 @@
             <arg line="com.sun.jini.test.impl.start.BadServiceProxyAccessorImpl_Stub"/>
             <arg line="com.sun.jini.test.impl.start.UnsharedProbeImpl"/>
             <arg line="com.sun.jini.test.impl.start.NoStubProbeImpl"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-start-probe.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-start-probe.deps}"/>
@@ -958,7 +976,7 @@
             <arg line="com.sun.jini.test.impl.start.BadServiceProxyAccessorImpl_Stub"/>
             <arg line="com.sun.jini.test.impl.start.UnsharedProbeImpl"/>
             <arg line="com.sun.jini.test.impl.start.NoStubProbeImpl"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-start-probe.jar" index="false" update="true">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-start-probe.deps}"/>
@@ -996,7 +1014,7 @@
             <arg line="com.sun.jini.test.impl.start.CodebaseTest"/>
             <arg line="com.sun.jini.test.impl.start.SecurityTest"/>
             <arg line="com.sun.jini.test.impl.start.SecurityTestNonActivatable"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-start-tests.jar" index="false" update="true">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-start-tests.deps}"/>
@@ -1013,7 +1031,7 @@
             <arg value="-files"/>
             <arg line="-in com.sun.jini.test"/>
             <arg line="com.sun.jini.test.impl.start.TestServiceImpl"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-start-testservice1.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-start-testservice1.deps}"/>
@@ -1032,7 +1050,7 @@
             <arg line="-hide com.sun.jini.test"/>
             <arg line="com.sun.jini.test.impl.start.TestServiceImpl"/>
             <arg line="com.sun.jini.test.impl.start.TestServiceImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-start-testservice1.jar" index="false" update="true">
             <fileset dir="${river.classes.dir}" includesfile="${qa1-start-testservice1.deps}"/>
@@ -1064,7 +1082,7 @@
             <arg value="-files"/>
             <arg line="-in com.sun.jini.test"/>
             <arg line="com.sun.jini.test.impl.start.TestServiceImpl"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-start-testservice2.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-start-testservice2.deps}"/>
@@ -1083,7 +1101,7 @@
             <arg line="-hide com.sun.jini.test"/>
             <arg line="com.sun.jini.test.impl.start.TestServiceImpl"/>
             <arg line="com.sun.jini.test.impl.start.TestServiceImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-start-testservice2.jar" index="false" update="true">
             <fileset dir="${river.classes.dir}" includesfile="${qa1-start-testservice2.deps}"/>
@@ -1116,7 +1134,7 @@
             <arg line="-in com.sun.jini.test"/>
             <arg line="com.sun.jini.test.impl.start.TestServiceDummyClass0"/>
             <arg line="com.sun.jini.test.impl.start.TestServiceSharedMap"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-start-testservice-common.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-start-testservice-common.deps}"/>
@@ -1133,7 +1151,7 @@
             <arg value="-files"/>
             <arg line="-in com.sun.jini.test"/>
             <arg line="com.sun.jini.test.impl.start.TestServiceDummyClass0"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-start-testservice-common-dl.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-start-testservice-common-dl.deps}"/>
@@ -1204,7 +1222,7 @@
             <arg line="-in com.sun.jini.test"/>
             <arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl"/>
             <arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-lookup-simulator.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-lookup-simulator.deps}"/>
@@ -1219,7 +1237,7 @@
             <arg line="-hide com.sun.jini.test"/>
             <arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl"/>
             <arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-lookup-simulator.jar" index="false" update="true">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-lookup-simulator.deps}"/>
@@ -1240,7 +1258,7 @@
             <arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorProxyVerifier"/>
             <arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl"/>
             <arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-lookup-simulator-dl.jar" index="false">
             <metainf dir="${src.dir}/manifest/simulator-dl/META-INF">
@@ -1258,7 +1276,7 @@
             <arg line="-hide com.sun.jini.test"/>
             <arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl"/>
             <arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-lookup-simulator-dl.jar" index="false" update="true">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-lookup-simulator-dl.deps}"/>
@@ -1304,7 +1322,7 @@
             <arg line="com.sun.jini.test.share.TesterTransactionManager_Stub"/>
             <arg line="com.sun.jini.test.share.LeaseBackEndImpl_Stub"/>
             <arg line="com.sun.jini.test.share.TestParticipantImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-share-dl.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-share-dl.deps}"/>
@@ -1332,7 +1350,7 @@
             <arg line="com.sun.jini.test.share.TesterTransactionManager_Stub"/>
             <arg line="com.sun.jini.test.share.LeaseBackEndImpl_Stub"/>
             <arg line="com.sun.jini.test.share.TestParticipantImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-share-dl.jar" index="false" update="true">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-share-dl.deps}"/>
@@ -1356,7 +1374,7 @@
             <arg line="com.sun.jini.test.share.TesterTransactionManager_Stub"/>
             <arg line="com.sun.jini.test.share.LeaseBackEndImpl_Stub"/>
             <arg line="com.sun.jini.test.share.TestParticipantImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-reggie-race.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-reggie-race.deps}"/>
@@ -1390,7 +1408,7 @@
             <arg line="com.sun.jini.test.share.TesterTransactionManager_Stub"/>
             <arg line="com.sun.jini.test.share.LeaseBackEndImpl_Stub"/>
             <arg line="com.sun.jini.test.share.TestParticipantImpl_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-reggie-race-dl.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-reggie-race-dl.deps}"/>
@@ -1407,7 +1425,7 @@
             <arg value="-files"/>
             <arg line="-in com.sun.jini.test"/>
             <arg line="com.sun.jini.test.support.FullLoggingFilter"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/fullloggingfilter.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${fullloggingfilter.deps}"/>
@@ -1436,7 +1454,7 @@
             <arg line="com.sun.jini.test.spec.discoveryservice.AbstractBaseTest$$LDSEventListener_Stub"/>
             <arg line="com.sun.jini.test.share.AttributesUtil$$TestAttr00"/>
             <arg line="com.sun.jini.test.share.AttributesUtil$$TestAttrSC00"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-discoveryservice-dl.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-discoveryservice-dl.deps}"/>
@@ -1513,7 +1531,7 @@
             <arg line="${jskplatform.exclude}"/>
             <arg line="com.sun.jini.test.spec.io.util.FakeIntegrityVerifier"/>
             <arg path="${build.classes.dir}/com/sun/jini/test/spec/io/marshalinputstream"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-io-marshalinputstream-test.jar" index="false" update="true">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-io-marshalinputstream-test.deps}"/>
@@ -1541,7 +1559,7 @@
             <arg line="${jskplatform.exclude}"/>
             <arg line="com.sun.jini.test.spec.io.util.FakeIntegrityVerifier"/>
             <arg path="${build.classes.dir}/com/sun/jini/test/spec/io/marshalledinstance"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-io-marshalledinstance-test.jar" index="false" update="true">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-io-marshalledinstance-test.deps}"/>
@@ -1567,7 +1585,7 @@
             <arg line="com.sun.jini.test.spec.javaspace.conformance.ParticipantImpl_Stub"/>
             <arg line="com.sun.jini.test.spec.javaspace.conformance.NotifyCounter_Stub"/>
             <arg line="com.sun.jini.test.spec.javaspace.conformance.TestEventListener05_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-javaspace-dl.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-javaspace-dl.deps}"/>
@@ -1647,7 +1665,7 @@
             <arg line="com.sun.jini.test.spec.lookupservice.test_set02.NotifyOnAttrSet$$Listener_Stub"/>
             <arg line="com.sun.jini.test.spec.lookupservice.test_set02.NotifyOnComboAttrSet$$Listener_Stub"/>
             <arg line="com.sun.jini.test.spec.lookupservice.test_set02.NotifyExceptionTest$$Listener_Stub"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-lookupservice-dl.jar" index="false">
             <fileset dir="${build.classes.dir}" includesfile="${qa1-lookupservice-dl.deps}"/>
@@ -1684,7 +1702,7 @@
             <arg line="com.sun.jini.test.share.ConstrainableTestLease"/>
             <arg line="com.sun.jini.test.share.UnreadableTestLease"/>
             <arg line="com.sun.jini.test.share.ConstrainableUnreadableTestLease"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-renewalservice-dl.jar" index="false">
             <fileset dir="${build.classes.dir}">
@@ -1699,7 +1717,7 @@
             <arg line="-in net.jini"/>
             <arg line="${jskplatform.exclude}"/>
             <arg line="com.sun.jini.proxy.BasicProxyTrustVerifier"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-renewalservice-dl.jar" index="false" update="true">
             <fileset dir="${river.classes.dir}" includesfile="${qa1-renewalservice-dl.deps}"/>
@@ -1739,7 +1757,7 @@
             <arg line="com.sun.jini.test.spec.servicediscovery.AbstractBaseTest$$TestService"/>
             <arg line="com.sun.jini.test.spec.servicediscovery.AbstractBaseTest$$TestServiceIntAttr"/>
             <arg line="net.jini.lookup.entry.Name"/>
-            
+
         </classdep>
         <jar destfile="${lib.dir}/qa1-servicediscovery-dl.jar" index="false">
             <metainf dir="${src.dir}/manifest/servicediscovery-dl/META-INF">
@@ -1884,7 +1902,7 @@
         <delete file="${trust.dir}/group.keystore" quiet="true"/>
         <keystore target="group" dir="${trust.dir}" dname="Group" />
     </target>
-    
+
     <target name="password" depends="tester.password,
             reggie.password,
             phoenix.password,
@@ -1934,7 +1952,7 @@
         <delete file="${trust.dir}/fiddler.password" quiet="true"/>
         <echo file="${trust.dir}/fiddler.password" message="fiddlerpw" />
     </target>
-    
+
     <target name="group.password">
         <delete file="${trust.dir}/group.password" quiet="true"/>
         <echo file="${trust.dir}/group.password" message="grouppw"  />

Propchange: incubator/river/jtsk/trunk/qa/jtreg/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Oct  4 16:00:48 2009
@@ -1,3 +1,4 @@
-test.props
 JTreport
+test.props
 JTwork
+JTlib-tmp

Propchange: incubator/river/jtsk/trunk/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct  4 16:00:48 2009
@@ -0,0 +1,2 @@
+classes
+results



Mime
View raw message