You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by ju...@apache.org on 2009/03/30 15:55:50 UTC

svn commit: r759969 [1/2] - in /incubator/river/jtsk/trunk: ./ build.properties build.xml integrationtest.xml integrationtests/qa/ integrationtests/qa/doc/ integrationtests/qa/harness/trust/

Author: jukka
Date: Mon Mar 30 13:55:49 2009
New Revision: 759969

URL: http://svn.apache.org/viewvc?rev=759969&view=rev
Log:
RIVER-301: Move the tests into the JUnit framework inside the main source project

Applied RIVER-301-JC-5.1.patch by Jonathan Costers.

This patch also fixes RIVER-270.

Modified:
    incubator/river/jtsk/trunk/   (props changed)
    incubator/river/jtsk/trunk/build.properties
    incubator/river/jtsk/trunk/build.xml
    incubator/river/jtsk/trunk/integrationtest.xml
    incubator/river/jtsk/trunk/integrationtests/qa/   (props changed)
    incubator/river/jtsk/trunk/integrationtests/qa/doc/   (props changed)
    incubator/river/jtsk/trunk/integrationtests/qa/harness/trust/   (props changed)

Propchange: incubator/river/jtsk/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 30 13:55:49 2009
@@ -1,7 +1,10 @@
-configentry
-deps
 classes
-lib-dl
 lib-ext
 lib
+deps
+configentry
+nbproject
+build
 .*
+lib-dl
+dist

Modified: incubator/river/jtsk/trunk/build.properties
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/build.properties?rev=759969&r1=759968&r2=759969&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/build.properties (original)
+++ incubator/river/jtsk/trunk/build.properties Mon Mar 30 13:55:49 2009
@@ -4,27 +4,26 @@
 version.suffix=incubating
 
 # Build settings
-doc=${basedir}/doc
-src=${basedir}/src
+doc=doc
+doc.api=${doc}/api
+doc.spec.api=${doc}/specs/api
+src=src
 src.manifest=${src}/manifest
-build=${basedir}/build
+src.configentry=${src}/configentry
+build=build
 build.classes=${build}/classes
 build.deps=${build}/deps
-build.dist=${build}/dist
-build.doc=${build}/doc
-build.doc.api=${build.doc}/api
-build.doc.spec.api=${build.doc}/specs/api
-build.lib=${build}/lib
-build.lib-dl=${build}/lib-dl
-build.lib-ext=${build}/lib-ext
-entry.dest.dir=${build}/configentry
-entry.src.dir=${src}/configentry
+configentry=configentry
+dist=dist
+lib=lib
+lib-dl=lib-dl
+lib-ext=lib-ext
 
 ## Private package inclusions for use with classdep; the
 ## classes in these packages are both not part of the JSK
 ## platform and not public (have generated javadoc).
 ## The -skip for logging classes is because LogManager is in
-## jsk-pllatform.jar and Levels is in jsk-lib.jar.
+## jsk-platform.jar and Levels is in jsk-lib.jar.
 ## The -in com.sun.jini.outrigger is there in order to catch
 ## any use of the following deprecated APIs:
 ##       com.sun.jini.outrigger.AdminIterator
@@ -37,29 +36,33 @@
 jskplatform.exclude=-out com.sun.jini.discovery -out net.jini.activation -out net.jini.config -out net.jini.constraint -out net.jini.core -out net.jini.export -out net.jini.id -out net.jini.iiop -out net.jini.io -out net.jini.jeri -out net.jini.jrmp -out net.jini.loader -out net.jini.security -out net.jini.url -skip net.jini.discovery.ConstrainableLookupLocator -skip net.jini.discovery.ConstrainableLookupLocatorTrustVerifier -skip com.sun.jini.config.ConfigUtil -skip com.sun.jini.config.KeyStores -skip com.sun.jini.logging.LogManager
 
 # QA Test settings
-qatests=${basedir}/integrationtests/qa
+qatests=integrationtests/qa
 qatests.src=${qatests}/src
 qatests.build=${qatests}/build
+qatests.doc.api=${qatests}/doc/api
 qatests.lib=${qatests}/lib
 qatests.lib-ext=${qatests}/lib-ext
 qatests.deps=${qatests.build}/deps
 qatests.classes=${qatests.build}/classes
 qatests.trust=${qatests}/harness/trust
+# possible values: jrmp,jeri,jsse,http,https,kerberos,none
+qatests.harness.configs=jrmp,jeri,jsse,http,https
 
 # Distribution bundles
 install.dir=${product.name}-${version}
 install.src.dir=${install.dir}/src
-bin.tar.bundle=${build.dist}/${product.name}-${version}-${version.suffix}-bin.tar.gz
-bin.zip.bundle=${build.dist}/${product.name}-${version}-${version.suffix}-bin.zip
-src.tar.bundle=${build.dist}/${product.name}-${version}-${version.suffix}-src.tar.gz
-src.zip.bundle=${build.dist}/${product.name}-${version}-${version.suffix}-src.zip
+bin.tar.bundle=${dist}/${product.name}-${version}-${version.suffix}-bin.tar.gz
+bin.zip.bundle=${dist}/${product.name}-${version}-${version.suffix}-bin.zip
+src.tar.bundle=${dist}/${product.name}-${version}-${version.suffix}-src.tar.gz
+src.zip.bundle=${dist}/${product.name}-${version}-${version.suffix}-src.zip
 
 # Javadoc options
-tm=<sup><font size=-2>TM</font></sup>
 api-copyright=Copyright 2007, multiple authors.<br>Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="child" >Apache License, Version 2.0</a>, see the <a href="{@docRoot}/doc-files/NOTICE" target="child" >NOTICE</a> file for attributions.
 api-doc-title=Apache River Release v${version}${version.suffix} API Documentation
 api-win-title=${api-doc-title}
 spec-doc-title=Apache River Release Specifications
 spec-win-title=${spec-doc-title}
+qatests-doc-title=Apache River Release v${version}-${version.suffix} QA Harness and Test API Documentation
+qatests-win-title=${qatests-doc-title}
 jdk-doc-url=http://java.sun.com/j2se/1.4.2/docs/api
 jdk-packages=${build.doc}/j2se

Modified: incubator/river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/build.xml?rev=759969&r1=759968&r2=759969&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/build.xml (original)
+++ incubator/river/jtsk/trunk/build.xml Mon Mar 30 13:55:49 2009
@@ -27,24 +27,24 @@
 <!-- ##									-->
 <!-- ################################################################## -->
 <project name="River" basedir="." default="all">
-	<description>
-	</description>
+    <description>
+    </description>
     <property environment="env"/>
     <property file="build.properties"/>
     <import file="integrationtest.xml" optional="true"/>
-	<target name="all"
+    <target name="all"
 		description="Builds all sources."
 		depends="setup-all,
 			 configentry,
 			 compile,
 			 copy-resources,
 			 stubs">
-	</target>
-    <target name="copy-resources" 
+    </target>
+    <target name="copy-resources"
 		description="Copies various resources directories to the classes dir."
 		depends="start.copy-resources, tools.copy-resources">
     </target>
-    <target name="clean" 
+    <target name="clean"
 		description="Removes all files and dirs created by the build."
 		depends="clean.all">
     </target>
@@ -77,11 +77,6 @@
         </condition>
         <property name="jre-ext-dir" location="${env.JAVA_HOME}/jre/lib/ext"/>
       
-        <!-- used in release.bin target -->
-        <property name="lib.dir"		value="lib"/>
-        <property name="lib-dl.dir"		value="lib-dl"/>
-        <property name="lib-ext.dir"		value="lib-ext"/>
-      
 	<!-- ## javac options	-->
         <condition property="env.JAVADEBUG" value="lines,source,vars">
             <not>
@@ -93,7 +88,7 @@
         <echo message="JAVA_HOME:		${env.JAVA_HOME}"/>
         <echo message="java.home:		${java.home}"/>
         <echo message="Java  Ver:		${ant.java.version}"/>
-	</target>
+    </target>
     <target name="build.release"
 		description=""
 		depends="all,
@@ -110,10 +105,10 @@
     <target name="release.bin"
 		description=""
 		depends="env">
-        <mkdir dir="${build.dist}"/>
+        <mkdir dir="${dist}"/>
         <delete file="${bin.zip.bundle}"/>
         <zip destfile="${bin.zip.bundle}">
-            <zipfileset dir="." prefix="${install.dir}">
+            <zipfileset dir="${basedir}" prefix="${install.dir}">
                 <include name="index.html"/>
                 <include name="DISCLAIMER"/>
                 <include name="LICENSE"/>
@@ -127,64 +122,46 @@
                 <include name="${doc}/simpleproxyverification.pdf"/>
                 <include name="${doc}/smartproxyverification.pdf"/>
                 <include name="${doc}/spec-index.html"/>
-                <include name="${doc}/specs/**"/>
-            </zipfileset>
-            <zipfileset dir="${build}" prefix="${install.dir}">
-                <include name="doc/api/**"/>
-                <include name="${entry.dest.dir}/**"/>
-                <include name="${lib.dir}/**"/>
-                <include name="${lib-dl.dir}/**"/>
-                <include name="${lib-ext.dir}/**"/>
+                <include name="${doc}/specs/**/*"/>
+                <include name="${doc.api}/**"/>
+                <include name="${lib}/**"/>
+                <include name="${lib-dl}/**"/>
+                <include name="${lib-ext}/**"/>
+                <include name="${configentry}/**"/>
             </zipfileset>
         </zip>
-	  
-      
-	<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-      
-		<delete file="${bin.tar.bundle}"/>
-      
-	##
-	## TODO:
-	##
-	## Investigate how to deal with the tar task's 100-character limitation.
-	##
-	    
-		<tar destfile="${bin.tar.bundle}"
-		     compression="gzip"
-		     longfile="warn">
-      
-                        <tarfileset dir="." prefix="${install.dir}">
-                            <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/**"/>
-                        </tarfileset>
-			<tarfileset dir="${build}" prefix="${install.dir}">
-				<include name="${doc}/api/**"/>
-				<include name="${entry.dest.dir}/**"/>
-				<include name="${lib.dir}/**"/>
-				<include name="${lib-dl.dir}/**"/>
-				<include name="${lib-ext.dir}/**"/>
-			</tarfileset>
-	    
-		</tar>
-	
-	@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
-	</target>
+        <delete file="${bin.tar.bundle}"/>
+        <!-- TODO: Investigate how to deal with the tar task's 100-character limitation. -->
+        <tar destfile="${bin.tar.bundle}"
+         compression="gzip"
+         longfile="gnu">
+            <tarfileset dir="${basedir}" prefix="${install.dir}">
+                <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}/**"/>
+            </tarfileset>
+        </tar>
+    </target>
     <target name="release.src"
 		description=""
 		depends="env">
-        <mkdir dir="${build.dist}"/>
+        <mkdir dir="${dist}"/>
         <delete file="${src.zip.bundle}"/>
         <zip destfile="${src.zip.bundle}">
             <zipfileset dir="." prefix="${install.dir}">
@@ -209,71 +186,52 @@
                 <include name="${src}/**"/>
                 <exclude name="${src}/**/*.sh"/>
             </zipfileset>
-            <zipfileset dir="."
+            <zipfileset dir="${basedir}"
 				    prefix="${install.dir}"
 				    includes="${src}/**/*.sh"
 				    filemode="755"/>
         </zip>
-	  
-      
-		<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-      
-		<delete file="${src.tar.bundle}"/>
-      
-		##
-		## TODO:
-		##
-		## Investigate how to deal with the tar task's 100-character limitation.
-		##
-	  
-		<tar destfile="${src.tar.bundle}"
+        <delete file="${src.tar.bundle}"/>
+        <!-- TODO: investigate how to deal with the tar task's 100-character limitation. -->
+        <tar destfile="${src.tar.bundle}"
 		     compression="gzip"
-		     longfile="warn">
-      
-			<tarfileset dir="." prefix="${install.dir}">
-				<include name="index.html"/>
-      
-				<include name="build.xml"/>
-				<include name="build_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}/**"/>
-			</tarfileset>
-      
-		</tar>
-      
-		@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
-	</target>
+		     longfile="gnu">
+            <tarfileset dir="${basedir}" prefix="${install.dir}">
+                <include name="index.html"/>
+                <include name="build.xml"/>
+                <include name="build_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}/**"/>
+            </tarfileset>
+        </tar>
+    </target>
     <target name="setup-dirs"
 		description="Creates dirs, paths, etc."
 		depends="env">
-	<!-- ## Create build directory structure -->
+        <!-- ## Create build directory structure -->
         <mkdir dir="${build}"/>
         <mkdir dir="${build.classes}"/>
         <mkdir dir="${build.deps}"/>
-        <mkdir dir="${build.doc}"/>
-        <mkdir dir="${build.doc.api}"/>
-        <mkdir dir="${build.doc.spec.api}"/>
-        <mkdir dir="${build.lib}"/>
-        <mkdir dir="${build.lib-dl}"/>
-        <mkdir dir="${build.lib-ext}"/>
-        <mkdir dir="${entry.dest.dir}"/>
+        <mkdir dir="${configentry}"/>
+        <mkdir dir="${doc.api}"/>
+        <mkdir dir="${doc.spec.api}"/>
+        <mkdir dir="${lib}"/>
+        <mkdir dir="${lib-dl}"/>
+        <mkdir dir="${lib-ext}"/>
     </target>
     <target name="setup-paths"
 		description="Creates path based properties"
@@ -348,7 +306,7 @@
 		Please set the JAVA_HOME environment variable to point to the 
 		location of your J2SDK installation.
         </fail>
-	</target>
+    </target>
     <macrodef name="javac-cmd">
         <attribute name="source.dir"/>
         <attribute name="source.pat"/>
@@ -370,7 +328,7 @@
                                 srcdir="@{source.dir}"
                                 target="1.4"
                                 verbose="no"'/>
-            <javac fork="yes" 
+            <javac fork="yes"
                     debug="yes"
                     debuglevel="${env.JAVADEBUG}"
                     deprecation="yes"
@@ -403,12 +361,12 @@
     <target name="doc"
 		description="Generates the javadoc."
 		depends="setup-all">
-        <delete dir="${build.doc.api}" quiet="true"/>
-        <mkdir  dir="${build.doc.api}"/>
+        <delete dir="${doc.api}" quiet="true"/>
+        <mkdir  dir="${doc.api}"/>
         <javadoc author="true"
 			 bottom="${api-copyright}"
 			 breakiterator="yes"
-			 destdir="${build.doc.api}"
+			 destdir="${doc.api}"
 			 doctitle="${api-doc-title}"
 			 linkoffline="${jdk-doc-url} ${jdk-packages}"
 			 serialwarn="yes"
@@ -420,6 +378,7 @@
 			     enabled="true"
 			     scope="packages,types"
 			     description="Implementation Specifics:"/>
+            <bottom></bottom>
             <classpath refid="path.apidoc"/>
             <sourcepath>
                 <pathelement path="${src}"/>
@@ -492,18 +451,18 @@
             <package name="net.jini.url.httpmd"/>
             <package name="net.jini.url.https"/>
         </javadoc>
-        <mkdir dir="${build.doc.api}/doc-files"/>
-        <copy file="./NOTICE" tofile="${build.doc.api}/doc-files/NOTICE"/>
+        <mkdir dir="${doc.api}/doc-files"/>
+        <copy file="./NOTICE" tofile="${doc.api}/doc-files/NOTICE"/>
     </target>
     <target name="spec-doc"
 		description="Generates the specification-only javadoc."
 		depends="setup-all">
-        <delete dir="${build.doc.spec.api}" quiet="true"/>
-        <mkdir  dir="${build.doc.spec.api}"/>
+        <delete dir="${doc.spec.api}" quiet="true"/>
+        <mkdir  dir="${doc.spec.api}"/>
         <javadoc author="true"
 			 bottom="${api-copyright}"
 			 breakiterator="yes"
-			 destdir="${build.doc.spec.api}"
+			 destdir="${doc.spec.api}"
 			 doctitle="${spec-doc-title}"
 			 linkoffline="${jdk-doc-url} ${jdk-packages}"
 			 serialwarn="yes"
@@ -545,8 +504,8 @@
             <package name="net.jini.url.httpmd"/>
             <package name="net.jini.url.https"/>
         </javadoc>
-        <mkdir dir="${build.doc.spec.api}/doc-files"/>
-        <copy file="./NOTICE" tofile="${build.doc.spec.api}/doc-files/NOTICE"/>
+        <mkdir dir="${doc.spec.api}/doc-files"/>
+        <copy file="./NOTICE" tofile="${doc.spec.api}/doc-files/NOTICE"/>
     </target>
     <target name="jars"
 		description="Generates jar files for each sub-component."
@@ -605,7 +564,7 @@
 		description="Installs our policy jars into the JRE ext dir."
 		depends="setup-all">
         <delete file="${jre-ext-dir}/jsk-policy.jar"/>
-        <copy file="${build.lib-ext}/jsk-policy.jar"	todir="${jre-ext-dir}"/>
+        <copy file="${lib-ext}/jsk-policy.jar"	todir="${jre-ext-dir}"/>
     </target>
     <target name="uninstall.policy"
 		description="Removes our policy jars from the JRE ext dir."
@@ -620,23 +579,22 @@
 		description="Deletes the lib, lib-dl, and lib-ext  directories."
 		depends="clean.dist,
 			 clean.jars">
-        <delete dir="${build.classes}"				quiet="true"/>
-        <delete dir="${build.deps}"					quiet="true"/>
-        <delete dir="${build.doc}"                                    quiet="true"/>
-        <delete dir="${entry.dest.dir}"				quiet="true"/>
+        <delete dir="${build}" quiet="true"/>
+        <delete dir="${doc.api}" quiet="true"/>
+        <delete dir="${doc.spec.api}" quiet="true"/>
         <delete dir="${src}/com/sun/jini/example/hello/lib"	quiet="true"/>
     </target>
     <target name="clean.dist"
 		description="Deletes the distribution directory."
 		depends="env">
-        <delete dir="${build.dist}" quiet="true"/>
+        <delete dir="${dist}" quiet="true"/>
     </target>
     <target name="clean.jars"
 		description="Deletes the lib, lib-dl, and lib-ext directories."
 		depends="env">
-        <delete dir="${build.lib}"	quiet="true"/>
-        <delete dir="${build.lib-dl}"	quiet="true"/>
-        <delete dir="${build.lib-ext}"	quiet="true"/>
+        <delete dir="${lib}"	quiet="true"/>
+        <delete dir="${lib-dl}"	quiet="true"/>
+        <delete dir="${lib-ext}"	quiet="true"/>
     </target>
     <target name="toolwrappers"
 		depends="tools.jar,
@@ -654,121 +612,121 @@
     <target name="checkconfigurationfile.jar"
 		depends="setup-all,
 			 start.jar">
-        <delete file="${build.lib}/checkconfigurationfile.jar" quiet="true"/>
+        <delete file="${lib}/checkconfigurationfile.jar" quiet="true"/>
         <java classname="com.sun.jini.tool.JarWrapper"
 		      classpath="${build.classes}"
 		      failonerror="true">
-            <arg line="-manifest=${src.manifest}/checkconfigurationfile.mf"/>
-            <arg line="${build.lib}/checkconfigurationfile.jar"/>
-            <arg line="${build.lib}"/>
-            <arg line="tools.jar"/>
+            <arg value="-manifest=${src.manifest}/checkconfigurationfile.mf"/>
+            <arg path="${lib}/checkconfigurationfile.jar"/>
+            <arg path="${lib}"/>
+            <arg value="tools.jar"/>
         </java>
     </target>
     <target name="checkser.jar"
 		depends="setup-all">
-        <delete file="${build.lib}/checkser.jar" quiet="true"/>
+        <delete file="${lib}/checkser.jar" quiet="true"/>
         <java classname="com.sun.jini.tool.JarWrapper"
 		      classpath="${build.classes}"
 		      failonerror="true">
-            <arg line="-manifest=${src.manifest}/checkser.mf"/>
-            <arg line="${build.lib}/checkser.jar"/>
-            <arg line="${build.lib}"/>
-            <arg line="tools.jar"/>
+            <arg value="-manifest=${src.manifest}/checkser.mf"/>
+            <arg path="${lib}/checkser.jar"/>
+            <arg path="${lib}"/>
+            <arg value="tools.jar"/>
         </java>
     </target>
     <target name="classdep.jar"
 		depends="setup-all">
-        <delete file="${build.lib}/classdep.jar" quiet="true"/>
+        <delete file="${lib}/classdep.jar" quiet="true"/>
         <java classname="com.sun.jini.tool.JarWrapper"
 		      classpath="${build.classes}"
 		      failonerror="true">
-            <arg line="-manifest=${src.manifest}/classdep.mf"/>
-            <arg line="${build.lib}/classdep.jar"/>
-            <arg line="${build.lib}"/>
-            <arg line="tools.jar"/>
+            <arg value="-manifest=${src.manifest}/classdep.mf"/>
+            <arg path="${lib}/classdep.jar"/>
+            <arg path="${lib}"/>
+            <arg value="tools.jar"/>
         </java>
     </target>
     <target name="classserver.jar"
 		depends="setup-all">
-        <delete file="${build.lib}/classserver.jar" quiet="true"/>
+        <delete file="${lib}/classserver.jar" quiet="true"/>
         <java classname="com.sun.jini.tool.JarWrapper"
 		      classpath="${build.classes}"
 		      failonerror="true">
-            <arg line="${build.lib}/classserver.jar"/>
-            <arg line="${build.lib}"/>
-            <arg line="tools.jar"/>
+            <arg path="${lib}/classserver.jar"/>
+            <arg path="${lib}"/>
+            <arg value="tools.jar"/>
         </java>
     </target>
     <target name="computedigest.jar"
 		depends="setup-all">
-        <delete file="${build.lib}/computedigest.jar" quiet="true"/>
+        <delete file="${lib}/computedigest.jar" quiet="true"/>
         <java classname="com.sun.jini.tool.JarWrapper"
 		      classpath="${build.classes}"
 		      failonerror="true">
-            <arg line="-manifest=${src.manifest}/computedigest.mf"/>
-            <arg line="${build.lib}/computedigest.jar"/>
-            <arg line="${build.lib}"/>
-            <arg line="tools.jar"/>
+            <arg value="-manifest=${src.manifest}/computedigest.mf"/>
+            <arg path="${lib}/computedigest.jar"/>
+            <arg path="${lib}"/>
+            <arg value="tools.jar"/>
         </java>
     </target>
     <target name="computehttpmdcodebase.jar"
 		depends="setup-all">
-        <delete file="${build.lib}/computehttpmdcodebase.jar" quiet="true"/>
+        <delete file="${lib}/computehttpmdcodebase.jar" quiet="true"/>
         <java classname="com.sun.jini.tool.JarWrapper"
 		      classpath="${build.classes}"
 		      failonerror="true">
-            <arg line="-manifest=${src.manifest}/computehttpmdcodebase.mf"/>
-            <arg line="${build.lib}/computehttpmdcodebase.jar"/>
-            <arg line="${build.lib}"/>
-            <arg line="tools.jar"/>
+            <arg value="-manifest=${src.manifest}/computehttpmdcodebase.mf"/>
+            <arg path="${lib}/computehttpmdcodebase.jar"/>
+            <arg path="${lib}"/>
+            <arg value="tools.jar"/>
         </java>
     </target>
     <target name="jarwrapper.jar"
 		depends="setup-all">
-        <delete file="${build.lib}/jarwrapper.jar" quiet="true"/>
+        <delete file="${lib}/jarwrapper.jar" quiet="true"/>
         <java classname="com.sun.jini.tool.JarWrapper"
 		      classpath="${build.classes}"
 		      failonerror="true">
-            <arg line="-manifest=${src.manifest}/jarwrapper.mf"/>
-            <arg line="${build.lib}/jarwrapper.jar"/>
-            <arg line="${build.lib}"/>
-            <arg line="tools.jar"/>
+            <arg value="-manifest=${src.manifest}/jarwrapper.mf"/>
+            <arg path="${lib}/jarwrapper.jar"/>
+            <arg path="${lib}"/>
+            <arg value="tools.jar"/>
         </java>
     </target>
     <target name="preferredlistgen.jar"
 		depends="setup-all">
-        <delete file="${build.lib}/preferredlistgen.jar" quiet="true"/>
+        <delete file="${lib}/preferredlistgen.jar" quiet="true"/>
         <java classname="com.sun.jini.tool.JarWrapper"
 		      classpath="${build.classes}"
 		      failonerror="true">
-            <arg line="-manifest=${src.manifest}/preferredlistgen.mf"/>
-            <arg line="${build.lib}/preferredlistgen.jar"/>
-            <arg line="${build.lib}"/>
-            <arg line="tools.jar"/>
+            <arg value="-manifest=${src.manifest}/preferredlistgen.mf"/>
+            <arg path="${lib}/preferredlistgen.jar"/>
+            <arg path="${lib}"/>
+            <arg value="tools.jar"/>
         </java>
     </target>
     <target name="envcheck.jar"
 		depends="setup-all">
-        <delete file="${build.lib}/envcheck.jar" quiet="true"/>
+        <delete file="${lib}/envcheck.jar" quiet="true"/>
         <java classname="com.sun.jini.tool.JarWrapper"
 		      classpath="${build.classes}"
 		      failonerror="true">
-            <arg line="-manifest=${src.manifest}/envcheck.mf"/>
-            <arg line="${build.lib}/envcheck.jar"/>
-            <arg line="${build.lib}"/>
-            <arg line="tools.jar"/>
+            <arg value="-manifest=${src.manifest}/envcheck.mf"/>
+            <arg path="${lib}/envcheck.jar"/>
+            <arg path="${lib}"/>
+            <arg value="tools.jar"/>
         </java>
-        <jar destfile="${build.lib}/envcheck.jar" 
+        <jar destfile="${lib}/envcheck.jar"
 	       update="true"
 	       index="false">
-            <fileset	dir="${src.manifest}/tools"
+            <fileset dir="${src.manifest}/tools"
 		      includes="META-INF/services/com.sun.jini.tool.envcheck.Plugin"/>
         </jar>
     </target>
     <target name="jini-core.jar"
 		depends="setup-all">
-        <delete file="${build.lib}/jini-core.jar" quiet="true"/>
-        <jar destfile="${build.lib}/jini-core.jar"
+        <delete file="${lib}/jini-core.jar" quiet="true"/>
+        <jar destfile="${lib}/jini-core.jar"
 		     index="false">
             <fileset dir="${build.classes}"
 			 includes="net/jini/core/**"/>
@@ -791,8 +749,8 @@
             <arg path="${build.classes}/net/jini"/>
             <arg path="${build.classes}/com/sun/jini/discovery"/>
         </java>
-        <delete file="${build.lib}/jini-ext.jar" quiet="true"/>
-        <jar destfile="${build.lib}/jini-ext.jar" 
+        <delete file="${lib}/jini-ext.jar" quiet="true"/>
+        <jar destfile="${lib}/jini-ext.jar"
 		     index="false"
 		     manifest="${src.manifest}/jini-ext.mf">
             <fileset dir="${build.classes}"  includesfile="${jini-ext.deps}"/>
@@ -812,8 +770,8 @@
             <arg line="-in com.sun.jini.tool"/>
             <arg value="com.sun.jini.tool.DebugDynamicPolicyProvider"/>
         </java>
-        <delete file="${build.lib}/jsk-debug-policy.jar" quiet="true"/>
-        <jar destfile="${build.lib}/jsk-debug-policy.jar"
+        <delete file="${lib}/jsk-debug-policy.jar" quiet="true"/>
+        <jar destfile="${lib}/jsk-debug-policy.jar"
 		     index="false"
 		     manifest="${src.manifest}/jsk-debug-policy.mf">
             <fileset dir="${build.classes}"  includesfile="${jsk-debug-policy.deps}"/>
@@ -863,8 +821,8 @@
             <arg value="net.jini.lookup.DiscoveryAdmin"/>
             <arg value="net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
         </java>
-        <delete file="${build.lib-dl}/jsk-dl.jar" quiet="true"/>
-        <jar destfile="${build.lib-dl}/jsk-dl.jar" 
+        <delete file="${lib-dl}/jsk-dl.jar" quiet="true"/>
+        <jar destfile="${lib-dl}/jsk-dl.jar"
 		     index="false">
             <fileset dir="${build.classes}"  includesfile="${jsk-dl.deps}"/>
             <metainf dir="${src.manifest}/jsk-dl/META-INF"/>
@@ -898,15 +856,16 @@
             <arg value="com.sun.jini.start.LifeCycle"/>
             <arg value="com.sun.jini.start.ServiceProxyAccessor"/>
         </java>
-        <delete file="${build.lib}/jsk-lib.jar" quiet="true"/>
-        <jar destfile="${build.lib}/jsk-lib.jar" 
+        <delete file="${lib}/jsk-lib.jar" quiet="true"/>
+        <jar destfile="${lib}/jsk-lib.jar"
 		     index="false">
             <fileset dir="${build.classes}"  includesfile="${jsk-lib.deps}"/>
         </jar>
         <preferredlistgen>
             <arg line="-jar"/>
-            <arg path="${build.lib}/jsk-lib.jar"/>
-            <arg line="-cp ${build.classes}"/>
+            <arg path="${lib}/jsk-lib.jar"/>
+            <arg line="-cp"/>
+            <arg path="${build.classes}"/>
             <arg line="-api com.sun.jini.start.LifeCycle"/>
             <arg line="-api com.sun.jini.start.ServiceProxyAccessor"/>
         </preferredlistgen>
@@ -943,16 +902,17 @@
             <arg value="com.sun.jini.config.KeyStores"/>
             <arg value="com.sun.jini.logging.LogManager"/>
         </java>
-        <delete file="${build.lib}/jsk-platform.jar" quiet="true"/>
-        <jar destfile="${build.lib}/jsk-platform.jar" 
+        <delete file="${lib}/jsk-platform.jar" quiet="true"/>
+        <jar destfile="${lib}/jsk-platform.jar"
 		     index="false"
 		     manifest="${src.manifest}/jsk-platform.mf">
             <fileset dir="${build.classes}"  includesfile="${jsk-platform.deps}"/>
         </jar>
         <preferredlistgen>
             <arg line="-jar"/>
-            <arg path="${build.lib}/jsk-platform.jar"/>
-            <arg line="-cp ${build.classes}"/>
+            <arg path="${lib}/jsk-platform.jar"/>
+            <arg line="-cp"/>
+            <arg path="${build.classes}"/>
             <arg line="-api net/jini/activation/-"/>
             <arg line="-api net/jini/config/-"/>
             <arg line="-api net/jini/constraint/-"/>
@@ -995,16 +955,16 @@
             <arg line="-in com.sun.jini"/>
             <arg line="-in net.jini"/>
         </java>
-        <delete file="${build.lib-ext}/jsk-policy.jar" quiet="true"/>
-        <jar destfile="${build.lib-ext}/jsk-policy.jar" 
+        <delete file="${lib-ext}/jsk-policy.jar" quiet="true"/>
+        <jar destfile="${lib-ext}/jsk-policy.jar"
 		     index="false">
             <fileset dir="${build.classes}"  includesfile="${jsk-policy.deps}"/>
         </jar>
     </target>
     <target name="jsk-resources.jar"
 		depends="setup-all">
-        <delete file="${build.lib}/jsk-resources.jar" quiet="true"/>
-        <jar destfile="${build.lib}/jsk-resources.jar" 
+        <delete file="${lib}/jsk-resources.jar" quiet="true"/>
+        <jar destfile="${lib}/jsk-resources.jar"
 		     index="false">
             <fileset dir="${src.manifest}/jsk-resources"
 				 includes="META-INF/services/com.sun.jini.discovery.DiscoveryFormatProvider
@@ -1033,8 +993,8 @@
             <arg value="com.sun.jini.start.ServiceProxyAccessor"/>
             <arg line="-in com.sun.jini"/>
         </java>
-        <delete file="${build.lib}/sun-util.jar" quiet="true"/>
-        <jar destfile="${build.lib}/sun-util.jar" 
+        <delete file="${lib}/sun-util.jar" quiet="true"/>
+        <jar destfile="${lib}/sun-util.jar"
 		     duplicate="preserve"
 		     index="false">
             <fileset  dir="${build.classes}"  includesfile="${sun-util.deps}"/>
@@ -1071,18 +1031,18 @@
             <arg value="com.sun.jini.proxy.BasicProxyTrustVerifier"/>
             <arg value="net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
         </java>
-        <delete file="${build.lib-dl}/sdm-dl.jar" quiet="true"/>
-        <jar destfile="${build.lib-dl}/sdm-dl.jar"
+        <delete file="${lib-dl}/sdm-dl.jar" quiet="true"/>
+        <jar destfile="${lib-dl}/sdm-dl.jar"
 		     index="false">
             <fileset dir="${build.classes}"  includesfile="${sdm-dl.deps}"/>
         </jar>
         <preferredlistgen>
             <arg line="-cp"/>
-            <arg path="${build.lib}/jsk-platform.jar"/>
+            <arg path="${lib}/jsk-platform.jar"/>
             <arg line="-jar"/>
-            <arg path="${build.lib-dl}/sdm-dl.jar"/>
+            <arg path="${lib-dl}/sdm-dl.jar"/>
             <arg line="-jar"/>
-            <arg path="${build.lib-dl}/jsk-dl.jar"/>
+            <arg path="${lib-dl}/jsk-dl.jar"/>
             <arg line="-proxy net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
         </preferredlistgen>
     </target>
@@ -1105,14 +1065,14 @@
     <macrodef name="create-activatable">
         <attribute name="prefix"/>
         <sequential>
-            <echo message="Creating ${entry.dest.dir}/@{prefix}-activatable"/>
-            <concat destfile="${entry.dest.dir}/@{prefix}-activatable">
-                <fileset dir="${entry.src.dir}">
+            <echo message="Creating ${configentry}/@{prefix}-activatable"/>
+            <concat destfile="${configentry}/@{prefix}-activatable">
+                <fileset dir="${src.configentry}">
                     <include name="@{prefix}-activatable"/>
                     <include name="@{prefix}-persistent"/>
                     <include name="@{prefix}-transient"/>
                 </fileset>
-                <fileset dir="${entry.src.dir}">
+                <fileset dir="${src.configentry}">
                     <patternset refid="svc-common-entries-set"/>
                 </fileset>
             </concat>
@@ -1121,13 +1081,13 @@
     <macrodef name="create-persistent">
         <attribute name="prefix"/>
         <sequential>
-            <echo message="Creating ${entry.dest.dir}/@{prefix}-persistent"/>
-            <concat destfile="${entry.dest.dir}/@{prefix}-persistent">
-                <fileset dir="${entry.src.dir}">
+            <echo message="Creating ${configentry}/@{prefix}-persistent"/>
+            <concat destfile="${configentry}/@{prefix}-persistent">
+                <fileset dir="${src.configentry}">
                     <include name="@{prefix}-persistent"/>
                     <include name="@{prefix}-transient"/>
                 </fileset>
-                <fileset dir="${entry.src.dir}">
+                <fileset dir="${src.configentry}">
                     <patternset refid="svc-common-entries-set"/>
                 </fileset>
             </concat>
@@ -1136,12 +1096,12 @@
     <macrodef name="create-transient">
         <attribute name="prefix"/>
         <sequential>
-            <echo message="Creating ${entry.dest.dir}/@{prefix}-transient"/>
-            <concat destfile="${entry.dest.dir}/@{prefix}-transient">
-                <fileset dir="${entry.src.dir}">
+            <echo message="Creating ${configentry}/@{prefix}-transient"/>
+            <concat destfile="${configentry}/@{prefix}-transient">
+                <fileset dir="${src.configentry}">
                     <include name="@{prefix}-transient"/>
                 </fileset>
-                <fileset dir="${entry.src.dir}">
+                <fileset dir="${src.configentry}">
                     <patternset refid="svc-common-entries-set"/>
                 </fileset>
             </concat>
@@ -1192,144 +1152,144 @@
     </target>
     <target name="browser.configentry"
 		depends="dis-common-entries">
-        <delete file="${entry.dest.dir}/browser"/>
-        <echo message="Creating ${entry.dest.dir}/browser"/>
-        <concat destfile="${entry.dest.dir}/browser">
-            <fileset dir="${entry.src.dir}">
+        <delete file="${configentry}/browser"/>
+        <echo message="Creating ${configentry}/browser"/>
+        <concat destfile="${configentry}/browser">
+            <fileset dir="${src.configentry}">
                 <include name="browser"/>
             </fileset>
-            <fileset dir="${entry.src.dir}">
+            <fileset dir="${src.configentry}">
                 <patternset refid="dis-common-entries-set"/>
             </fileset>
         </concat>
     </target>
     <target name="destroy.configentry">
-        <delete file="${entry.dest.dir}/destroy"/>
-        <copy   file="${entry.src.dir}/destroy" todir="${entry.dest.dir}"/>
+        <delete file="${configentry}/destroy"/>
+        <copy   file="${src.configentry}/destroy" todir="${configentry}"/>
     </target>
     <target name="fiddler-activatable.configentry"
 		depends="fiddler-persistent.configentry,
 			 fiddler-transient.configentry,
 			 svc-common-entries">
-        <delete file="${entry.dest.dir}/fiddler-activatable"/>
+        <delete file="${configentry}/fiddler-activatable"/>
         <create-activatable prefix="fiddler"/>
     </target>
     <target name="fiddler-persistent.configentry">
-        <delete file="${entry.dest.dir}/fiddler-persistent"/>
+        <delete file="${configentry}/fiddler-persistent"/>
         <create-persistent prefix="fiddler"/>
     </target>
     <target name="fiddler-transient.configentry">
-        <delete file="${entry.dest.dir}/fiddler-transient"/>
+        <delete file="${configentry}/fiddler-transient"/>
         <create-transient prefix="fiddler"/>
     </target>
     <target name="JoinManager.configentry">
-        <delete file="${entry.dest.dir}/JoinManager"/>
-        <copy   file="${entry.src.dir}/JoinManager" todir="${entry.dest.dir}"/>
+        <delete file="${configentry}/JoinManager"/>
+        <copy   file="${src.configentry}/JoinManager" todir="${configentry}"/>
     </target>
     <target name="LeaseRenewalManager.configentry">
-        <delete file="${entry.dest.dir}/LeaseRenewalManager"/>
-        <copy   file="${entry.src.dir}/LeaseRenewalManager" todir="${entry.dest.dir}"/>
+        <delete file="${configentry}/LeaseRenewalManager"/>
+        <copy   file="${src.configentry}/LeaseRenewalManager" todir="${configentry}"/>
     </target>
     <target name="LookupDiscovery.configentry">
-        <delete file="${entry.dest.dir}/LookupDiscovery"/>
-        <copy   file="${entry.src.dir}/LookupDiscovery" todir="${entry.dest.dir}"/>
+        <delete file="${configentry}/LookupDiscovery"/>
+        <copy   file="${src.configentry}/LookupDiscovery" todir="${configentry}"/>
     </target>
     <target name="LookupLocatorDiscovery.configentry">
-        <delete file="${entry.dest.dir}/LookupLocatorDiscovery"/>
-        <copy   file="${entry.src.dir}/LookupLocatorDiscovery" todir="${entry.dest.dir}"/>
+        <delete file="${configentry}/LookupLocatorDiscovery"/>
+        <copy   file="${src.configentry}/LookupLocatorDiscovery" todir="${configentry}"/>
     </target>
     <target name="mahalo-activatable.configentry">
-        <delete file="${entry.dest.dir}/mahalo-activatable"/>
+        <delete file="${configentry}/mahalo-activatable"/>
         <create-activatable prefix="mahalo"/>
     </target>
     <target name="mahalo-persistent.configentry">
-        <delete file="${entry.dest.dir}/mahalo-persistent"/>
+        <delete file="${configentry}/mahalo-persistent"/>
         <create-persistent prefix="mahalo"/>
     </target>
     <target name="mahalo-transient.configentry">
-        <delete file="${entry.dest.dir}/mahalo-transient"/>
+        <delete file="${configentry}/mahalo-transient"/>
         <create-transient prefix="mahalo"/>
     </target>
     <target name="mercury-activatable.configentry">
-        <delete file="${entry.dest.dir}/mercury-activatable"/>
+        <delete file="${configentry}/mercury-activatable"/>
         <create-activatable prefix="mercury"/>
     </target>
     <target name="mercury-persistent.configentry">
-        <delete file="${entry.dest.dir}/mercury-persistent"/>
+        <delete file="${configentry}/mercury-persistent"/>
         <create-persistent prefix="mercury"/>
     </target>
     <target name="mercury-transient.configentry">
-        <delete file="${entry.dest.dir}/mercury-transient"/>
+        <delete file="${configentry}/mercury-transient"/>
         <create-transient prefix="mercury"/>
     </target>
     <target name="norm-activatable.configentry">
-        <delete file="${entry.dest.dir}/norm-activatable"/>
+        <delete file="${configentry}/norm-activatable"/>
         <create-activatable prefix="norm"/>
     </target>
     <target name="norm-persistent.configentry">
-        <delete file="${entry.dest.dir}/norm-persistent"/>
+        <delete file="${configentry}/norm-persistent"/>
         <create-persistent prefix="norm"/>
     </target>
     <target name="norm-transient.configentry">
-        <delete file="${entry.dest.dir}/norm-transient"/>
+        <delete file="${configentry}/norm-transient"/>
         <create-transient prefix="norm"/>
     </target>
     <target name="outrigger-activatable.configentry">
-        <delete file="${entry.dest.dir}/outrigger-activatable"/>
+        <delete file="${configentry}/outrigger-activatable"/>
         <create-activatable prefix="outrigger"/>
     </target>
     <target name="outrigger-persistent.configentry">
-        <delete file="${entry.dest.dir}/outrigger-persistent"/>
+        <delete file="${configentry}/outrigger-persistent"/>
         <create-persistent prefix="outrigger"/>
     </target>
     <target name="outrigger-transient.configentry">
-        <delete file="${entry.dest.dir}/outrigger-transient"/>
+        <delete file="${configentry}/outrigger-transient"/>
         <create-transient prefix="outrigger"/>
     </target>
     <target name="phoenix.configentry">
-        <delete file="${entry.dest.dir}/phoenix"/>
-        <copy   file="${entry.src.dir}/phoenix" todir="${entry.dest.dir}"/>
+        <delete file="${configentry}/phoenix"/>
+        <copy   file="${src.configentry}/phoenix" todir="${configentry}"/>
     </target>
     <target name="phoenix-group.configentry">
-        <delete file="${entry.dest.dir}/phoenix-group"/>
-        <copy   file="${entry.src.dir}/phoenix-group" todir="${entry.dest.dir}"/>
+        <delete file="${configentry}/phoenix-group"/>
+        <copy   file="${src.configentry}/phoenix-group" todir="${configentry}"/>
     </target>
     <target name="phoenix-stop.configentry">
-        <delete file="${entry.dest.dir}/phoenix-stop"/>
-        <copy   file="${entry.src.dir}/phoenix-stop" todir="${entry.dest.dir}"/>
+        <delete file="${configentry}/phoenix-stop"/>
+        <copy   file="${src.configentry}/phoenix-stop" todir="${configentry}"/>
     </target>
     <target name="reggie-activatable.configentry">
-        <delete file="${entry.dest.dir}/reggie-activatable"/>
+        <delete file="${configentry}/reggie-activatable"/>
         <create-activatable prefix="reggie"/>
     </target>
     <target name="reggie-persistent.configentry">
-        <delete file="${entry.dest.dir}/reggie-persistent"/>
+        <delete file="${configentry}/reggie-persistent"/>
         <create-persistent prefix="reggie"/>
     </target>
     <target name="reggie-transient.configentry">
-        <delete file="${entry.dest.dir}/reggie-transient"/>
+        <delete file="${configentry}/reggie-transient"/>
         <create-transient prefix="reggie"/>
     </target>
     <target name="ServiceDiscoveryManager.configentry">
-        <delete file="${entry.dest.dir}/ServiceDiscoveryManager"/>
-        <copy   file="${entry.src.dir}/ServiceDiscoveryManager" todir="${entry.dest.dir}"/>
+        <delete file="${configentry}/ServiceDiscoveryManager"/>
+        <copy   file="${src.configentry}/ServiceDiscoveryManager" todir="${configentry}"/>
     </target>
     <target name="sharedgroup.configentry">
-        <delete file="${entry.dest.dir}/sharedgroup"/>
-        <copy   file="${entry.src.dir}/sharedgroup" todir="${entry.dest.dir}"/>
+        <delete file="${configentry}/sharedgroup"/>
+        <copy   file="${src.configentry}/sharedgroup" todir="${configentry}"/>
     </target>
     <target name="start.configentry">
-        <delete file="${entry.dest.dir}/start"/>
-        <copy   file="${entry.src.dir}/start" todir="${entry.dest.dir}"/>
+        <delete file="${configentry}/start"/>
+        <copy   file="${src.configentry}/start" todir="${configentry}"/>
     </target>
     <target name="WakeupManager.configentry">
-        <delete file="${entry.dest.dir}/WakeupManager"/>
-        <copy   file="${entry.src.dir}/WakeupManager" todir="${entry.dest.dir}"/>
+        <delete file="${configentry}/WakeupManager"/>
+        <copy   file="${src.configentry}/WakeupManager" todir="${configentry}"/>
     </target>
     <target name="serviceui.jar"
 		depends="tools.jar">
-        <delete file="${build.lib}/serviceui.jar" quiet="true"/>
-        <jar destfile="${build.lib}/serviceui.jar" 
+        <delete file="${lib}/serviceui.jar" quiet="true"/>
+        <jar destfile="${lib}/serviceui.jar"
 		     index="false">
             <fileset dir="${build.classes}">
                 <include name="net/jini/lookup/entry/UIDescriptor.class"/>
@@ -1354,8 +1314,8 @@
             <arg value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>
             <arg value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
         </java>
-        <delete file="${build.lib}/browser.jar" quiet="true"/>
-        <jar destfile="${build.lib}/browser.jar" 
+        <delete file="${lib}/browser.jar" quiet="true"/>
+        <jar destfile="${lib}/browser.jar"
 		     index="false"
 		     manifest="${src.manifest}/browser.mf">
             <fileset dir="${build.classes}" includesfile="${browser.deps}"/>
@@ -1377,18 +1337,18 @@
             <arg value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
             <arg value="com.sun.jini.proxy.BasicProxyTrustVerifier"/>
         </java>
-        <delete file="${build.lib-dl}/browser-dl.jar" quiet="true"/>
-        <jar destfile="${build.lib-dl}/browser-dl.jar"
+        <delete file="${lib-dl}/browser-dl.jar" quiet="true"/>
+        <jar destfile="${lib-dl}/browser-dl.jar"
 		     index="false">
             <fileset dir="${build.classes}" includesfile="${browser-dl.deps}"/>
         </jar>
         <preferredlistgen>
             <arg line="-cp"/>
-            <arg path="${build.lib}/jsk-platform.jar"/>
+            <arg path="${lib}/jsk-platform.jar"/>
             <arg line="-jar"/>
-            <arg path="${build.lib-dl}/browser-dl.jar"/>
+            <arg path="${lib-dl}/browser-dl.jar"/>
             <arg line="-jar"/>
-            <arg path="${build.lib-dl}/jsk-dl.jar"/>
+            <arg path="${lib-dl}/jsk-dl.jar"/>
             <arg line="-proxy com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
         </preferredlistgen>
     </target>
@@ -1419,8 +1379,8 @@
             <arg value="com.sun.jini.fiddler.NonActivatableFiddlerImpl"	/>
             <arg value="com.sun.jini.fiddler.TransientFiddlerImpl"/>
         </java>
-        <delete file="${build.lib}/fiddler.jar" quiet="true" />
-        <jar destfile="${build.lib}/fiddler.jar" 
+        <delete file="${lib}/fiddler.jar" quiet="true" />
+        <jar destfile="${lib}/fiddler.jar"
          index="false"
          manifest="${src.manifest}/fiddler.mf">
             <fileset dir="${build.classes}"  includesfile="${fiddler.deps}" />
@@ -1429,7 +1389,7 @@
             <arg line="-cp"	/>
             <arg path="${build.classes}"/>
             <arg line="-jar"/>
-            <arg path="${build.lib}/fiddler.jar"/>
+            <arg path="${lib}/fiddler.jar"/>
             <arg line="-default true" />
         </preferredlistgen>
     </target>
@@ -1457,17 +1417,17 @@
             <arg value="net.jini.discovery.RemoteDiscoveryEvent"/>
             <arg value="net.jini.lookup.entry.ServiceInfo"/>
         </java>
-        <delete file="${build.lib-dl}/fiddler-dl.jar" quiet="true"/>
-        <jar destfile="${build.lib-dl}/fiddler-dl.jar" index="false">
+        <delete file="${lib-dl}/fiddler-dl.jar" quiet="true"/>
+        <jar destfile="${lib-dl}/fiddler-dl.jar" index="false">
             <fileset dir="${build.classes}"  includesfile="${fiddler-dl.deps}" />
         </jar>
         <preferredlistgen>
             <arg line="-cp"							/>
             <arg path="${build.classes}"					/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/fiddler-dl.jar"			/>
+            <arg path="${lib-dl}/fiddler-dl.jar"			/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/jsk-dl.jar"				/>
+            <arg path="${lib-dl}/jsk-dl.jar"				/>
             <arg line="-proxy com.sun.jini.fiddler.FiddlerProxy"		/>
             <arg line="-proxy com.sun.jini.fiddler.FiddlerAdminProxy"	/>
         </preferredlistgen>
@@ -1498,15 +1458,15 @@
             <arg value="com.sun.jini.mahalo.MahaloPermission"			/>
             <arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"		/>
         </java>
-        <delete file="${build.lib}/mahalo.jar" quiet="true" />
-        <jar destfile="${build.lib}/mahalo.jar" 
+        <delete file="${lib}/mahalo.jar" quiet="true" />
+        <jar destfile="${lib}/mahalo.jar"
          index="false"
          manifest="${src.manifest}/mahalo.mf">
             <fileset dir="${build.classes}"  includesfile="${mahalo.deps}" />
         </jar>
         <preferredlistgen>
             <arg line="-jar"							/>
-            <arg path="${build.lib}/mahalo.jar"				/>
+            <arg path="${lib}/mahalo.jar"				/>
             <arg line="-cp"							/>
             <arg path="${build.classes}"					/>
             <arg line="-default true"   					/>
@@ -1535,18 +1495,18 @@
             <arg value="com.sun.jini.mahalo.InternalManagerException"		/>
             <arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"		/>
         </java>
-        <delete file="${build.lib-dl}/mahalo-dl.jar" quiet="true" />
-        <jar destfile="${build.lib-dl}/mahalo-dl.jar"
+        <delete file="${lib-dl}/mahalo-dl.jar" quiet="true" />
+        <jar destfile="${lib-dl}/mahalo-dl.jar"
          index="false">
             <fileset dir="${build.classes}"  includesfile="${mahalo-dl.deps}" />
         </jar>
         <preferredlistgen>
             <arg line="-cp"							/>
-            <arg path="${build.lib}/jsk-platform.jar"			/>
+            <arg path="${lib}/jsk-platform.jar"			/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/mahalo-dl.jar"			/>
+            <arg path="${lib-dl}/mahalo-dl.jar"			/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/jsk-dl.jar"				/>
+            <arg path="${lib-dl}/jsk-dl.jar"				/>
             <arg line="-proxy com.sun.jini.mahalo.TxnMgrAdminProxy"		/>
             <arg line="-proxy com.sun.jini.mahalo.TxnMgrProxy"		/>
         </preferredlistgen>
@@ -1577,15 +1537,15 @@
             <arg value="com.sun.jini.mercury.MercuryPermission"		/>
             <arg value="com.sun.jini.mercury.MailboxImpl_Stub"		/>
         </java>
-        <delete file="${build.lib}/mercury.jar" quiet="true" />
-        <jar destfile="${build.lib}/mercury.jar" 
+        <delete file="${lib}/mercury.jar" quiet="true" />
+        <jar destfile="${lib}/mercury.jar"
          index="false"
          manifest="${src.manifest}/mercury.mf">
             <fileset dir="${build.classes}"  includesfile="${mercury.deps}" />
         </jar>
         <preferredlistgen>
             <arg line="-jar"							/>
-            <arg path="${build.lib}/mercury.jar"				/>
+            <arg path="${lib}/mercury.jar"				/>
             <arg line="-cp"							/>
             <arg path="${build.classes}"					/>
             <arg line="-default true"   					/>
@@ -1617,18 +1577,18 @@
             <arg value="net.jini.lookup.entry.Name"				/>
             <arg value="net.jini.lookup.entry.ServiceInfo"			/>
         </java>
-        <delete file="${build.lib-dl}/mercury-dl.jar" quiet="true" />
-        <jar destfile="${build.lib-dl}/mercury-dl.jar" 
+        <delete file="${lib-dl}/mercury-dl.jar" quiet="true" />
+        <jar destfile="${lib-dl}/mercury-dl.jar"
          index="false">
             <fileset dir="${build.classes}"  includesfile="${mercury-dl.deps}" />
         </jar>
         <preferredlistgen>
             <arg line="-cp"							/>
-            <arg path="${build.lib}/jsk-platform.jar"			/>
+            <arg path="${lib}/jsk-platform.jar"			/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/mercury-dl.jar"			/>
+            <arg path="${lib-dl}/mercury-dl.jar"			/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/jsk-dl.jar"				/>
+            <arg path="${lib-dl}/jsk-dl.jar"				/>
             <arg line="-proxy com.sun.jini.mercury.ListenerProxy"		/>
             <arg line="-proxy com.sun.jini.mercury.MailboxAdminProxy"	/>
             <arg line="-proxy com.sun.jini.mercury.MailboxProxy"		/>
@@ -1661,8 +1621,8 @@
             <arg value="com.sun.jini.norm.TransientNormServerImpl"		/>
             <arg value="com.sun.jini.reliableLog.LogException"		/>
         </java>
-        <delete file="${build.lib}/norm.jar" quiet="true" />
-        <jar destfile="${build.lib}/norm.jar" 
+        <delete file="${lib}/norm.jar" quiet="true" />
+        <jar destfile="${lib}/norm.jar"
          index="false"
          manifest="${src.manifest}/norm.mf">
             <fileset dir="${build.classes}"  includesfile="${norm.deps}" />
@@ -1671,7 +1631,7 @@
             <arg line="-cp"							/>
             <arg path="${build.classes}"					/>
             <arg line="-jar"							/>
-            <arg path="${build.lib}/norm.jar"				/>
+            <arg path="${lib}/norm.jar"				/>
             <arg line="-default true"   					/>
         </preferredlistgen>
     </target>
@@ -1698,17 +1658,17 @@
             <arg value="com.sun.jini.start.ServiceProxyAccessor"		/>
             <arg value="net.jini.lookup.entry.ServiceInfo"			/>
         </java>
-        <delete file="${build.lib-dl}/norm-dl.jar" quiet="true" />
-        <jar destfile="${build.lib-dl}/norm-dl.jar" index="false">
+        <delete file="${lib-dl}/norm-dl.jar" quiet="true" />
+        <jar destfile="${lib-dl}/norm-dl.jar" index="false">
             <fileset dir="${build.classes}" includesfile="${norm-dl.deps}" />
         </jar>
         <preferredlistgen>
             <arg line="-cp"							/>
-            <arg path="${build.lib}/jsk-platform.jar"			/>
+            <arg path="${lib}/jsk-platform.jar"			/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/norm-dl.jar"				/>
+            <arg path="${lib-dl}/norm-dl.jar"				/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/jsk-dl.jar"				/>
+            <arg path="${lib-dl}/jsk-dl.jar"				/>
             <arg line="-proxy com.sun.jini.norm.AbstractProxy"		/>
             <arg line="-proxy com.sun.jini.norm.AdminProxy"			/>
             <arg line="-proxy com.sun.jini.norm.NormProxy"			/>
@@ -1737,8 +1697,8 @@
             <arg line="-in com.sun.jini.outrigger.snaplogstore"			/>
             <arg value="com.sun.jini.outrigger.snaplogstore.LogStore"		/>
         </java>
-        <delete file="${build.lib}/outrigger-snaplogstore.jar" quiet="true" />
-        <jar destfile="${build.lib}/outrigger-snaplogstore.jar"
+        <delete file="${lib}/outrigger-snaplogstore.jar" quiet="true" />
+        <jar destfile="${lib}/outrigger-snaplogstore.jar"
 	 index="false">
             <fileset	dir="${build.classes}"
 		includesfile="${outrigger-snaplogstore.deps}" />
@@ -1762,8 +1722,8 @@
             <arg value="com.sun.jini.outrigger.PersistentOutriggerImpl"	/>
             <arg value="com.sun.jini.outrigger.TransientOutriggerImpl"	/>
         </java>
-        <delete file="${build.lib}/outrigger.jar" quiet="true"/>
-        <jar destfile="${build.lib}/outrigger.jar" 
+        <delete file="${lib}/outrigger.jar" quiet="true"/>
+        <jar destfile="${lib}/outrigger.jar"
          index="false"
 	 manifest="${src.manifest}/outrigger.mf">
             <metainf dir="${src.manifest}/outrigger/META-INF" />
@@ -1792,18 +1752,18 @@
             <arg value="net.jini.lookup.entry.ServiceInfo"			/>
             <arg value="net.jini.space.InternalSpaceException"		/>
         </java>
-        <delete file="${build.lib-dl}/outrigger-dl.jar" quiet="true"   />
-        <jar destfile="${build.lib-dl}/outrigger-dl.jar"
+        <delete file="${lib-dl}/outrigger-dl.jar" quiet="true"   />
+        <jar destfile="${lib-dl}/outrigger-dl.jar"
 	 index="false">
             <fileset dir="${build.classes}"  includesfile="${outrigger-dl.deps}" />
         </jar>
         <preferredlistgen>
             <arg line="-cp"								/>
-            <arg path="${build.lib}/jsk-platform.jar"				/>
+            <arg path="${lib}/jsk-platform.jar"				/>
             <arg line="-jar"							/>
-            <arg path="${build.lib-dl}/outrigger-dl.jar"				/>
+            <arg path="${lib-dl}/outrigger-dl.jar"				/>
             <arg line="-jar"							/>
-            <arg path="${build.lib-dl}/jsk-dl.jar"					/>
+            <arg path="${lib-dl}/jsk-dl.jar"					/>
             <arg line="-proxy com.sun.jini.outrigger.ConstrainableAdminProxy"	/>
             <arg line="-proxy com.sun.jini.outrigger.ConstrainableIteratorProxy"	/>
             <arg line="-proxy com.sun.jini.outrigger.ConstrainableParticipantProxy"	/>
@@ -1848,8 +1808,8 @@
             <arg value="com.sun.jini.phoenix.AbstractRegistry_Stub"		/>
             <arg value="com.sun.jini.phoenix.AbstractSystem_Stub"		/>
         </java>
-        <delete file="${build.lib}/phoenix.jar" quiet="true" />
-        <jar destfile="${build.lib}/phoenix.jar" 
+        <delete file="${lib}/phoenix.jar" quiet="true" />
+        <jar destfile="${lib}/phoenix.jar"
          index="false"
 	 manifest="${src.manifest}/phoenix.mf">
             <fileset	dir="${build.classes}"
@@ -1883,19 +1843,19 @@
             <arg value="com.sun.jini.phoenix.AbstractSystem_Stub"		/>
             <arg value="com.sun.jini.phoenix.AbstractRegistry_Stub"		/>
         </java>
-        <delete file="${build.lib-dl}/phoenix-dl.jar" quiet="true" />
-        <jar destfile="${build.lib-dl}/phoenix-dl.jar" 
+        <delete file="${lib-dl}/phoenix-dl.jar" quiet="true" />
+        <jar destfile="${lib-dl}/phoenix-dl.jar"
          index="false">
             <fileset	dir="${build.classes}"
 		includesfile="${phoenix-dl.deps}" />
         </jar>
         <preferredlistgen>
             <arg line="-cp"							/>
-            <arg path="${build.lib}/jsk-platform.jar"			/>
+            <arg path="${lib}/jsk-platform.jar"			/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/phoenix-dl.jar"			/>
+            <arg path="${lib-dl}/phoenix-dl.jar"			/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/jsk-dl.jar"				/>
+            <arg path="${lib-dl}/jsk-dl.jar"				/>
             <arg line="-proxy com.sun.jini.phoenix.AbstractSystem_Stub"	/>
         </preferredlistgen>
     </target>
@@ -1918,8 +1878,8 @@
             <arg value="com.sun.jini.phoenix.InstantiatorPermission"		/>
             <arg value="com.sun.jini.phoenix.AbstractInstantiator_Stub"	/>
         </java>
-        <delete file="${build.lib}/phoenix-group.jar" quiet="true" />
-        <jar destfile="${build.lib}/phoenix-group.jar" 
+        <delete file="${lib}/phoenix-group.jar" quiet="true" />
+        <jar destfile="${lib}/phoenix-group.jar"
          index="false">
             <fileset dir="${build.classes}"  includesfile="${phoenix-group.deps}" />
             <metainf dir="${src.manifest}/phoenix-group/META-INF" />
@@ -1940,8 +1900,8 @@
             <arg line="-in net.jini"						/>
             <arg value="com.sun.jini.phoenix.ActivationGroupInit" />
         </java>
-        <delete file="${build.lib}/phoenix-init.jar" quiet="true" />
-        <jar destfile="${build.lib}/phoenix-init.jar" 
+        <delete file="${lib}/phoenix-init.jar" quiet="true" />
+        <jar destfile="${lib}/phoenix-init.jar"
          index="false">
             <fileset dir="${build.classes}"  includesfile="${phoenix-init.deps}" />
         </jar>
@@ -1978,8 +1938,8 @@
             <arg value="com.sun.jini.reggie.RegistrarImpl_Stub"		/>
             <arg value="com.sun.jini.reggie.TransientRegistrarImpl"		/>
         </java>
-        <delete file="${build.lib}/reggie.jar" quiet="true" />
-        <jar destfile="${build.lib}/reggie.jar" 
+        <delete file="${lib}/reggie.jar" quiet="true" />
+        <jar destfile="${lib}/reggie.jar"
          index="false"
          manifest="${src.manifest}/reggie.mf">
             <fileset dir="${build.classes}"  includesfile="${reggie.deps}" />
@@ -1988,7 +1948,7 @@
             <arg line="-cp"							/>
             <arg path="${build.classes}"					/>
             <arg line="-jar"							/>
-            <arg path="${build.lib}/reggie.jar"				/>
+            <arg path="${lib}/reggie.jar"				/>
             <arg line="-default true"   					/>
         </preferredlistgen>
     </target>
@@ -2016,8 +1976,8 @@
             <arg value="com.sun.jini.reliableLog.LogException"		/>
             <arg value="net.jini.lookup.entry.ServiceInfo"			/>
         </java>
-        <delete file="${build.lib-dl}/reggie-dl.jar" quiet="true"/>
-        <jar destfile="${build.lib-dl}/reggie-dl.jar" 
+        <delete file="${lib-dl}/reggie-dl.jar" quiet="true"/>
+        <jar destfile="${lib-dl}/reggie-dl.jar"
          index="false">
             <fileset dir="${build.classes}"  includesfile="${reggie-dl.deps}" />
         </jar>
@@ -2025,9 +1985,9 @@
             <arg line="-cp"							/>
             <arg path="${build.classes}"					/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/reggie-dl.jar"			/>
+            <arg path="${lib-dl}/reggie-dl.jar"			/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/jsk-dl.jar"				/>
+            <arg path="${lib-dl}/jsk-dl.jar"				/>
             <arg line="-proxy com.sun.jini.reggie.ConstrainableRegistrarProxy"/>
             <arg line="-proxy com.sun.jini.reggie.ConstrainableAdminProxy"	/>
         </preferredlistgen>
@@ -2066,8 +2026,8 @@
             <arg line="-in com.sun.jini.start"				/>
             <arg value="com.sun.jini.start.DestroySharedGroup"		/>
         </java>
-        <delete  file="${build.lib}/destroy.jar" quiet="true"/>
-        <jar destfile="${build.lib}/destroy.jar" 
+        <delete  file="${lib}/destroy.jar" quiet="true"/>
+        <jar destfile="${lib}/destroy.jar"
          index="false"
          manifest="${src.manifest}/destroy.mf">
             <fileset dir="${build.classes}"
@@ -2091,8 +2051,8 @@
             <arg value="com.sun.jini.start.SharedGroupImpl"			/>
             <arg value="com.sun.jini.start.SharedGroupImpl_Stub"		/>
         </java>
-        <delete  file="${build.lib}/group.jar" quiet="true"/>
-        <jar destfile="${build.lib}/group.jar" 
+        <delete  file="${lib}/group.jar" quiet="true"/>
+        <jar destfile="${lib}/group.jar"
          index="false">
             <fileset dir="${build.classes}"  includesfile="${group.deps}" />
         </jar>
@@ -2112,18 +2072,18 @@
             <arg value="com.sun.jini.start.ProxyVerifier"			/>
             <arg value="com.sun.jini.start.SharedGroupImpl_Stub"		/>
         </java>
-        <delete  file="${build.lib-dl}/group-dl.jar" quiet="true"/>
-        <jar destfile="${build.lib-dl}/group-dl.jar" 
+        <delete  file="${lib-dl}/group-dl.jar" quiet="true"/>
+        <jar destfile="${lib-dl}/group-dl.jar"
          index="false">
             <fileset dir="${build.classes}"  includesfile="${group-dl.deps}" />
         </jar>
         <preferredlistgen>
             <arg line="-cp"							/>
-            <arg path="${build.lib}/jsk-platform.jar"			/>
+            <arg path="${lib}/jsk-platform.jar"			/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/group-dl.jar"			/>
+            <arg path="${lib-dl}/group-dl.jar"			/>
             <arg line="-jar"						/>
-            <arg path="${build.lib-dl}/jsk-dl.jar"				/>
+            <arg path="${lib-dl}/jsk-dl.jar"				/>
             <arg line="-proxy com.sun.jini.start.SharedGroupImpl_Stub"	/>
         </preferredlistgen>
     </target>
@@ -2140,8 +2100,8 @@
             <arg line="-in com.sun.jini" 					/>
             <arg value="com.sun.jini.start.ActivateWrapper"			/>
         </java>
-        <delete  file="${build.lib}/sharedvm.jar" quiet="true"/>
-        <jar destfile="${build.lib}/sharedvm.jar" 
+        <delete  file="${lib}/sharedvm.jar" quiet="true"/>
+        <jar destfile="${lib}/sharedvm.jar"
          index="false"
          manifest="${src.manifest}/sharedvm.mf">
             <fileset dir="${build.classes}"  includesfile="${sharedvm.deps}" />
@@ -2164,8 +2124,8 @@
             <arg value="com.sun.jini.start.SharedActivationGroupDescriptor"	/>
             <arg value="com.sun.jini.start.NonActivatableServiceDescriptor"	/>
         </java>
-        <delete  file="${build.lib}/start.jar" quiet="true"/>
-        <jar destfile="${build.lib}/start.jar" 
+        <delete  file="${lib}/start.jar" quiet="true"/>
+        <jar destfile="${lib}/start.jar"
          index="false"
          manifest="${src.manifest}/start.mf">
             <fileset dir="${build.classes}"
@@ -2233,8 +2193,8 @@
             <arg value="com.sun.jini.tool.envcheck.plugins.CheckPolicy"		/>
             <arg value="com.sun.jini.tool.envcheck.plugins.FileAccessCheckTask"	/>
         </java>
-        <delete file="${build.lib}/tools.jar" quiet="true" />
-        <jar destfile="${build.lib}/tools.jar" 
+        <delete file="${lib}/tools.jar" quiet="true" />
+        <jar destfile="${lib}/tools.jar"
          index="false"
 	 manifest="${src.manifest}/tools.mf">
             <fileset	dir="${src.manifest}/tools"
@@ -2249,125 +2209,124 @@
             <arg line="-cp"							/>
             <arg path="${build.classes}"					/>
             <arg line="-jar"							/>
-            <arg path="${build.lib}/tools.jar"				/>
+            <arg path="${lib}/tools.jar"				/>
         </preferredlistgen>
     </target>
 
     <target name="client.jar"
 		depends="compile">
-                <property name="example-client.deps" location="${build.deps}/example-client.deps"/>
-		<java classname="com.sun.jini.tool.ClassDep"
+        <property name="example-client.deps" location="${build.deps}/example-client.deps"/>
+        <java classname="com.sun.jini.tool.ClassDep"
 		      failonerror="true"
 		      output="${example-client.deps}">
-			<classpath refid="path.classdep"/>
-			<arg value="-cp"/>
-			<arg path="${build.classes}"/>
-			<arg value="-files"/>
-			<arg line="${jskplatform.exclude}"/>
-			<arg line="-in net.jini"/>
-			<arg line="-in com.sun.jini"/>
-			<arg value="com.sun.jini.example.hello.Client"/>
-		</java>
-		<delete file="${build.lib}/client.jar" quiet="true"/>
-		<jar destfile="${build.lib}/client.jar" 
+            <classpath refid="path.classdep"/>
+            <arg value="-cp"/>
+            <arg path="${build.classes}"/>
+            <arg value="-files"/>
+            <arg line="${jskplatform.exclude}"/>
+            <arg line="-in net.jini"/>
+            <arg line="-in com.sun.jini"/>
+            <arg value="com.sun.jini.example.hello.Client"/>
+        </java>
+        <delete file="${lib}/client.jar" quiet="true"/>
+        <jar destfile="${lib}/client.jar"
 		     index="false"
 		     manifest="${src}/com/sun/jini/example/hello/client.mf">
-			<fileset dir="${build.classes}" includesfile="${example-client.deps}"/>
-		</jar>
-	</target>
-	<target name="mdprefld.jar"
+            <fileset dir="${build.classes}" includesfile="${example-client.deps}"/>
+        </jar>
+    </target>
+    <target name="mdprefld.jar"
 		depends="compile">
-		<delete file="${build.lib}/mdprefld.jar" quiet="true"/>
-		<jar destfile="${build.lib}/mdprefld.jar" 
+        <delete file="${lib}/mdprefld.jar" quiet="true"/>
+        <jar destfile="${lib}/mdprefld.jar"
 		     index="false">
-			<fileset dir="${build.classes}"
+            <fileset dir="${build.classes}"
 				 includes="com/sun/jini/example/hello/MdClassAnnotationProvider.class"/>
-		</jar>
-        </target>
-        <target name="server.jar" depends="compile">
-		<property name="example-server.deps" location="${build.deps}/example-server.deps"/>
-		<java classname="com.sun.jini.tool.ClassDep"
+        </jar>
+    </target>
+    <target name="server.jar" depends="compile">
+        <property name="example-server.deps" location="${build.deps}/example-server.deps"/>
+        <java classname="com.sun.jini.tool.ClassDep"
 		      failonerror="true"
 		      output="${example-server.deps}">
-			<classpath refid="path.classdep"/>
-			<arg value="-cp"/>
-			<arg path="${build.classes}"/>
-			<arg value="-files"/>
-			<arg line="${jskplatform.exclude}"/>
-			<arg line="-in net.jini"/>
-			<arg line="-in com.sun.jini"/>
-			<arg value="com.sun.jini.example.hello.Server"/>
-			<arg value="com.sun.jini.example.hello.Server_Stub"/>
-			<arg value="com.sun.jini.example.hello.ConfirmingILFactory"/>
-			<arg value="com.sun.jini.example.hello.ConfirmingInvocationHandler"/>
-			<arg value="com.sun.jini.example.hello.ServerPermission"/>
-		</java>
-		<delete file="${build.lib}/server.jar" quiet="true"/>
-		<jar destfile="${build.lib}/server.jar" 
+            <classpath refid="path.classdep"/>
+            <arg value="-cp"/>
+            <arg path="${build.classes}"/>
+            <arg value="-files"/>
+            <arg line="${jskplatform.exclude}"/>
+            <arg line="-in net.jini"/>
+            <arg line="-in com.sun.jini"/>
+            <arg value="com.sun.jini.example.hello.Server"/>
+            <arg value="com.sun.jini.example.hello.Server_Stub"/>
+            <arg value="com.sun.jini.example.hello.ConfirmingILFactory"/>
+            <arg value="com.sun.jini.example.hello.ConfirmingInvocationHandler"/>
+            <arg value="com.sun.jini.example.hello.ServerPermission"/>
+        </java>
+        <delete file="${lib}/server.jar" quiet="true"/>
+        <jar destfile="${lib}/server.jar"
 		     index="false"
 		     manifest="${src}/com/sun/jini/example/hello/server.mf">
-		  <fileset dir="${build.classes}"  includesfile="${example-server.deps}"/>
-		</jar>
-	</target>
-	<target name="server-act.jar"
+            <fileset dir="${build.classes}"  includesfile="${example-server.deps}"/>
+        </jar>
+    </target>
+    <target name="server-act.jar"
 		depends="compile">
-		<property name="example-server-act.deps" location="${build.deps}/example-server-act.deps"/>
-		<java classname="com.sun.jini.tool.ClassDep"
+        <property name="example-server-act.deps" location="${build.deps}/example-server-act.deps"/>
+        <java classname="com.sun.jini.tool.ClassDep"
 		      failonerror="true"
 		      output="${example-server-act.deps}">	      
-			<classpath refid="path.classdep"/>
-			<arg value="-cp"/>
-			<arg path="${build.classes}"/>
-			<arg value="-files"/>
-			<arg line="${jskplatform.exclude}"/>
-			<arg line="-in net.jini"/>
-			<arg line="-in com.sun.jini"/>
-			<arg value="com.sun.jini.example.hello.ActivatableServer"/>
-			<arg value="com.sun.jini.example.hello.ConfirmingILFactory"/>
-			<arg value="com.sun.jini.example.hello.ConfirmingInvocationHandler"/>
-			<arg value="com.sun.jini.example.hello.Server"/>
-			<arg value="com.sun.jini.example.hello.Server_Stub"/>
-			<arg value="com.sun.jini.example.hello.ServerPermission"/>
-		</java>
-		<delete file="${build.lib}/server-act.jar" quiet="true"/>
-		<jar destfile="${build.lib}/server-act.jar" 
+            <classpath refid="path.classdep"/>
+            <arg value="-cp"/>
+            <arg path="${build.classes}"/>
+            <arg value="-files"/>
+            <arg line="${jskplatform.exclude}"/>
+            <arg line="-in net.jini"/>
+            <arg line="-in com.sun.jini"/>
+            <arg value="com.sun.jini.example.hello.ActivatableServer"/>
+            <arg value="com.sun.jini.example.hello.ConfirmingILFactory"/>
+            <arg value="com.sun.jini.example.hello.ConfirmingInvocationHandler"/>
+            <arg value="com.sun.jini.example.hello.Server"/>
+            <arg value="com.sun.jini.example.hello.Server_Stub"/>
+            <arg value="com.sun.jini.example.hello.ServerPermission"/>
+        </java>
+        <delete file="${lib}/server-act.jar" quiet="true"/>
+        <jar destfile="${lib}/server-act.jar"
 		     index="false"
 		     manifest="${src}/com/sun/jini/example/hello/server-act.mf">
-			<fileset dir="${build.classes}" includesfile="${example-server-act.deps}"/>
-		</jar>
-	</target>
-	<target name="server-dl.jar"
+            <fileset dir="${build.classes}" includesfile="${example-server-act.deps}"/>
+        </jar>
+    </target>
+    <target name="server-dl.jar"
 		depends="compile">
-		<property name="example-server-dl.deps" location="${build.deps}/example-server-dl.deps"/>
-		<java classname="com.sun.jini.tool.ClassDep"
+        <property name="example-server-dl.deps" location="${build.deps}/example-server-dl.deps"/>
+        <java classname="com.sun.jini.tool.ClassDep"
 		      failonerror="true"
 		      output="${example-server-dl.deps}">
-			<classpath refid="path.classdep"/>
-			<arg value="-cp"/>
-			<arg path="${build.classes}"/>
-			<arg value="-files"/>
-			<arg line="${jskplatform.exclude}"/>
-			<arg line="-in net.jini"/>
-			<arg line="-in com.sun.jini"/>
-			<arg value="com.sun.jini.example.hello.ConfirmingInvocationHandler"/>
-			<arg value="com.sun.jini.example.hello.Hello"/>
-			<arg value="com.sun.jini.example.hello.Proxy"/>
-			<arg value="com.sun.jini.example.hello.Server_Stub"/>
-			<arg value="com.sun.jini.example.hello.ServerPermission"/>
+            <classpath refid="path.classdep"/>
+            <arg value="-cp"/>
+            <arg path="${build.classes}"/>
+            <arg value="-files"/>
+            <arg line="${jskplatform.exclude}"/>
+            <arg line="-in net.jini"/>
+            <arg line="-in com.sun.jini"/>
+            <arg value="com.sun.jini.example.hello.ConfirmingInvocationHandler"/>
+            <arg value="com.sun.jini.example.hello.Hello"/>
+            <arg value="com.sun.jini.example.hello.Proxy"/>
+            <arg value="com.sun.jini.example.hello.Server_Stub"/>
+            <arg value="com.sun.jini.example.hello.ServerPermission"/>
 	    
-		</java>
-		<delete file="${build.lib}/server-dl.jar" quiet="true"/>
-		<jar destfile="${build.lib}/server-dl.jar"
+        </java>
+        <delete file="${lib}/server-dl.jar" quiet="true"/>
+        <jar destfile="${lib}/server-dl.jar"
 		     index="false">
-		  <fileset dir="${build.classes}"  includesfile="${example-server-dl.deps}"/>
-		  <metainf dir="${src}/com/sun/jini/example/hello/config/META-INF"/>
-		</jar>
-	</target>
-	<target name="hello.stubs">
-		<rmic base="${build.classes}" stubversion="1.2">
-			<classpath refid="path.jini"/>
-			<include name="com/sun/jini/example/hello/Server.class"/>
-		</rmic>
-	</target>
+            <fileset dir="${build.classes}"  includesfile="${example-server-dl.deps}"/>
+            <metainf dir="${src}/com/sun/jini/example/hello/config/META-INF"/>
+        </jar>
+    </target>
+    <target name="hello.stubs">
+        <rmic base="${build.classes}" stubversion="1.2">
+            <classpath refid="path.jini"/>
+            <include name="com/sun/jini/example/hello/Server.class"/>
+        </rmic>
+    </target>
 </project>
-