You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by jc...@apache.org on 2009/09/27 15:41:41 UTC
svn commit: r819307 - in /incubator/river/jtsk/trunk: build.xml common.xml
examples/hello/ examples/hello/build.xml qa/build.xml
qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java
qa/src/com/sun/jini/test/spec/url/httpmd/handler/ParseURL.java
Author: jcosters
Date: Sun Sep 27 13:41:40 2009
New Revision: 819307
URL: http://svn.apache.org/viewvc?rev=819307&view=rev
Log:
RIVER-301: Various small fixes and updates
Modified:
incubator/river/jtsk/trunk/build.xml
incubator/river/jtsk/trunk/common.xml
incubator/river/jtsk/trunk/examples/hello/ (props changed)
incubator/river/jtsk/trunk/examples/hello/build.xml
incubator/river/jtsk/trunk/qa/build.xml
incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java
incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/ParseURL.java
Modified: incubator/river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/build.xml?rev=819307&r1=819306&r2=819307&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/build.xml (original)
+++ incubator/river/jtsk/trunk/build.xml Sun Sep 27 13:41:40 2009
@@ -99,10 +99,11 @@
<include name="tools/**"/>
</zipfileset>
<zipfileset dir="${basedir}/examples" prefix="${product.name}/examples">
- <include name="**/lib/**"/>
+ <include name="**/${lib}/**"/>
<include name="**/config/**"/>
<include name="**/prebuiltkeys/**"/>
<include name="**/scripts/**"/>
+ <include name="**/${doc}/**"/>
<include name="**/*.html"/>
</zipfileset>
<zipfileset dir="${basedir}/examples"
@@ -143,10 +144,11 @@
<include name="tools/**"/>
</tarfileset>
<tarfileset dir="${basedir}/examples" prefix="${product.name}/examples">
- <include name="**/lib/**"/>
+ <include name="**/${lib}/**"/>
<include name="**/config/**"/>
<include name="**/prebuiltkeys/**"/>
<include name="**/scripts/**"/>
+ <include name="**/${doc}/**"/>
<include name="**/*.html"/>
</tarfileset>
<tarfileset dir="${basedir}/examples"
@@ -192,8 +194,9 @@
</zipfileset>
<zipfileset dir="${basedir}/examples" prefix="${product.name}/examples">
<include name="**"/>
- <exclude name="**/lib/"/>
- <exclude name="**/build/"/>
+ <exclude name="**/${lib}/"/>
+ <exclude name="**/${build}/"/>
+ <exclude name="**/${doc.api}/"/>
</zipfileset>
<zipfileset dir="${basedir}/examples"
prefix="${product.name}/examples"
@@ -237,8 +240,9 @@
</tarfileset>
<tarfileset dir="${basedir}/examples" prefix="${product.name}/examples">
<include name="**"/>
- <exclude name="**/lib/"/>
- <exclude name="**/build/"/>
+ <exclude name="**/${lib}/"/>
+ <exclude name="**/${build}/"/>
+ <exclude name="**/${doc.api}/"/>
</tarfileset>
<tarfileset dir="${basedir}/examples"
prefix="${product.name}/examples"
@@ -661,9 +665,7 @@
<target name="jini-ext.jar" depends="stubs">
<property name="jini-ext.deps" location="${build.deps.dir}/jini-ext.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${jini-ext.deps}">
+ <classdep output="${jini-ext.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -674,7 +676,7 @@
<arg line="-prune net.jini.core"/>
<arg path="${build.classes.dir}/net/jini"/>
<arg path="${build.classes.dir}/com/sun/jini/discovery"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/jini-ext.jar" quiet="true"/>
<jar destfile="${lib.dir}/jini-ext.jar"
index="false"
@@ -685,9 +687,7 @@
<target name="jsk-debug-policy.jar" depends="stubs">
<property name="jsk-debug-policy.deps" location="${build.deps.dir}/jsk-debug-policy.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${jsk-debug-policy.deps}">
+ <classdep output="${jsk-debug-policy.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -695,7 +695,7 @@
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.tool"/>
<arg value="com.sun.jini.tool.DebugDynamicPolicyProvider"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/jsk-debug-policy.jar" quiet="true"/>
<jar destfile="${lib.dir}/jsk-debug-policy.jar"
index="false"
@@ -706,9 +706,7 @@
<target name="jsk-dl.jar" depends="stubs">
<property name="jsk-dl.deps" location="${build.deps.dir}/jsk-dl.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${jsk-dl.deps}">
+ <classdep output="${jsk-dl.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -746,7 +744,7 @@
<arg value="net.jini.lease.RenewalFailureEvent"/>
<arg value="net.jini.lookup.DiscoveryAdmin"/>
<arg value="net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
- </java>
+ </classdep>
<delete file="${lib-dl.dir}/jsk-dl.jar" quiet="true"/>
<jar destfile="${lib-dl.dir}/jsk-dl.jar"
index="false">
@@ -757,9 +755,7 @@
<target name="jsk-lib.jar" depends="stubs">
<property name="jsk-lib.deps" location="${build.deps.dir}/jsk-lib.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${jsk-lib.deps}">
+ <classdep output="${jsk-lib.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -781,7 +777,7 @@
<arg value="com.sun.jini.phoenix.ActivationAdmin"/>
<arg value="com.sun.jini.start.LifeCycle"/>
<arg value="com.sun.jini.start.ServiceProxyAccessor"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/jsk-lib.jar" quiet="true"/>
<jar destfile="${lib.dir}/jsk-lib.jar"
index="false">
@@ -800,9 +796,7 @@
<target name="jsk-platform.jar" depends="jsk-resources.jar">
<property name="jsk-platform.deps" location="${build.deps.dir}/jsk-platform.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${jsk-platform.deps}">
+ <classdep output="${jsk-platform.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -828,7 +822,7 @@
<arg value="com.sun.jini.config.ConfigUtil"/>
<arg value="com.sun.jini.config.KeyStores"/>
<arg value="com.sun.jini.logging.LogManager"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/jsk-platform.jar" quiet="true"/>
<jar destfile="${lib.dir}/jsk-platform.jar"
index="false"
@@ -871,9 +865,7 @@
<target name="jsk-policy.jar" depends="stubs">
<property name="jsk-policy.deps" location="${build.deps.dir}/jsk-policy.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${jsk-policy.deps}">
+ <classdep output="${jsk-policy.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -882,7 +874,7 @@
<arg value="net.jini.security.policy.PolicyFileProvider"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
- </java>
+ </classdep>
<delete file="${lib-ext.dir}/jsk-policy.jar" quiet="true"/>
<jar destfile="${lib-ext.dir}/jsk-policy.jar"
index="false">
@@ -905,9 +897,7 @@
<target name="sun-util.jar" depends="stubs">
<property name="sun-util.deps" location="${build.deps.dir}/sun-util.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${sun-util.deps}">
+ <classdep output="${sun-util.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -919,7 +909,7 @@
<arg value="com.sun.jini.start.LifeCycle"/>
<arg value="com.sun.jini.start.ServiceProxyAccessor"/>
<arg line="-in com.sun.jini"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/sun-util.jar" quiet="true"/>
<jar destfile="${lib.dir}/sun-util.jar"
duplicate="preserve"
@@ -945,9 +935,7 @@
<target name="sdm-dl.jar" depends="stubs">
<property name="sdm-dl.deps" location="${build.deps.dir}/sdm-dl.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${sdm-dl.deps}">
+ <classdep output="${sdm-dl.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -957,7 +945,7 @@
<arg line="-in net.jini"/>
<arg value="com.sun.jini.proxy.BasicProxyTrustVerifier"/>
<arg value="net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
- </java>
+ </classdep>
<delete file="${lib-dl.dir}/sdm-dl.jar" quiet="true"/>
<jar destfile="${lib-dl.dir}/sdm-dl.jar"
index="false">
@@ -1267,9 +1255,7 @@
<target name="browser.jar" depends="stubs">
<property name="browser.deps" location="${build.deps.dir}/browser.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${browser.deps}">
+ <classdep output="${browser.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1279,7 +1265,7 @@
<arg value="com.sun.jini.example.browser.Browser"/>
<arg value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>
<arg value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/browser.jar" quiet="true"/>
<jar destfile="${lib.dir}/browser.jar"
index="false"
@@ -1290,9 +1276,7 @@
<target name="browser-dl.jar" depends="stubs">
<property name="browser-dl.deps" location="${build.deps.dir}/browser-dl.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${browser-dl.deps}">
+ <classdep output="${browser-dl.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1302,7 +1286,7 @@
<arg value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>
<arg value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
<arg value="com.sun.jini.proxy.BasicProxyTrustVerifier"/>
- </java>
+ </classdep>
<delete file="${lib-dl.dir}/browser-dl.jar" quiet="true"/>
<jar destfile="${lib-dl.dir}/browser-dl.jar"
index="false">
@@ -1330,9 +1314,7 @@
<target name="fiddler.jar" depends="stubs">
<property name="fiddler.deps" location="${build.deps.dir}/fiddler.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${fiddler.deps}">
+ <classdep output="${fiddler.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1344,7 +1326,7 @@
<arg value="com.sun.jini.fiddler.FiddlerImpl_Stub" />
<arg value="com.sun.jini.fiddler.NonActivatableFiddlerImpl" />
<arg value="com.sun.jini.fiddler.TransientFiddlerImpl"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/fiddler.jar" quiet="true" />
<jar destfile="${lib.dir}/fiddler.jar"
index="false"
@@ -1363,9 +1345,7 @@
<target name="fiddler-dl.jar" depends="stubs">
<property name="fiddler-dl.deps" location="${build.deps.dir}/fiddler-dl.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${fiddler-dl.deps}">
+ <classdep output="${fiddler-dl.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1383,7 +1363,7 @@
<arg value="com.sun.jini.reliableLog.LogException"/>
<arg value="net.jini.discovery.RemoteDiscoveryEvent"/>
<arg value="net.jini.lookup.entry.ServiceInfo"/>
- </java>
+ </classdep>
<delete file="${lib-dl.dir}/fiddler-dl.jar" quiet="true"/>
<jar destfile="${lib-dl.dir}/fiddler-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${fiddler-dl.deps}" />
@@ -1410,9 +1390,7 @@
<target name="mahalo.jar" depends="stubs">
<property name="mahalo.deps" location="${build.deps.dir}/mahalo.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${mahalo.deps}">
+ <classdep output="${mahalo.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1424,7 +1402,7 @@
<arg value="com.sun.jini.mahalo.TransientMahaloImpl"/>
<arg value="com.sun.jini.mahalo.MahaloPermission"/>
<arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/mahalo.jar" quiet="true" />
<jar destfile="${lib.dir}/mahalo.jar" index="false"
manifest="${src.manifest.dir}/mahalo.mf">
@@ -1442,9 +1420,7 @@
<target name="mahalo-dl.jar" depends="stubs">
<property name="mahalo-dl.deps" location="${build.deps.dir}/mahalo-dl.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${mahalo-dl.deps}">
+ <classdep output="${mahalo-dl.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1461,7 +1437,7 @@
<arg value="com.sun.jini.mahalo.TxnMgrAdminProxy"/>
<arg value="com.sun.jini.mahalo.InternalManagerException"/>
<arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"/>
- </java>
+ </classdep>
<delete file="${lib-dl.dir}/mahalo-dl.jar" quiet="true" />
<jar destfile="${lib-dl.dir}/mahalo-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${mahalo-dl.deps}" />
@@ -1488,9 +1464,7 @@
<target name="mercury.jar" depends="stubs">
<property name="mercury.deps" location="${build.deps.dir}/mercury.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${mercury.deps}">
+ <classdep output="${mercury.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1502,7 +1476,7 @@
<arg value="com.sun.jini.mercury.TransientMercuryImpl"/>
<arg value="com.sun.jini.mercury.MercuryPermission" />
<arg value="com.sun.jini.mercury.MailboxImpl_Stub" />
- </java>
+ </classdep>
<delete file="${lib.dir}/mercury.jar" quiet="true" />
<jar destfile="${lib.dir}/mercury.jar" index="false"
manifest="${src.manifest.dir}/mercury.mf">
@@ -1520,9 +1494,7 @@
<target name="mercury-dl.jar" depends="stubs">
<property name="mercury-dl.deps" location="${build.deps.dir}/mercury-dl.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${mercury-dl.deps}">
+ <classdep output="${mercury-dl.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1542,7 +1514,7 @@
<arg value="com.sun.jini.reliableLog.LogException"/>
<arg value="net.jini.lookup.entry.Name"/>
<arg value="net.jini.lookup.entry.ServiceInfo"/>
- </java>
+ </classdep>
<delete file="${lib-dl.dir}/mercury-dl.jar" quiet="true" />
<jar destfile="${lib-dl.dir}/mercury-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${mercury-dl.deps}" />
@@ -1570,9 +1542,7 @@
<target name="norm.jar" depends="stubs">
<property name="norm.deps" location="${build.deps.dir}/norm.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${norm.deps}">
+ <classdep output="${norm.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1585,7 +1555,7 @@
<arg value="com.sun.jini.norm.PersistentNormServerImpl"/>
<arg value="com.sun.jini.norm.TransientNormServerImpl"/>
<arg value="com.sun.jini.reliableLog.LogException"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/norm.jar" quiet="true" />
<jar destfile="${lib.dir}/norm.jar" index="false"
manifest="${src.manifest.dir}/norm.mf">
@@ -1603,9 +1573,7 @@
<target name="norm-dl.jar" depends="stubs">
<property name="norm-dl.deps" location="${build.deps.dir}/norm-dl.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${norm-dl.deps}">
+ <classdep output="${norm-dl.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1622,7 +1590,7 @@
<arg value="com.sun.jini.reliableLog.LogException"/>
<arg value="com.sun.jini.start.ServiceProxyAccessor"/>
<arg value="net.jini.lookup.entry.ServiceInfo"/>
- </java>
+ </classdep>
<delete file="${lib-dl.dir}/norm-dl.jar" quiet="true" />
<jar destfile="${lib-dl.dir}/norm-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${norm-dl.deps}" />
@@ -1651,9 +1619,7 @@
<target name="outrigger-snaplogstore.jar" depends="stubs">
<property name="outrigger-snaplogstore.deps" location="${build.deps.dir}/outrigger-snaplogstore.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${outrigger-snaplogstore.deps}">
+ <classdep output="${outrigger-snaplogstore.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1661,7 +1627,7 @@
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.outrigger.snaplogstore" />
<arg value="com.sun.jini.outrigger.snaplogstore.LogStore"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/outrigger-snaplogstore.jar" quiet="true" />
<jar destfile="${lib.dir}/outrigger-snaplogstore.jar" index="false">
<fileset dir="${build.classes.dir}"
@@ -1671,9 +1637,7 @@
<target name="outrigger.jar" depends="stubs,outrigger-snaplogstore.jar">
<property name="outrigger.deps" location="${build.deps.dir}/outrigger.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${outrigger.deps}">
+ <classdep output="${outrigger.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1684,7 +1648,7 @@
<arg value="com.sun.jini.outrigger.OutriggerServerWrapper_Stub" />
<arg value="com.sun.jini.outrigger.PersistentOutriggerImpl" />
<arg value="com.sun.jini.outrigger.TransientOutriggerImpl"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/outrigger.jar" quiet="true"/>
<jar destfile="${lib.dir}/outrigger.jar" index="false"
manifest="${src.manifest.dir}/outrigger.mf">
@@ -1695,9 +1659,7 @@
<target name="outrigger-dl.jar" depends="compile">
<property name="outrigger-dl.deps" location="${build.deps.dir}/outrigger-dl.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${outrigger-dl.deps}">
+ <classdep output="${outrigger-dl.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1713,7 +1675,7 @@
<arg value="com.sun.jini.outrigger.ProxyVerifier"/>
<arg value="net.jini.lookup.entry.ServiceInfo"/>
<arg value="net.jini.space.InternalSpaceException"/>
- </java>
+ </classdep>
<delete file="${lib-dl.dir}/outrigger-dl.jar" quiet="true" />
<jar destfile="${lib-dl.dir}/outrigger-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${outrigger-dl.deps}" />
@@ -1742,9 +1704,7 @@
<target name="phoenix.jar" depends="tools.jar">
<property name="phoenix.deps" location="${build.deps.dir}/phoenix.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${phoenix.deps}">
+ <classdep output="${phoenix.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1769,7 +1729,7 @@
<arg value="com.sun.jini.phoenix.AbstractRegistry_Skel"/>
<arg value="com.sun.jini.phoenix.AbstractRegistry_Stub"/>
<arg value="com.sun.jini.phoenix.AbstractSystem_Stub"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/phoenix.jar" quiet="true" />
<jar destfile="${lib.dir}/phoenix.jar" index="false"
manifest="${src.manifest.dir}/phoenix.mf">
@@ -1780,9 +1740,7 @@
<target name="phoenix-dl.jar" depends="stubs">
<property name="phoenix-dl.deps" location="${build.deps.dir}/phoenix-dl.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${phoenix-dl.deps}">
+ <classdep output="${phoenix-dl.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1801,7 +1759,7 @@
<arg value="com.sun.jini.phoenix.AbstractMonitor_Stub"/>
<arg value="com.sun.jini.phoenix.AbstractSystem_Stub"/>
<arg value="com.sun.jini.phoenix.AbstractRegistry_Stub"/>
- </java>
+ </classdep>
<delete file="${lib-dl.dir}/phoenix-dl.jar" quiet="true" />
<jar destfile="${lib-dl.dir}/phoenix-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${phoenix-dl.deps}" />
@@ -1820,9 +1778,7 @@
<target name="phoenix-group.jar" depends="stubs">
<property name="phoenix-group.deps" location="${build.deps.dir}/phoenix-group.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${phoenix-group.deps}">
+ <classdep output="${phoenix-group.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1835,7 +1791,7 @@
<arg value="com.sun.jini.phoenix.InstantiatorAccessExporter"/>
<arg value="com.sun.jini.phoenix.InstantiatorPermission"/>
<arg value="com.sun.jini.phoenix.AbstractInstantiator_Stub" />
- </java>
+ </classdep>
<delete file="${lib.dir}/phoenix-group.jar" quiet="true" />
<jar destfile="${lib.dir}/phoenix-group.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${phoenix-group.deps}" />
@@ -1845,9 +1801,7 @@
<target name="phoenix-init.jar" depends="stubs">
<property name="phoenix-init.deps" location="${build.deps.dir}/phoenix-init.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${phoenix-init.deps}">
+ <classdep output="${phoenix-init.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1856,7 +1810,7 @@
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
<arg value="com.sun.jini.phoenix.ActivationGroupInit" />
- </java>
+ </classdep>
<delete file="${lib.dir}/phoenix-init.jar" quiet="true" />
<jar destfile="${lib.dir}/phoenix-init.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${phoenix-init.deps}" />
@@ -1879,9 +1833,7 @@
<target name="reggie.jar" depends="stubs">
<property name="reggie.deps" location="${build.deps.dir}/reggie.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${reggie.deps}">
+ <classdep output="${reggie.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1892,7 +1844,7 @@
<arg value="com.sun.jini.reggie.RegistrarPermission"/>
<arg value="com.sun.jini.reggie.RegistrarImpl_Stub" />
<arg value="com.sun.jini.reggie.TransientRegistrarImpl" />
- </java>
+ </classdep>
<delete file="${lib.dir}/reggie.jar" quiet="true" />
<jar destfile="${lib.dir}/reggie.jar" index="false"
manifest="${src.manifest.dir}/reggie.mf">
@@ -1910,9 +1862,7 @@
<target name="reggie-dl.jar" depends="stubs">
<property name="reggie-dl.deps" location="${build.deps.dir}/reggie-dl.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${reggie-dl.deps}">
+ <classdep output="${reggie-dl.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1930,7 +1880,7 @@
<arg value="com.sun.jini.reggie.Registration"/>
<arg value="com.sun.jini.reliableLog.LogException"/>
<arg value="net.jini.lookup.entry.ServiceInfo"/>
- </java>
+ </classdep>
<delete file="${lib-dl.dir}/reggie-dl.jar" quiet="true"/>
<jar destfile="${lib-dl.dir}/reggie-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${reggie-dl.deps}" />
@@ -1967,9 +1917,7 @@
<target name="destroy.jar" depends="stubs">
<property name="destroy.deps" location="${build.deps.dir}/destroy.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${destroy.deps}">
+ <classdep output="${destroy.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -1977,7 +1925,7 @@
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.start"/>
<arg value="com.sun.jini.start.DestroySharedGroup"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/destroy.jar" quiet="true"/>
<jar destfile="${lib.dir}/destroy.jar" index="false"
manifest="${src.manifest.dir}/destroy.mf">
@@ -1989,9 +1937,7 @@
<target name="group.jar" depends="stubs">
<property name="group.deps" location="${build.deps.dir}/group.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${group.deps}">
+ <classdep output="${group.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -2000,7 +1946,7 @@
<arg line="-in com.sun.jini.start"/>
<arg value="com.sun.jini.start.SharedGroupImpl" />
<arg value="com.sun.jini.start.SharedGroupImpl_Stub"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/group.jar" quiet="true"/>
<jar destfile="${lib.dir}/group.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${group.deps}" />
@@ -2009,9 +1955,7 @@
<target name="group-dl.jar" depends="stubs">
<property name="group-dl.deps" location="${build.deps.dir}/group-dl.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${group-dl.deps}">
+ <classdep output="${group-dl.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -2020,7 +1964,7 @@
<arg line="-in com.sun.jini.start"/>
<arg value="com.sun.jini.start.ProxyVerifier"/>
<arg value="com.sun.jini.start.SharedGroupImpl_Stub"/>
- </java>
+ </classdep>
<delete file="${lib-dl.dir}/group-dl.jar" quiet="true"/>
<jar destfile="${lib-dl.dir}/group-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${group-dl.deps}" />
@@ -2039,9 +1983,7 @@
<target name="sharedvm.jar" depends="stubs">
<property name="sharedvm.deps" location="${build.deps.dir}/sharedvm.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${sharedvm.deps}">
+ <classdep output="${sharedvm.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -2049,7 +1991,7 @@
<arg line="${jskplatform.exclude}"/>
<arg line="-in com.sun.jini" />
<arg value="com.sun.jini.start.ActivateWrapper"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/sharedvm.jar" quiet="true"/>
<jar destfile="${lib.dir}/sharedvm.jar" index="false"
manifest="${src.manifest.dir}/sharedvm.mf">
@@ -2059,9 +2001,7 @@
<target name="start.jar" depends="stubs">
<property name="start.deps" location="${build.deps.dir}/start.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${start.deps}">
+ <classdep output="${start.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -2072,7 +2012,7 @@
<arg value="com.sun.jini.start.SharedActivatableServiceDescriptor"/>
<arg value="com.sun.jini.start.SharedActivationGroupDescriptor" />
<arg value="com.sun.jini.start.NonActivatableServiceDescriptor" />
- </java>
+ </classdep>
<delete file="${lib.dir}/start.jar" quiet="true"/>
<jar destfile="${lib.dir}/start.jar" index="false"
manifest="${src.manifest.dir}/start.mf">
@@ -2101,9 +2041,7 @@
<target name="tools.jar" depends="river.jars">
<property name="tools.deps" location="${build.deps.dir}/tools.deps" />
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
- output="${tools.deps}">
+ <classdep output="${tools.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
@@ -2144,7 +2082,7 @@
<arg value="com.sun.jini.tool.envcheck.plugins.CheckPersistence"/>
<arg value="com.sun.jini.tool.envcheck.plugins.CheckPolicy" />
<arg value="com.sun.jini.tool.envcheck.plugins.FileAccessCheckTask" />
- </java>
+ </classdep>
<delete file="${lib.dir}/tools.jar" quiet="true" />
<jar destfile="${lib.dir}/tools.jar" index="false"
manifest="${src.manifest.dir}/tools.mf">
@@ -2192,7 +2130,7 @@
description="Compile all, including subcomponents">
<!-- Call qa subcomponent build -->
<ant dir="qa" target="compile" inheritall="false" />
- <!-- Call examples subcomponent build -->
+ <!-- Call examples/hello subcomponent build -->
<ant dir="examples/hello" target="compile" inheritall="false" />
</target>
@@ -2200,13 +2138,15 @@
description="Generate javadoc for all, including subcomponents">
<!-- Call qa subcomponent build -->
<ant dir="qa" target="doc" inheritall="false" />
+ <!-- Call examples/hello subcomponent build -->
+ <ant dir="examples/hello" target="doc" inheritall="false" />
</target>
<target name="all.jars" depends="jars"
description="Generate JAR files for all, including subcomponents">
<!-- Call qa subcomponent build -->
<ant dir="qa" target="jars" inheritall="false" />
- <!-- Call examples subcomponent build -->
+ <!-- Call examples/hello subcomponent build -->
<ant dir="examples/hello" target="jars" inheritall="false" />
</target>
Modified: incubator/river/jtsk/trunk/common.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/common.xml?rev=819307&r1=819306&r2=819307&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/common.xml (original)
+++ incubator/river/jtsk/trunk/common.xml Sun Sep 27 13:41:40 2009
@@ -115,15 +115,11 @@
<macrodef name="classdep" description="Run ClassDep">
<attribute name="output"/>
- <attribute name="cp" default="build/classes"/>
<element name="cd-elements" implicit="yes" />
<sequential>
<java classname="com.sun.jini.tool.ClassDep"
- failonerror="true"
+ failonerror="true" logError="true"
output="@{output}">
- <arg value="-cp"/>
- <arg path="@{cp}"/>
- <arg value="-files"/>
<cd-elements />
</java>
</sequential>
Propchange: incubator/river/jtsk/trunk/examples/hello/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Sep 27 13:41:40 2009
@@ -1,2 +1,3 @@
lib
+doc
build
Modified: incubator/river/jtsk/trunk/examples/hello/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/examples/hello/build.xml?rev=819307&r1=819306&r2=819307&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/examples/hello/build.xml (original)
+++ incubator/river/jtsk/trunk/examples/hello/build.xml Sun Sep 27 13:41:40 2009
@@ -35,9 +35,6 @@
<property name="river.classes.dir" location="${river.home}/build/classes"/>
<property name="river.src.dir" location="${river.home}/src"/>
- <!-- directory settings -->
- <property name="trust.dir" location="harness/trust"/>
-
<!-- javadoc setings -->
<property name="javadoc.doc-title" value="Apache River v${version} Hello Example API Documentation"/>
<property name="javadoc.win-title" value="${javadoc.doc-title}"/>
@@ -58,20 +55,21 @@
<!-- classpath for use by ClassDep in this build -->
<path id="classdep.cp">
<path refid="river.classpath"/>
- <path location="${build.classes.dir}"/>
+ <pathelement location="${build.classes.dir}"/>
</path>
<path id="javadoc.classpath">
<path refid="river.classpath"/>
- <path location="${build.classes.dir}"/>
+ <pathelement location="${build.classes.dir}"/>
</path>
<property name="config.dir" location="config"/>
<target name="clean" depends=""
description="Removes all files and dirs created by the build">
- <delete dir="${build.dir}" quiet="true"/>
- <delete dir="${lib.dir}" quiet="true"/>
+ <delete dir="${build.dir}"/>
+ <delete dir="${lib.dir}"/>
+ <delete dir="${doc.dir}"/>
</target>
<target name="compile" depends="prep" description="Build classes">
@@ -80,13 +78,41 @@
</javac-cmd>
</target>
-
<target name="prep" description="Prepare the build">
<mkdir dir="${build.dir}" />
<mkdir dir="${build.classes.dir}" />
<mkdir dir="${build.deps.dir}" />
<mkdir dir="${lib.dir}" />
</target>
+
+ <target name="doc" depends="compile"
+ description="Generate javadoc documentation">
+ <delete dir="${doc.api.dir}" quiet="true"/>
+ <mkdir dir="${doc.api.dir}"/>
+
+ <!-- TODO: find out why this takes so much memory on Windows -->
+ <javadoc author="true"
+ breakiterator="yes"
+ destdir="${doc.api.dir}"
+ doctitle="${javadoc.doc-title}"
+ serialwarn="false"
+ source="1.4"
+ linkoffline="${jdk.doc.url} ${jdk.packages}"
+ use="true"
+ version="true"
+ windowtitle="${javadoc.win-title}"
+ maxmemory="96M">
+ <bottom><![CDATA[${api.copyright}]]></bottom>
+ <classpath refid="javadoc.classpath"/>
+ <sourcepath>
+ <pathelement path="${src.dir}"/>
+ </sourcepath>
+ <package name="com.sun.jini.example.hello.*"/>
+ </javadoc>
+
+ <mkdir dir="${doc.api.dir}/doc-files"/>
+ <copy file="${root}/NOTICE" tofile="${doc.api.dir}/doc-files/NOTICE"/>
+ </target>
<target name="jars"
depends="client.jar,
@@ -97,12 +123,9 @@
</target>
-
<target name="client.jar" depends="stubs">
<property name="example-client.deps" location="${build.deps.dir}/example-client.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true" logError="true"
- output="${example-client.deps}">
+ <classdep output="${example-client.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg pathref="classdep.cp"/>
@@ -111,7 +134,7 @@
<arg line="-in net.jini"/>
<arg line="-in com.sun.jini"/>
<arg value="com.sun.jini.example.hello.Client"/>
- </java>
+ </classdep>
<delete file="${lib.dir}/client.jar" quiet="true"/>
<jar destfile="${lib.dir}/client.jar"
index="false"
@@ -131,9 +154,7 @@
<target name="server.jar" depends="stubs">
<property name="example-server.deps" location="${build.deps.dir}/example-server.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true" logError="true"
- output="${example-server.deps}">
+ <classdep output="${example-server.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg pathref="classdep.cp"/>
@@ -146,7 +167,7 @@
<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>
+ </classdep>
<delete file="${lib.dir}/server.jar" quiet="true"/>
<jar destfile="${lib.dir}/server.jar"
index="false"
@@ -157,9 +178,7 @@
<target name="server-act.jar" depends="stubs">
<property name="example-server-act.deps" location="${build.deps.dir}/example-server-act.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true" logError="true"
- output="${example-server-act.deps}">
+ <classdep output="${example-server-act.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg pathref="classdep.cp"/>
@@ -173,7 +192,7 @@
<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>
+ </classdep>
<delete file="${lib.dir}/server-act.jar" quiet="true"/>
<jar destfile="${lib.dir}/server-act.jar"
index="false"
@@ -184,9 +203,7 @@
<target name="server-dl.jar" depends="stubs">
<property name="example-server-dl.deps" location="${build.deps.dir}/example-server-dl.deps"/>
- <java classname="com.sun.jini.tool.ClassDep"
- failonerror="true" logError="true"
- output="${example-server-dl.deps}">
+ <classdep output="${example-server-dl.deps}">
<classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg pathref="classdep.cp"/>
@@ -199,8 +216,7 @@
<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>
+ </classdep>
<delete file="${lib.dir}/server-dl.jar" quiet="true"/>
<jar destfile="${lib.dir}/server-dl.jar"
index="false">
Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=819307&r1=819306&r2=819307&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Sun Sep 27 13:41:40 2009
@@ -55,6 +55,13 @@
<pathelement location="${river.home}/tools/asm-commons-3.2.jar"/>
</path>
+ <!-- classpath for use by ClassDep in this build -->
+ <path id="classdep.cp">
+ <path refid="river.classpath"/>
+ <pathelement location="${build.classes.dir}"/>
+ <!--<pathelement location="${river.classes.dir}"/>-->
+ </path>
+
<path id="javadoc.classpath">
<path refid="river.classpath"/>
<path location="${build.classes.dir}"/>
@@ -129,7 +136,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">
<!-- 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}" />
@@ -306,7 +313,10 @@
<target name="harness-killer.jar" depends="harness-killer.stubs">
<property name="harness-killer.deps" location="${build.deps.dir}/harness-killer.deps" />
<delete file="${lib.dir}/harness-killer.jar" quiet="true"/>
- <classdep output="${harness-killer.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${harness-killer.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
<arg line="${jskplatform.exclude}"/>
@@ -323,7 +333,10 @@
<target name="harness-killer-dl.jar" depends="harness-killer.stubs">
<property name="harness-killer-dl.deps" location="${build.deps.dir}/harness-killer-dl.deps" />
<delete file="${lib.dir}/harness-killer-dl.jar" quiet="true"/>
- <classdep output="${harness-killer-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${harness-killer-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg value="com.sun.jini.qa.harness.VMKiller"/>
<arg value="com.sun.jini.qa.harness.KillerImpl_Stub"/>
@@ -344,7 +357,10 @@
<target name="nonactivatablegroup.jar" depends="nonactivatablegroup.stubs">
<property name="nonactivatablegroup.deps" location="${build.deps.dir}/nonactivatablegroup.deps" />
<delete file="${lib.dir}/nonactivatablegroup.jar" quiet="true"/>
- <classdep output="${nonactivatablegroup.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${nonactivatablegroup.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="${jskplatform.exclude}"/>
<arg line="-out com.sun.jini.start" />
@@ -361,7 +377,10 @@
<target name="nonactivatablegroup-dl.jar" depends="nonactivatablegroup.stubs">
<property name="nonactivatablegroup-dl.deps" location="${build.deps.dir}/nonactivatablegroup-dl.deps" />
<delete file="${lib.dir}/nonactivatablegroup-dl.jar" quiet="true"/>
- <classdep output="${nonactivatablegroup-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${nonactivatablegroup-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg value="com.sun.jini.qa.harness.NonActivatableGroupImpl$$GroupImpl_Stub"/>
<classpath refid="classdep.classpath"/>
@@ -375,7 +394,10 @@
<target name="mergedpolicyprovider.jar" depends="compile">
<property name="mergedpolicyprovider.deps" location="${build.deps.dir}/mergedpolicyprovider.deps" />
<delete file="${lib.dir}/mergedpolicyprovider-dl.jar" quiet="true"/>
- <classdep output="${mergedpolicyprovider.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${mergedpolicyprovider.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.qa"/>
<arg value="com.sun.jini.qa.harness.MergedPolicyProvider"/>
<classpath refid="classdep.classpath"/>
@@ -417,7 +439,10 @@
<target name="qa1-fiddler-dl.jar" depends="qa1-fiddler.stubs">
<property name="qa1-fiddler-dl.deps" location="${build.deps.dir}/qa1-fiddler-dl.deps" />
<delete file="${lib.dir}/qa1-fiddler-dl.jar" quiet="true"/>
- <classdep output="${qa1-fiddler-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-fiddler-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg value="com.sun.jini.test.share.AttributesUtil$$TestAttr00"/>
<arg value="com.sun.jini.test.share.AttributesUtil$$TestAttrSC00"/>
@@ -442,7 +467,10 @@
<target name="qa1-joinmanager-dl.jar" depends="qa1-joinmanager.stubs">
<property name="qa1-joinmanager-dl.deps" location="${build.deps.dir}/qa1-joinmanager-dl.deps" />
<delete file="${lib.dir}/qa1-joinmanager-dl.jar" quiet="true"/>
- <classdep output="${qa1-joinmanager-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-joinmanager-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg value="com.sun.jini.test.spec.joinmanager.AbstractBaseTest$$TestService"/>
<arg value="com.sun.jini.test.impl.joinmanager.LeaseRenewDurRFE$$TestServiceProxy$$ConstrainableTestServiceProxy"/>
@@ -481,7 +509,10 @@
<target name="qa1-mercury.jar" depends="qa1-mercury.stubs">
<property name="qa1-mercury.deps" location="${build.deps.dir}/qa1-mercury.deps" />
<delete file="${lib.dir}/qa1-mercury.jar" quiet="true"/>
- <classdep output="${qa1-mercury.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-mercury.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg value="com.sun.jini.test.impl.mercury.NSOListenerImpl"/>
<arg value="com.sun.jini.test.impl.mercury.REListenerImpl"/>
@@ -502,11 +533,14 @@
<fileset dir="${build.classes.dir}" includesfile="${qa1-mercury.deps}" />
<fileset dir="${river.classes.dir}" includesfile="${qa1-mercury.deps}" />
</jar>
- <classdep output="${qa1-mercury.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-mercury.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
<arg line="-hide com.sun.jini.test"/>
- <arg value="com.sun.jini.test.impl.mercury.NSOListenerImp"/>
+ <arg value="com.sun.jini.test.impl.mercury.NSOListenerImpl"/>
<arg value="com.sun.jini.test.impl.mercury.REListenerImpl"/>
<arg value="com.sun.jini.test.impl.mercury.UEListenerImpl"/>
<arg value="com.sun.jini.test.impl.mercury.DisableListenerImpl"/>
@@ -530,7 +564,10 @@
<target name="qa1-mercury-dl.jar" depends="qa1-mercury.stubs">
<property name="qa1-mercury-dl.deps" location="${build.deps.dir}/qa1-mercury-dl.deps" />
<delete file="${lib.dir}/qa1-mercury-dl.jar" quiet="true"/>
- <classdep output="${qa1-mercury-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-mercury-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg value="com.sun.jini.test.impl.mercury.DisableListenerImpl_Stub"/>
<arg value="com.sun.jini.test.impl.mercury.DisableNSOListenerImpl_Stub"/>
@@ -552,7 +589,10 @@
<include name="net/jini/lookup/entry/Name.class"/>
</fileset>
</jar>
- <classdep output="${qa1-mercury-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-mercury-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
<arg line="${jskplatform.exclude}"/>
@@ -575,7 +615,10 @@
<target name="qa1-mercury-bogusimpl.jar" depends="compile">
<property name="qa1-mercury-bogusimpl.deps" location="${build.deps.dir}/qa1-mercury-bogusimpl.deps" />
<delete file="${lib.dir}/qa1-mercury-bogusimpl.jar" quiet="true"/>
- <classdep output="${qa1-mercury-bogusimpl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-mercury-bogusimpl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<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"/>
@@ -596,7 +639,10 @@
<target name="qa1-norm-dl.jar" depends="qa1-norm.stubs">
<property name="qa1-norm-dl.deps" location="${build.deps.dir}/qa1-norm-dl.deps" />
<delete file="${lib.dir}/qa1-norm-dl.jar" quiet="true"/>
- <classdep output="${qa1-norm-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-norm-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg value="com.sun.jini.test.impl.norm.LocalLease"/>
<arg value="com.sun.jini.test.impl.norm.ConstrainableLocalLease"/>
@@ -639,7 +685,10 @@
<target name="qa1-outrigger-dl.jar" depends="qa1-outrigger.stubs">
<property name="qa1-outrigger-dl.deps" location="${build.deps.dir}/qa1-outrigger-dl.deps" />
<delete file="${lib.dir}/qa1-outrigger-dl.jar" quiet="true"/>
- <classdep output="${qa1-outrigger-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-outrigger-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg value="com.sun.jini.test.impl.outrigger.transaction.SimpleEventListener"/>
<arg value="com.sun.jini.test.impl.outrigger.matching.ARemoteInterfaceImpl"/>
@@ -679,7 +728,10 @@
<target name="jinitests.jar" depends="stubs">
<property name="jinitests.deps" location="${build.deps.dir}/jinitests.deps" />
<delete file="${lib.dir}/jinitests.jar" quiet="true"/>
- <classdep output="${jinitests.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${jinitests.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="-in com.sun.jini.fiddler"/>
<arg line="${jskprivate.include}" />
@@ -695,7 +747,10 @@
<fileset dir="${build.classes.dir}" includes="${resources}"
excludes="com/sun/jini/qa*, com/sun/jini/tool*" />
</jar>
- <classdep output="${jinitests.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${jinitests.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="-in com.sun.jini.fiddler"/>
<arg line="${jskprivate.include}" />
@@ -706,7 +761,10 @@
<fileset dir="${build.classes.dir}" includesfile="${jinitests.deps}" />
<fileset dir="${river.classes.dir}" includesfile="${jinitests.deps}" />
</jar>
- <classdep output="${jinitests.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${jinitests.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="-in com.sun.jini.fiddler"/>
<arg line="${jskprivate.include}" />
@@ -733,7 +791,10 @@
<target name="qa1-mainwrapper.jar" depends="compile">
<property name="qa1-mainwrapper.deps" location="${build.deps.dir}/qa1-mainwrapper.deps" />
<delete file="${lib.dir}/qa1-mainwrapper.jar" quiet="true"/>
- <classdep output="${qa1-mainwrapper.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-mainwrapper.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="com.sun.jini.qa.harness.MainWrapper"/>
<classpath refid="classdep.classpath"/>
@@ -747,7 +808,10 @@
<target name="jiniharness.jar" depends="compile">
<property name="jiniharness.deps" location="${build.deps.dir}/jiniharness.deps" />
<delete file="${lib.dir}/jiniharness.jar" quiet="true"/>
- <classdep output="${jiniharness.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${jiniharness.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg path="${build.classes.dir}/com/sun/jini/qa/harness"/>
<arg line="${jskprivate.include}" />
<arg line="-in com.sun.jini.start"/>
@@ -772,7 +836,10 @@
<target name="qaman.jar" depends="compile">
<property name="qaman.deps" location="${build.deps.dir}/qaman.deps" />
<delete file="${lib.dir}/qaman.jar" quiet="true"/>
- <classdep output="${qaman.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qaman.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-show com.sun.jini.test"/>
<arg line="-show com.sun.jini.qa"/>
@@ -803,7 +870,10 @@
<target name="qa1-start-probe-dl.jar" depends="qa1-start.stubs">
<property name="qa1-start-probe-dl.deps" location="${build.deps.dir}/qa1-start-probe-dl.deps" />
<delete file="${lib.dir}/qa1-start-probe-dl.jar" quiet="true"/>
- <classdep output="${qa1-start-probe-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-start-probe-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="com.sun.jini.test.impl.start.ProbeImpl"/>
<arg line="com.sun.jini.test.impl.start.BadServiceProxyAccessorImpl"/>
@@ -820,7 +890,10 @@
<target name="qa1-start-probe.jar" depends="qa1-start.stubs">
<property name="qa1-start-probe.deps" location="${build.deps.dir}/qa1-start-probe.deps" />
<delete file="${lib.dir}/qa1-start-probe.jar" quiet="true"/>
- <classdep output="${qa1-start-probe.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-start-probe.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="com.sun.jini.test.impl.start.ProbeImpl"/>
<arg line="com.sun.jini.test.impl.start.BadServiceProxyAccessorImpl"/>
@@ -834,7 +907,10 @@
<fileset dir="${build.classes.dir}" includesfile="${qa1-start-probe.deps}"/>
<fileset dir="${river.classes.dir}" includesfile="${qa1-start-probe.deps}"/>
</jar>
- <classdep output="${qa1-start-probe.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-start-probe.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
<arg line="${jskplatform.exclude}" />
@@ -871,7 +947,10 @@
<include name="com/sun/jini/test/impl/start/aggregatepolicyprovider/UntrustedGetContextClassLoader.class" />
</fileset>
</jar>
- <classdep output="${qa1-start-tests.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-start-tests.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-out com.sun.jini.harness"/>
<arg line="-out com.sun.jini.qa.harness"/>
@@ -891,7 +970,10 @@
<target name="qa1-start-testservice1.jar" depends="qa1-start.stubs">
<property name="qa1-start-testservice1.deps" location="${build.deps.dir}/qa1-start-testservice1.deps" />
<delete file="${lib.dir}/qa1-start-testservice1.jar" quiet="true"/>
- <classdep output="${qa1-start-testservice1.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-start-testservice1.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceImpl"/>
<classpath refid="classdep.classpath"/>
@@ -905,7 +987,10 @@
<include name="com/sun/jini/test/impl/start/TestServiceDummyClass2.class"/>
</fileset>
</jar>
- <classdep output="${qa1-start-testservice1.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-start-testservice1.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-hide com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceImpl"/>
@@ -936,7 +1021,10 @@
<target name="qa1-start-testservice2.jar" depends="qa1-start.stubs">
<property name="qa1-start-testservice2.deps" location="${build.deps.dir}/qa1-start-testservice2.deps" />
<delete file="${lib.dir}/qa1-start-testservice2.jar" quiet="true"/>
- <classdep output="${qa1-start-testservice2.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-start-testservice2.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceImpl"/>
<classpath refid="classdep.classpath"/>
@@ -950,7 +1038,10 @@
<include name="com/sun/jini/test/impl/start/TestServiceDummyClass3.class"/>
</fileset>
</jar>
- <classdep output="${qa1-start-testservice2.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-start-testservice2.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-hide com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceImpl"/>
@@ -981,10 +1072,12 @@
<target name="qa1-start-testservice-common.jar" depends="qa1-start.stubs">
<property name="qa1-start-testservice-common.deps" location="${build.deps.dir}/qa1-start-testservice-common.deps" />
<delete file="${lib.dir}/qa1-start-testservice-common.jar" quiet="true"/>
- <classdep output="${qa1-start-testservice-common.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-start-testservice-common.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceDummyClass0"/>
- <arg line="com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceSharedMap"/>
<classpath refid="classdep.classpath"/>
</classdep>
@@ -997,7 +1090,10 @@
<target name="qa1-start-testservice-common-dl.jar" depends="qa1-start.stubs">
<property name="qa1-start-testservice-common-dl.deps" location="${build.deps.dir}/qa1-start-testservice-common-dl.deps" />
<delete file="${lib.dir}/qa1-start-testservice-common-dl.jar" quiet="true"/>
- <classdep output="${qa1-start-testservice-common-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-start-testservice-common-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceDummyClass0"/>
<classpath refid="classdep.classpath"/>
@@ -1064,7 +1160,10 @@
<target name="qa1-lookup-simulator.jar" depends="qa1-lookup-simulator.stubs">
<property name="qa1-lookup-simulator.deps" location="${build.deps.dir}/qa1-lookup-simulator.deps" />
<delete file="${lib.dir}/qa1-lookup-simulator.jar" quiet="true"/>
- <classdep output="${qa1-lookup-simulator.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-lookup-simulator.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<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"/>
@@ -1073,7 +1172,10 @@
<jar destfile="${lib.dir}/qa1-lookup-simulator.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-lookup-simulator.deps}"/>
</jar>
- <classdep output="${qa1-lookup-simulator.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-lookup-simulator.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
<arg line="${jskplatform.exclude}"/>
@@ -1091,7 +1193,10 @@
<target name="qa1-lookup-simulator-dl.jar" depends="qa1-lookup-simulator.stubs">
<property name="qa1-lookup-simulator-dl.deps" location="${build.deps.dir}/qa1-lookup-simulator-dl.deps" />
<delete file="${lib.dir}/qa1-lookup-simulator-dl.jar" quiet="true"/>
- <classdep output="${qa1-lookup-simulator-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-lookup-simulator-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorProxy"/>
<arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorConstrainableProxy"/>
@@ -1106,7 +1211,10 @@
</metainf>
<fileset dir="${build.classes.dir}" includesfile="${qa1-lookup-simulator-dl.deps}"/>
</jar>
- <classdep output="${qa1-lookup-simulator-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-lookup-simulator-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
<arg line="${jskplatform.exclude}"/>
@@ -1134,7 +1242,10 @@
<target name="qa1-share-dl.jar" depends="qa1-share.stubs">
<property name="qa1-share-dl.deps" location="${build.deps.dir}/qa1-share-dl.deps" />
<delete file="${lib.dir}/qa1-share-dl.jar" quiet="true"/>
- <classdep output="${qa1-share-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-share-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.share.reggie.RegistrarProxy"/>
<arg line="com.sun.jini.test.share.reggie.RegistrarAdminProxy"/>
@@ -1162,7 +1273,10 @@
<fileset dir="${build.classes.dir}" includesfile="${qa1-share-dl.deps}"/>
<fileset dir="${river.classes.dir}" includesfile="${qa1-share-dl.deps}"/>
</jar>
- <classdep output="${qa1-share-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-share-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
<arg line="${jskplatform.exclude}"/>
@@ -1192,7 +1306,10 @@
<target name="qa1-reggie-race.jar" depends="qa1-share.stubs">
<property name="qa1-reggie-race.deps" location="${build.deps.dir}/qa1-reggie-race.deps" />
<delete file="${lib.dir}/qa1-reggie-race.jar" quiet="true"/>
- <classdep output="${qa1-reggie-race.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-reggie-race.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in net.jini"/>
<arg line="-in com.sun.jini"/>
<arg line="com.sun.jini.test.share.reggie.RegistrarImpl"/>
@@ -1216,7 +1333,10 @@
<target name="qa1-reggie-race-dl.jar" depends="qa1-share.stubs">
<property name="qa1-reggie-race-dl.deps" location="${build.deps.dir}/qa1-reggie-race-dl.deps" />
<delete file="${lib.dir}/qa1-reggie-race-dl.jar" quiet="true"/>
- <classdep output="${qa1-reggie-race-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-reggie-race-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in net.jini"/>
<arg line="-in com.sun.jini"/>
<arg line="com.sun.jini.test.share.reggie.RegistrarProxy"/>
@@ -1244,7 +1364,10 @@
<target name="fullloggingfilter.jar" depends="compile">
<property name="fullloggingfilter.deps" location="${build.deps.dir}/fullloggingfilter.deps" />
<delete file="${lib.dir}/fullloggingfilter.jar" quiet="true"/>
- <classdep output="${fullloggingfilter.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${fullloggingfilter.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.support.FullLoggingFilter"/>
<classpath refid="classdep.classpath"/>
@@ -1266,7 +1389,10 @@
<target name="qa1-discoveryservice-dl.jar" depends="qa1-discoveryservice.stubs">
<property name="qa1-discoveryservice-dl.deps" location="${build.deps.dir}/qa1-discoveryservice-dl.deps" />
<delete file="${lib.dir}/qa1-discoveryservice-dl.jar" quiet="true"/>
- <classdep output="${qa1-discoveryservice-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-discoveryservice-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.share.DiscoveryServiceUtil$$BasicEventListener_Stub"/>
<arg line="com.sun.jini.test.spec.discoveryservice.lease.LeaseExpiration$$ServiceEventListener_Stub"/>
@@ -1338,7 +1464,10 @@
<include name="com/sun/jini/test/spec/io/marshalinputstream/*.class"/>
</fileset>
</jar>
- <classdep output="${qa1-io-marshalinputstream-test.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-io-marshalinputstream-test.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="-out com.sun.jini.test.harness"/>
<arg line="-out com.sun.jini.test.spec.io.util.FakeArgument"/>
@@ -1365,7 +1494,10 @@
<include name="com/sun/jini/test/spec/io/marshalledinstance/*.class"/>
</fileset>
</jar>
- <classdep output="${qa1-io-marshalledinstance-test.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-io-marshalledinstance-test.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="-out com.sun.jini.test.harness"/>
<arg line="-in net.jini"/>
@@ -1390,7 +1522,10 @@
<target name="qa1-javaspace-dl.jar" depends="qa1-javaspace.stubs">
<property name="qa1-javaspace-dl.deps" location="${build.deps.dir}/qa1-javaspace-dl.deps" />
<delete file="${lib.dir}/qa1-javaspace-dl.jar" quiet="true"/>
- <classdep output="${qa1-javaspace-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-javaspace-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.spec.javaspace.conformance.ParticipantImpl_Stub"/>
<arg line="com.sun.jini.test.spec.javaspace.conformance.NotifyCounter_Stub"/>
@@ -1446,7 +1581,10 @@
<target name="qa1-lookupservice-dl.jar" depends="qa1-lookupservice.stubs">
<property name="qa1-lookupservice-dl.deps" location="${build.deps.dir}/qa1-lookupservice-dl.deps" />
<delete file="${lib.dir}/qa1-lookupservice-dl.jar" quiet="true"/>
- <classdep output="${qa1-lookupservice-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-lookupservice-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test.spec"/>
<arg line="com.sun.jini.test.spec.lookupservice.test_set00.EvntLeaseExpiration$$Listener_Stub"/>
<arg line="com.sun.jini.test.spec.lookupservice.test_set00.NotifyOnAttrAdd$$Listener_Stub"/>
@@ -1497,7 +1635,10 @@
<target name="qa1-renewalservice-dl.jar" depends="qa1-renewalservice.stubs">
<property name="qa1-renewalservice-dl.deps" location="${build.deps.dir}/qa1-renewalservice-dl.deps" />
<delete file="${lib.dir}/qa1-renewalservice-dl.jar" quiet="true"/>
- <classdep output="${qa1-renewalservice-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-renewalservice-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.share.LeaseBackEndImpl$$VerifierImpl"/>
<arg line="com.sun.jini.test.share.LeaseBackEndImpl_Stub"/>
@@ -1513,7 +1654,10 @@
<include name="com/sun/jini/test/spec/io/marshalledinstance/*.class"/>
</fileset>
</jar>
- <classdep output="${qa1-renewalservice-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-renewalservice-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
<arg line="${jskplatform.exclude}"/>
@@ -1547,7 +1691,10 @@
<target name="qa1-servicediscovery-dl.jar" depends="compile">
<property name="qa1-servicediscovery-dl.deps" location="${build.deps.dir}/qa1-servicediscovery-dl.deps" />
<delete file="${lib.dir}/qa1-servicediscovery-dl.jar" quiet="true"/>
- <classdep output="${qa1-servicediscovery-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-servicediscovery-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in net.jini.lookup"/>
<arg line="-in com.sun.jini.test"/>
<arg line="-hide net.jini.lookup"/>
@@ -1563,7 +1710,10 @@
</metainf>
<fileset dir="${build.classes.dir}" includesfile="${qa1-servicediscovery-dl.deps}"/>
</jar>
- <classdep output="${qa1-servicediscovery-dl.deps}" cp="${build.classes.dir}:${river.classes.dir}">
+ <classdep output="${qa1-servicediscovery-dl.deps}">
+ <arg value="-cp"/>
+ <arg pathref="classdep.cp"/>
+ <arg value="-files"/>
<arg line="-in net.jini.lookup"/>
<arg line="-in com.sun.jini"/>
<arg line="-in com.sun.jini.test"/>
Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java?rev=819307&r1=819306&r2=819307&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java Sun Sep 27 13:41:40 2009
@@ -42,7 +42,7 @@
* Test Cases:
* This test tries to compare two HTTPMD URL objects using
* {@link URL#equals(Object)} method. {@link URL#equals(Object)} method
- * invokes {@link Handler#equals(URL,URL) method inherited
+ * invokes {@link Handler#equals(URL,URL)} method inherited
* from {@link URLStreamHandler} class.
* {@link URLStreamHandler#equals(URL,URL)} method uses
* {@link Handler#sameFile(URL,URL)} method to compare
Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/ParseURL.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/ParseURL.java?rev=819307&r1=819306&r2=819307&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/ParseURL.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/ParseURL.java Sun Sep 27 13:41:40 2009
@@ -85,7 +85,7 @@
* This test tries to create various HTTPMD URL objects using the following
* constructors:
* {@link URL#URL(String)}
- * {@link URL#URL(URL,String)
+ * {@link URL#URL(URL,String)}
* {@link Handler#parseURL(URL,String,int,int)} method
* is invoked while HTTPMD URL object is being created.
* The cases: