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/28 21:25:19 UTC
svn commit: r819682 - in /incubator/river/jtsk/trunk: build.xml common.xml
examples/hello/build.xml qa/build.xml
Author: jcosters
Date: Mon Sep 28 19:25:19 2009
New Revision: 819682
URL: http://svn.apache.org/viewvc?rev=819682&view=rev
Log:
RIVER-301: various improvements to build process
Modified:
incubator/river/jtsk/trunk/build.xml
incubator/river/jtsk/trunk/common.xml
incubator/river/jtsk/trunk/examples/hello/build.xml
incubator/river/jtsk/trunk/qa/build.xml
Modified: incubator/river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/build.xml?rev=819682&r1=819681&r2=819682&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/build.xml (original)
+++ incubator/river/jtsk/trunk/build.xml Mon Sep 28 19:25:19 2009
@@ -30,7 +30,7 @@
<description>Apache River is a project furthering the development
and advancement of Jini technology.</description>
-
+
<!-- import common settings and macros -->
<import file="common.xml"/>
@@ -46,21 +46,7 @@
<property name="javadoc.spec.doc-title" value="${product.title} Specification-only API Documentation"/>
<property name="javadoc.spec.win-title" value="${javadoc.spec.doc-title}"/>
- <path id="river.classpath">
- <pathelement path="${build.classes.dir}"/>
- </path>
-
- <path id="compile.classpath">
- <pathelement location="tools/asm-3.2.jar"/>
- <pathelement location="tools/asm-commons-3.2.jar"/>
- </path>
-
- <path id="classdep.classpath">
- <path refid="river.classpath"/>
- <path refid="compile.classpath"/>
- </path>
-
- <path id="javadoc.classpath" refid="classdep.classpath"/>
+ <path id="javadoc.classpath" refid="river.classes"/>
<target name="copy-resources"
description="Copies various resources directories to the classes dir."
@@ -248,7 +234,6 @@
prefix="${product.name}/examples"
includes="**/*.sh"
filemode="755"/>
- <!-- TODO investigate the source under the jtreg directory -->
<tarfileset dir="${basedir}/qa" prefix="${product.name}/qa">
<include name="${src}/**"/>
<include name="harness/**"/>
@@ -485,7 +470,7 @@
<target name="compile" description="Build classes"
depends="copy-resources">
<javac-cmd source.dir="${src.dir}" dest.dir="${build.classes.dir}">
- <classpath refid="compile.classpath" />
+ <classpath refid="asm.classpath" />
</javac-cmd>
</target>
@@ -665,8 +650,8 @@
<target name="jini-ext.jar" depends="stubs">
<property name="jini-ext.deps" location="${build.deps.dir}/jini-ext.deps"/>
- <classdep output="${jini-ext.deps}">
- <classpath refid="classdep.classpath"/>
+ <classdep output="${jini-ext.deps}"
+ classpathref="classdep.classes.classpath">
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -687,8 +672,8 @@
<target name="jsk-debug-policy.jar" depends="stubs">
<property name="jsk-debug-policy.deps" location="${build.deps.dir}/jsk-debug-policy.deps"/>
- <classdep output="${jsk-debug-policy.deps}">
- <classpath refid="classdep.classpath"/>
+ <classdep output="${jsk-debug-policy.deps}"
+ classpathref="classdep.classes.classpath">
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -706,8 +691,8 @@
<target name="jsk-dl.jar" depends="stubs">
<property name="jsk-dl.deps" location="${build.deps.dir}/jsk-dl.deps"/>
- <classdep output="${jsk-dl.deps}">
- <classpath refid="classdep.classpath"/>
+ <classdep output="${jsk-dl.deps}"
+ classpathref="classdep.classes.classpath">
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -755,8 +740,8 @@
<target name="jsk-lib.jar" depends="stubs">
<property name="jsk-lib.deps" location="${build.deps.dir}/jsk-lib.deps"/>
- <classdep output="${jsk-lib.deps}">
- <classpath refid="classdep.classpath"/>
+ <classdep output="${jsk-lib.deps}"
+ classpathref="classdep.classes.classpath">
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -790,14 +775,14 @@
<arg path="${build.classes.dir}"/>
<arg line="-api com.sun.jini.start.LifeCycle"/>
<arg line="-api com.sun.jini.start.ServiceProxyAccessor"/>
- <classpath refid="river.classpath"/>
+ <classpath refid="river.classes"/>
</preferredlistgen>
</target>
<target name="jsk-platform.jar" depends="jsk-resources.jar">
<property name="jsk-platform.deps" location="${build.deps.dir}/jsk-platform.deps"/>
- <classdep output="${jsk-platform.deps}">
- <classpath refid="classdep.classpath"/>
+ <classdep output="${jsk-platform.deps}"
+ classpathref="classdep.classes.classpath">
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -859,14 +844,14 @@
<arg line="-api com.sun.jini.config.ConfigUtil"/>
<arg line="-api com.sun.jini.config.KeyStores"/>
<arg line="-api com.sun.jini.logging.LogManager"/>
- <classpath refid="river.classpath"/>
+ <classpath refid="river.classes"/>
</preferredlistgen>
</target>
<target name="jsk-policy.jar" depends="stubs">
<property name="jsk-policy.deps" location="${build.deps.dir}/jsk-policy.deps"/>
- <classdep output="${jsk-policy.deps}">
- <classpath refid="classdep.classpath"/>
+ <classdep output="${jsk-policy.deps}"
+ classpathref="classdep.classes.classpath">
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -897,8 +882,8 @@
<target name="sun-util.jar" depends="stubs">
<property name="sun-util.deps" location="${build.deps.dir}/sun-util.deps"/>
- <classdep output="${sun-util.deps}">
- <classpath refid="classdep.classpath"/>
+ <classdep output="${sun-util.deps}"
+ classpathref="classdep.classes.classpath">
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -936,7 +921,6 @@
<target name="sdm-dl.jar" depends="stubs">
<property name="sdm-dl.deps" location="${build.deps.dir}/sdm-dl.deps"/>
<classdep output="${sdm-dl.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -959,13 +943,13 @@
<arg line="-jar"/>
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
<arg line="-proxy net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="sdm.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
<include name="net/jini/lookup/ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener.class"/>
</rmic>
</target>
@@ -1256,7 +1240,6 @@
<target name="browser.jar" depends="stubs">
<property name="browser.deps" location="${build.deps.dir}/browser.deps"/>
<classdep output="${browser.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -1277,7 +1260,6 @@
<target name="browser-dl.jar" depends="stubs">
<property name="browser-dl.deps" location="${build.deps.dir}/browser-dl.deps"/>
<classdep output="${browser-dl.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -1300,13 +1282,13 @@
<arg line="-jar"/>
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
<arg line="-proxy com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="browser.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
<include name="com/sun/jini/example/browser/Browser$$Listener.class"/>
<include name="com/sun/jini/example/browser/ServiceEditor$$NotifyReceiver.class"/>
</rmic>
@@ -1315,7 +1297,6 @@
<target name="fiddler.jar" depends="stubs">
<property name="fiddler.deps" location="${build.deps.dir}/fiddler.deps" />
<classdep output="${fiddler.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1339,14 +1320,13 @@
<arg line="-jar"/>
<arg path="${lib.dir}/fiddler.jar"/>
<arg line="-default true" />
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="fiddler-dl.jar" depends="stubs">
<property name="fiddler-dl.deps" location="${build.deps.dir}/fiddler-dl.deps" />
<classdep output="${fiddler-dl.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1377,13 +1357,13 @@
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
<arg line="-proxy com.sun.jini.fiddler.FiddlerProxy"/>
<arg line="-proxy com.sun.jini.fiddler.FiddlerAdminProxy"/>
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="fiddler.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.classpath" />
+ <classpath refid="river.jars" />
<include name="com/sun/jini/fiddler/FiddlerImpl.class" />
</rmic>
</target>
@@ -1391,7 +1371,6 @@
<target name="mahalo.jar" depends="stubs">
<property name="mahalo.deps" location="${build.deps.dir}/mahalo.deps" />
<classdep output="${mahalo.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1414,14 +1393,13 @@
<arg line="-cp"/>
<arg path="${build.classes.dir}"/>
<arg line="-default true" />
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="mahalo-dl.jar" depends="stubs">
<property name="mahalo-dl.deps" location="${build.deps.dir}/mahalo-dl.deps" />
<classdep output="${mahalo-dl.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1451,13 +1429,13 @@
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
<arg line="-proxy com.sun.jini.mahalo.TxnMgrAdminProxy" />
<arg line="-proxy com.sun.jini.mahalo.TxnMgrProxy"/>
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="mahalo.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.classpath" />
+ <classpath refid="river.jars" />
<include name="com/sun/jini/mahalo/TxnManagerImpl.class" />
</rmic>
</target>
@@ -1465,7 +1443,6 @@
<target name="mercury.jar" depends="stubs">
<property name="mercury.deps" location="${build.deps.dir}/mercury.deps" />
<classdep output="${mercury.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1488,14 +1465,13 @@
<arg line="-cp" />
<arg path="${build.classes.dir}"/>
<arg line="-default true" />
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="mercury-dl.jar" depends="stubs">
<property name="mercury-dl.deps" location="${build.deps.dir}/mercury-dl.deps" />
<classdep output="${mercury-dl.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1529,13 +1505,13 @@
<arg line="-proxy com.sun.jini.mercury.ListenerProxy"/>
<arg line="-proxy com.sun.jini.mercury.MailboxAdminProxy"/>
<arg line="-proxy com.sun.jini.mercury.MailboxProxy"/>
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="mercury.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.classpath" />
+ <classpath refid="river.jars" />
<include name="com/sun/jini/mercury/MailboxImpl.class" />
</rmic>
</target>
@@ -1543,7 +1519,6 @@
<target name="norm.jar" depends="stubs">
<property name="norm.deps" location="${build.deps.dir}/norm.deps" />
<classdep output="${norm.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1567,14 +1542,13 @@
<arg line="-jar"/>
<arg path="${lib.dir}/norm.jar" />
<arg line="-default true" />
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="norm-dl.jar" depends="stubs">
<property name="norm-dl.deps" location="${build.deps.dir}/norm-dl.deps" />
<classdep output="${norm-dl.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1606,13 +1580,13 @@
<arg line="-proxy com.sun.jini.norm.AdminProxy"/>
<arg line="-proxy com.sun.jini.norm.NormProxy"/>
<arg line="-proxy com.sun.jini.norm.SetProxy"/>
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="norm.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.classpath" />
+ <classpath refid="river.jars" />
<include name="com/sun/jini/norm/NormServerBaseImpl.class" />
</rmic>
</target>
@@ -1620,7 +1594,6 @@
<target name="outrigger-snaplogstore.jar" depends="stubs">
<property name="outrigger-snaplogstore.deps" location="${build.deps.dir}/outrigger-snaplogstore.deps" />
<classdep output="${outrigger-snaplogstore.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1638,7 +1611,6 @@
<target name="outrigger.jar" depends="stubs,outrigger-snaplogstore.jar">
<property name="outrigger.deps" location="${build.deps.dir}/outrigger.deps" />
<classdep output="${outrigger.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1660,7 +1632,6 @@
<target name="outrigger-dl.jar" depends="compile">
<property name="outrigger-dl.deps" location="${build.deps.dir}/outrigger-dl.deps" />
<classdep output="${outrigger-dl.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1691,13 +1662,13 @@
<arg line="-proxy com.sun.jini.outrigger.ConstrainableIteratorProxy"/>
<arg line="-proxy com.sun.jini.outrigger.ConstrainableParticipantProxy"/>
<arg line="-proxy com.sun.jini.outrigger.ConstrainableSpaceProxy2"/>
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="outrigger.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.classpath" />
+ <classpath refid="river.jars" />
<include name="com/sun/jini/outrigger/OutriggerServerWrapper.class" />
</rmic>
</target>
@@ -1705,7 +1676,6 @@
<target name="phoenix.jar" depends="tools.jar">
<property name="phoenix.deps" location="${build.deps.dir}/phoenix.deps" />
<classdep output="${phoenix.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -1741,7 +1711,6 @@
<target name="phoenix-dl.jar" depends="stubs">
<property name="phoenix-dl.deps" location="${build.deps.dir}/phoenix-dl.deps" />
<classdep output="${phoenix-dl.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -1772,14 +1741,13 @@
<arg line="-jar"/>
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
<arg line="-proxy com.sun.jini.phoenix.AbstractSystem_Stub" />
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="phoenix-group.jar" depends="stubs">
<property name="phoenix-group.deps" location="${build.deps.dir}/phoenix-group.deps" />
<classdep output="${phoenix-group.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -1802,7 +1770,6 @@
<target name="phoenix-init.jar" depends="stubs">
<property name="phoenix-init.deps" location="${build.deps.dir}/phoenix-init.deps" />
<classdep output="${phoenix-init.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1819,14 +1786,14 @@
<target name="phoenix.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.classpath" />
+ <classpath refid="river.jars" />
<include name="com/sun/jini/phoenix/AbstractActivator.class" />
<include name="com/sun/jini/phoenix/AbstractMonitor.class" />
<include name="com/sun/jini/phoenix/AbstractSystem.class" />
<include name="com/sun/jini/phoenix/AbstractInstantiator.class" />
</rmic>
<rmic base="${build.classes.dir}" stubversion="1.1">
- <classpath refid="river.classpath" />
+ <classpath refid="river.jars" />
<include name="com/sun/jini/phoenix/AbstractRegistry.class" />
</rmic>
</target>
@@ -1834,7 +1801,6 @@
<target name="reggie.jar" depends="stubs">
<property name="reggie.deps" location="${build.deps.dir}/reggie.deps" />
<classdep output="${reggie.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1856,14 +1822,13 @@
<arg line="-jar"/>
<arg path="${lib.dir}/reggie.jar"/>
<arg line="-default true" />
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="reggie-dl.jar" depends="stubs">
<property name="reggie-dl.deps" location="${build.deps.dir}/reggie-dl.deps" />
<classdep output="${reggie-dl.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1894,13 +1859,13 @@
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
<arg line="-proxy com.sun.jini.reggie.ConstrainableRegistrarProxy"/>
<arg line="-proxy com.sun.jini.reggie.ConstrainableAdminProxy"/>
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="reggie.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.classpath" />
+ <classpath refid="river.jars" />
<include name="com/sun/jini/reggie/RegistrarImpl.class" />
</rmic>
</target>
@@ -1918,7 +1883,6 @@
<target name="destroy.jar" depends="stubs">
<property name="destroy.deps" location="${build.deps.dir}/destroy.deps" />
<classdep output="${destroy.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -1938,7 +1902,6 @@
<target name="group.jar" depends="stubs">
<property name="group.deps" location="${build.deps.dir}/group.deps" />
<classdep output="${group.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1956,7 +1919,6 @@
<target name="group-dl.jar" depends="stubs">
<property name="group-dl.deps" location="${build.deps.dir}/group-dl.deps" />
<classdep output="${group-dl.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files" />
@@ -1977,14 +1939,13 @@
<arg line="-jar"/>
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
<arg line="-proxy com.sun.jini.start.SharedGroupImpl_Stub"/>
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
<target name="sharedvm.jar" depends="stubs">
<property name="sharedvm.deps" location="${build.deps.dir}/sharedvm.deps" />
<classdep output="${sharedvm.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -2001,8 +1962,8 @@
<target name="start.jar" depends="stubs">
<property name="start.deps" location="${build.deps.dir}/start.deps" />
- <classdep output="${start.deps}">
- <classpath refid="classdep.classpath"/>
+ <classdep output="${start.deps}"
+ classpathref="classdep.classes.classpath">
<arg value="-cp"/>
<arg path="${build.classes.dir}"/>
<arg value="-files"/>
@@ -2024,7 +1985,7 @@
<target name="start.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.classpath" />
+ <classpath refid="river.jars" />
<include name="com/sun/jini/start/SharedGroupImpl.class" />
</rmic>
</target>
@@ -2041,10 +2002,10 @@
<target name="tools.jar" depends="river.jars">
<property name="tools.deps" location="${build.deps.dir}/tools.deps" />
- <classdep output="${tools.deps}">
- <classpath refid="classdep.classpath"/>
+ <classdep output="${tools.deps}"
+ classpathref="classdep.classes.classpath">
<arg value="-cp"/>
- <arg pathref="classdep.classpath"/>
+ <arg pathref="river.classes"/>
<arg value="-files" />
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.tool"/>
@@ -2098,7 +2059,7 @@
<arg path="${build.classes.dir}"/>
<arg line="-jar"/>
<arg path="${lib.dir}/tools.jar"/>
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</preferredlistgen>
</target>
Modified: incubator/river/jtsk/trunk/common.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/common.xml?rev=819682&r1=819681&r2=819682&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/common.xml (original)
+++ incubator/river/jtsk/trunk/common.xml Mon Sep 28 19:25:19 2009
@@ -38,6 +38,8 @@
<property name="lib-ext" value="lib-ext"/>
<property name="doc.spec.api" value="${doc}/specs/api"/>
<property name="doc.api" value="${doc}/api"/>
+ <property name="build" value="build"/>
+ <property name="build.classes" value="${build}/classes"/>
<property name="dist" value="dist"/>
<!-- Standard directory locations -->
@@ -46,8 +48,8 @@
<property name="src.dir" location="${src}"/>
<property name="src.manifest.dir" location="${src}/manifest"/>
<property name="src.configentry.dir" location="${src}/configentry"/>
- <property name="build.dir" location="build"/>
- <property name="build.classes.dir" location="${build.dir}/classes"/>
+ <property name="build.dir" location="${build}"/>
+ <property name="build.classes.dir" location="${build.classes}"/>
<property name="build.deps.dir" location="${build.dir}/deps"/>
<property name="configentry.dir" location="${configentry}"/>
<property name="dist.dir" location="dist"/>
@@ -80,7 +82,42 @@
<patternset id="java.source">
<include name="**/*.java"/>
</patternset>
-
+
+ <property name="river.home" location="${root}"/>
+ <property name="river.lib.dir" location="${river.home}/${lib}"/>
+ <property name="river.lib-ext.dir" location="${river.home}/${lib-ext}"/>
+ <property name="river.classes.dir" location="${river.home}/${build.classes}"/>
+ <property name="river.src.dir" location="${river.home}/${src}"/>
+
+ <!-- classpath containing River distribution -->
+ <!-- TODO: split into multiple paths -->
+ <path id="river.jars">
+ <fileset dir="${river.lib.dir}" includes="**/*.jar" />
+ </path>
+
+ <path id="river.classes">
+ <pathelement path="${river.classes.dir}"/>
+ </path>
+
+ <path id="asm.classpath">
+ <pathelement path="${river.home}/tools/asm-3.2.jar"/>
+ <pathelement path="${river.home}/tools/asm-commons-3.2.jar"/>
+ </path>
+
+ <path id="classdep.classes.classpath">
+ <path refid="river.classes"/>
+ <path refid="asm.classpath"/>
+ </path>
+
+ <path id="classdep.jar.classpath">
+ <pathelement location="${river.lib.dir}/classdep.jar"/>
+ <path refid="asm.classpath" />
+ </path>
+
+ <path id="classdep.classpath">
+ <path refid="classdep.jar.classpath" />
+ </path>
+
<property name="jre.ext.dir" location="${java.home}/lib/ext"/>
<!-- Possible values for 'debug': lines,source,vars -->
@@ -121,11 +158,13 @@
<macrodef name="classdep" description="Run ClassDep">
<attribute name="output"/>
+ <attribute name="classpathref" default="classdep.classpath" />
<element name="cd-elements" implicit="yes" />
<sequential>
<java classname="com.sun.jini.tool.ClassDep"
failonerror="true" logError="true"
output="@{output}">
+ <classpath refid="@{classpathref}"/>
<cd-elements />
</java>
</sequential>
Modified: incubator/river/jtsk/trunk/examples/hello/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/examples/hello/build.xml?rev=819682&r1=819681&r2=819682&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/examples/hello/build.xml (original)
+++ incubator/river/jtsk/trunk/examples/hello/build.xml Mon Sep 28 19:25:19 2009
@@ -24,42 +24,24 @@
<!-- Root of the River source distribution -->
<property name="root" location="../.." />
- <!-- Import common settings and macros -->
- <import file="${root}/common.xml"/>
-
- <!-- Override this to run hello example against an external River installation -->
+ <!-- Override this to build/run hello example against an external River installation -->
<property name="river.home" location="${root}"/>
- <property name="river.lib.dir" location="${river.home}/lib"/>
- <property name="river.lib-ext.dir" location="${river.home}/lib-ext"/>
- <property name="river.classes.dir" location="${river.home}/build/classes"/>
- <property name="river.src.dir" location="${river.home}/src"/>
+ <!-- Import common settings and macros -->
+ <import file="${root}/common.xml"/>
<!-- 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}"/>
- <!-- classpath containing River distribution -->
- <!-- TODO: investigate exact classpath requirements for this build -->
- <path id="river.classpath">
- <fileset dir="${river.lib.dir}" includes="**/*.jar" />
- </path>
-
- <!-- classpath for use by ClassDep in this build -->
- <path id="classdep.classpath">
- <pathelement path="${river.lib.dir}/classdep.jar"/>
- <pathelement location="${river.home}/tools/asm-3.2.jar"/>
- <pathelement location="${river.home}/tools/asm-commons-3.2.jar"/>
- </path>
-
- <!-- classpath for use by ClassDep in this build -->
+ <!-- classpath searched by ClassDep -->
<path id="classdep.cp">
- <path refid="river.classpath"/>
+ <path refid="river.jars"/>
<pathelement location="${build.classes.dir}"/>
</path>
<path id="javadoc.classpath">
- <path refid="river.classpath"/>
+ <path refid="river.jars"/>
<pathelement location="${build.classes.dir}"/>
</path>
@@ -74,7 +56,7 @@
<target name="compile" depends="prep" description="Build classes">
<javac-cmd source.dir="${src.dir}" dest.dir="${build.classes.dir}">
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</javac-cmd>
</target>
@@ -124,7 +106,6 @@
<target name="client.jar" depends="stubs">
<property name="example-client.deps" location="${build.deps.dir}/example-client.deps"/>
<classdep output="${example-client.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg pathref="classdep.cp"/>
<arg value="-files"/>
@@ -153,7 +134,6 @@
<target name="server.jar" depends="stubs">
<property name="example-server.deps" location="${build.deps.dir}/example-server.deps"/>
<classdep output="${example-server.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg pathref="classdep.cp"/>
<arg value="-files"/>
@@ -177,7 +157,6 @@
<target name="server-act.jar" depends="stubs">
<property name="example-server-act.deps" location="${build.deps.dir}/example-server-act.deps"/>
<classdep output="${example-server-act.deps}">
- <classpath refid="classdep.classpath"/>
<arg value="-cp"/>
<arg pathref="classdep.cp"/>
<arg value="-files"/>
@@ -201,8 +180,7 @@
<target name="server-dl.jar" depends="stubs">
<property name="example-server-dl.deps" location="${build.deps.dir}/example-server-dl.deps"/>
- <classdep output="${example-server-dl.deps}">
- <classpath refid="classdep.classpath"/>
+ <classdep output="${example-server-dl.deps}">
<arg value="-cp"/>
<arg pathref="classdep.cp"/>
<arg value="-files"/>
@@ -225,7 +203,7 @@
<target name="stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
<include name="com/sun/jini/example/hello/Server.class"/>
</rmic>
</target>
Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=819682&r1=819681&r2=819682&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Mon Sep 28 19:25:19 2009
@@ -24,16 +24,11 @@
<!-- Root of the River source distribution -->
<property name="root" location=".." />
- <!-- Import common settings and macros -->
- <import file="${root}/common.xml"/>
-
- <!-- Override this to run QA tests against an external River installation -->
+ <!-- Override this to build/run QA tests against an external River installation -->
<property name="river.home" location="${root}"/>
- <property name="river.lib.dir" location="${river.home}/lib"/>
- <property name="river.lib-ext.dir" location="${river.home}/lib-ext"/>
- <property name="river.classes.dir" location="${river.home}/build/classes"/>
- <property name="river.src.dir" location="${river.home}/src"/>
+ <!-- Import common settings and macros -->
+ <import file="${root}/common.xml"/>
<!-- directory settings -->
<property name="trust.dir" location="harness/trust"/>
@@ -42,28 +37,14 @@
<property name="javadoc.doc-title" value="Apache River v${version} QA Harness and Test API Documentation"/>
<property name="javadoc.win-title" value="${javadoc.doc-title}"/>
- <!-- classpath containing River distribution -->
- <!-- TODO: investigate exact classpath requirements for this build -->
- <path id="river.classpath">
- <fileset dir="${river.lib.dir}" includes="**/*.jar" />
- </path>
-
- <!-- classpath for use by ClassDep in this build -->
- <path id="classdep.classpath">
- <pathelement path="${river.lib.dir}/classdep.jar"/>
- <pathelement location="${river.home}/tools/asm-3.2.jar"/>
- <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"/>
+ <path refid="river.jars"/>
<pathelement location="${build.classes.dir}"/>
- <!--<pathelement location="${river.classes.dir}"/>-->
</path>
<path id="javadoc.classpath">
- <path refid="river.classpath"/>
+ <path refid="river.jars"/>
<path location="${build.classes.dir}"/>
</path>
@@ -129,13 +110,13 @@
<target name="compile" depends="copy-resources" description="Build classes">
<javac-cmd source.dir="${src.dir}" dest.dir="${build.classes.dir}">
- <classpath refid="river.classpath"/>
+ <classpath refid="river.jars"/>
</javac-cmd>
</target>
<target name="jtreg" depends="" description="Run jtreg tests">
<!-- TODO: refine classpath -->
- <property name="jtreg.classpath" refid="river.classpath" />
+ <property name="jtreg.classpath" refid="river.jars" />
<!-- location of the River jtreg tests -->
<property name="jtreg.dir" location="jtreg" />
<!-- location of the jtreg distribution, override in <river root>/build.properties -->
@@ -325,7 +306,7 @@
description="Compile stubs"/>
<target name="harness-killer.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/qa/harness/KillerImpl.class" />
</rmic>
</target>
@@ -342,7 +323,6 @@
<arg line="${jskplatform.exclude}"/>
<arg value="com.sun.jini.qa.harness.KillerImpl"/>
<arg value="com.sun.jini.qa.harness.KillerImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
</classdep>
<jar destfile="${lib.dir}/harness-killer.jar" index="false">
<fileset dir="${river.classes.dir}" includesfile="${harness-killer.deps}" />
@@ -360,7 +340,7 @@
<arg line="-in com.sun.jini"/>
<arg value="com.sun.jini.qa.harness.VMKiller"/>
<arg value="com.sun.jini.qa.harness.KillerImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/harness-killer-dl.jar" index="false">
<fileset dir="${river.classes.dir}" includesfile="${harness-killer-dl.deps}" />
@@ -369,7 +349,7 @@
</target>
<target name="nonactivatablegroup.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/qa/harness/NonActivatableGroupImpl$$GroupImpl.class" />
</rmic>
</target>
@@ -386,7 +366,7 @@
<arg line="-out com.sun.jini.start" />
<arg value="com.sun.jini.qa.harness.NonActivatableGroupImpl"/>
<arg value="com.sun.jini.qa.harness.NonActivatableGroupImpl$$GroupImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/nonactivatablegroup.jar" index="false">
<fileset dir="${river.classes.dir}" includesfile="${nonactivatablegroup.deps}" />
@@ -403,7 +383,7 @@
<arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg value="com.sun.jini.qa.harness.NonActivatableGroupImpl$$GroupImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/nonactivatablegroup-dl.jar" index="false">
<fileset dir="${river.classes.dir}" includesfile="${nonactivatablegroup-dl.deps}" />
@@ -420,7 +400,7 @@
<arg value="-files"/>
<arg line="-in com.sun.jini.qa"/>
<arg value="com.sun.jini.qa.harness.MergedPolicyProvider"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib-ext.dir}/mergedpolicyprovider.jar" index="false" >
<fileset dir="${river.classes.dir}" includesfile="${mergedpolicyprovider.deps}"/>
@@ -450,7 +430,7 @@
</target>
<target name="qa1-fiddler.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/test/share/DiscoveryServiceUtil$$BasicEventListener.class" />
<include name="com/sun/jini/test/spec/discoveryservice/AbstractBaseTest$$LDSEventListener.class" />
</rmic>
@@ -468,7 +448,7 @@
<arg value="com.sun.jini.test.share.AttributesUtil$$TestAttrSC00"/>
<arg value="com.sun.jini.test.share.DiscoveryServiceUtil$$BasicEventListener_Stub"/>
<arg value="com.sun.jini.test.spec.discoveryservice.AbstractBaseTest$$LDSEventListener_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-fiddler-dl.jar" index="false" >
<fileset dir="${build.classes.dir}" includesfile="${qa1-fiddler-dl.deps}" />
@@ -479,7 +459,7 @@
</target>
<target name="qa1-joinmanager.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE$$RemoteTestServiceImpl.class" />
</rmic>
</target>
@@ -497,7 +477,7 @@
<arg value="com.sun.jini.test.share.AttributesUtil$$TestAttr00"/>
<arg value="com.sun.jini.test.share.AttributesUtil$$TestAttrSC00"/>
<arg value="com.sun.jini.test.impl.joinmanager.LeaseRenewDurRFE$$RemoteTestServiceImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-joinmanager-dl.jar" index="false" >
<fileset dir="${build.classes.dir}" includesfile="${qa1-joinmanager-dl.deps}" />
@@ -517,7 +497,7 @@
</target>
<target name="qa1-mercury.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/test/impl/mercury/TestListenerImpl.class" />
<include name="com/sun/jini/test/impl/mercury/TestPullListenerImpl.class" />
<include name="com/sun/jini/test/impl/mercury/TestGeneratorImpl.class" />
@@ -547,7 +527,7 @@
<arg value="com.sun.jini.test.impl.mercury.TestPullListenerImpl_Stub"/>
<arg value="com.sun.jini.test.impl.mercury.TestGeneratorImpl"/>
<arg value="com.sun.jini.test.impl.mercury.TestGeneratorImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-mercury.jar" index="false" >
<fileset dir="${build.classes.dir}" includesfile="${qa1-mercury.deps}" />
@@ -573,7 +553,7 @@
<arg value="com.sun.jini.test.impl.mercury.TestPullListenerImpl_Stub"/>
<arg value="com.sun.jini.test.impl.mercury.TestGeneratorImpl"/>
<arg value="com.sun.jini.test.impl.mercury.TestGeneratorImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-mercury.jar" index="false" update="true">
<fileset dir="${build.classes.dir}" includesfile="${qa1-mercury.deps}" />
@@ -594,7 +574,7 @@
<arg value="com.sun.jini.test.impl.mercury.TestListenerImpl_Stub"/>
<arg value="com.sun.jini.test.impl.mercury.TestPullListenerImpl_Stub"/>
<arg value="com.sun.jini.test.impl.mercury.TestGeneratorImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-mercury-dl.jar" index="false">
<metainf dir="${src.dir}/manifest/mercury-dl/META-INF">
@@ -624,7 +604,7 @@
<arg value="com.sun.jini.test.impl.mercury.TestListenerImpl_Stub"/>
<arg value="com.sun.jini.test.impl.mercury.TestPullListenerImpl_Stub"/>
<arg value="com.sun.jini.test.impl.mercury.TestGeneratorImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-mercury-dl.jar" index="false" update="true">
<fileset dir="${build.classes.dir}" includesfile="${qa1-mercury-dl.deps}" />
@@ -642,7 +622,7 @@
<arg line="-in com.sun.jini.test"/>
<arg value="com.sun.jini.test.impl.mercury.DelayedBasicJeriExporter"/>
<arg value="com.sun.jini.test.impl.mercury.MyLocalRemoteEvent"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-mercury-bogusimpl.jar" index="false" >
<fileset dir="${build.classes.dir}" includesfile="${qa1-mercury-bogusimpl.deps}" />
@@ -650,7 +630,7 @@
</target>
<target name="qa1-norm.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/test/impl/norm/LeaseBackEndImpl.class" />
<include name="com/sun/jini/test/impl/norm/RemoteListener.class" />
</rmic>
@@ -680,7 +660,7 @@
<arg value="com.sun.jini.test.impl.norm.LeaseBackEndImpl_Stub"/>
<arg value="com.sun.jini.test.impl.norm.RemoteListener_Stub"/>
<arg value="com.sun.jini.test.impl.norm.TestLease"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-norm-dl.jar" index="false" >
<fileset dir="${build.classes.dir}" includesfile="${qa1-norm-dl.deps}" />
@@ -692,7 +672,7 @@
</target>
<target name="qa1-outrigger.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/test/impl/outrigger/transaction/SimpleEventListener.class" />
<include name="com/sun/jini/test/impl/outrigger/matching/ARemoteInterfaceImpl.class" />
<include name="com/sun/jini/test/impl/outrigger/matching/MonitoredSpaceListener.class" />
@@ -722,7 +702,7 @@
<arg value="com.sun.jini.test.impl.outrigger.matching.TestSpaceListener_Stub"/>
<arg value="com.sun.jini.test.impl.outrigger.notify.ThrowRuntimeException$$Listener_Stub"/>
<arg value="com.sun.jini.test.impl.outrigger.leasing.LeasedSpaceListener_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-outrigger-dl.jar" index="false" >
<fileset dir="${build.classes.dir}" includesfile="${qa1-outrigger-dl.deps}" />
@@ -756,7 +736,7 @@
<arg line="-in com.sun.jini.fiddler"/>
<arg line="${jskprivate.include}" />
<arg path="${build.classes.dir}/com/sun/jini/test/impl"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/jinitests.jar" index="false" >
<metainf dir="${src.dir}/manifest/qa1/META-INF">
@@ -775,7 +755,7 @@
<arg line="-in com.sun.jini.fiddler"/>
<arg line="${jskprivate.include}" />
<arg path="${build.classes.dir}/com/sun/jini/test/spec"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/jinitests.jar" index="false" update="true">
<fileset dir="${build.classes.dir}" includesfile="${jinitests.deps}" />
@@ -793,7 +773,7 @@
<arg path="${build.classes.dir}/com/sun/jini/test/services/lookupsimulator/LookupSimulatorProxyInterface.class"/>
<arg path="${build.classes.dir}/com/sun/jini/fiddler/FiddlerAdmin.class"/>
<arg path="${build.classes.dir}/com/sun/jini/fiddler/JavaSpaceAdmin.class"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/jinitests.jar" index="false" update="true">
<fileset dir="${build.classes.dir}" includesfile="${jinitests.deps}" />
@@ -817,7 +797,7 @@
<arg value="-files"/>
<arg line="-in com.sun.jini"/>
<arg line="com.sun.jini.qa.harness.MainWrapper"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-mainwrapper.jar" index="false" >
<fileset dir="${build.classes.dir}" includesfile="${qa1-mainwrapper.deps}"/>
@@ -838,7 +818,7 @@
<arg line="-in com.sun.jini.qa"/>
<arg line="-in com.sun.jini.tool"/>
<arg line="com.sun.jini.start.DestroySharedGroup"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/jiniharness.jar" index="false" >
<fileset dir="${build.classes.dir}" includesfile="${jiniharness.deps}"/>
@@ -865,7 +845,7 @@
<arg line="-show com.sun.jini.qa"/>
<arg line="-show com.sun.jini.qaman"/>
<arg line="com.sun.jini.qa.harness.QARunner"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qaman.jar" index="false" manifest="${src.dir}/manifest/qa1.mf">
<fileset dir="${build.classes.dir}" includesfile="${qaman.deps}"/>
@@ -880,7 +860,7 @@
</target>
<target name="qa1-start.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/test/impl/start/ProbeImpl.class" />
<include name="com/sun/jini/test/impl/start/BadServiceProxyAccessorImpl.class" />
<include name="com/sun/jini/test/impl/start/TestServiceImpl.class" />
@@ -899,7 +879,7 @@
<arg line="com.sun.jini.test.impl.start.BadServiceProxyAccessorImpl"/>
<arg line="com.sun.jini.test.impl.start.ProbeImpl_Stub"/>
<arg line="com.sun.jini.test.impl.start.BadServiceProxyAccessorImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-start-probe-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-start-probe-dl.deps}"/>
@@ -921,7 +901,7 @@
<arg line="com.sun.jini.test.impl.start.BadServiceProxyAccessorImpl_Stub"/>
<arg line="com.sun.jini.test.impl.start.UnsharedProbeImpl"/>
<arg line="com.sun.jini.test.impl.start.NoStubProbeImpl"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-start-probe.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-start-probe.deps}"/>
@@ -941,7 +921,7 @@
<arg line="com.sun.jini.test.impl.start.BadServiceProxyAccessorImpl_Stub"/>
<arg line="com.sun.jini.test.impl.start.UnsharedProbeImpl"/>
<arg line="com.sun.jini.test.impl.start.NoStubProbeImpl"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-start-probe.jar" index="false" update="true">
<fileset dir="${build.classes.dir}" includesfile="${qa1-start-probe.deps}"/>
@@ -979,7 +959,7 @@
<arg line="com.sun.jini.test.impl.start.CodebaseTest"/>
<arg line="com.sun.jini.test.impl.start.SecurityTest"/>
<arg line="com.sun.jini.test.impl.start.SecurityTestNonActivatable"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-start-tests.jar" index="false" update="true">
<fileset dir="${build.classes.dir}" includesfile="${qa1-start-tests.deps}"/>
@@ -996,7 +976,7 @@
<arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceImpl"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-start-testservice1.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-start-testservice1.deps}"/>
@@ -1015,7 +995,7 @@
<arg line="-hide com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceImpl"/>
<arg line="com.sun.jini.test.impl.start.TestServiceImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-start-testservice1.jar" index="false" update="true">
<fileset dir="${river.classes.dir}" includesfile="${qa1-start-testservice1.deps}"/>
@@ -1047,7 +1027,7 @@
<arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceImpl"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-start-testservice2.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-start-testservice2.deps}"/>
@@ -1066,7 +1046,7 @@
<arg line="-hide com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceImpl"/>
<arg line="com.sun.jini.test.impl.start.TestServiceImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-start-testservice2.jar" index="false" update="true">
<fileset dir="${river.classes.dir}" includesfile="${qa1-start-testservice2.deps}"/>
@@ -1099,7 +1079,7 @@
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceDummyClass0"/>
<arg line="com.sun.jini.test.impl.start.TestServiceSharedMap"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-start-testservice-common.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-start-testservice-common.deps}"/>
@@ -1116,7 +1096,7 @@
<arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.impl.start.TestServiceDummyClass0"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-start-testservice-common-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-start-testservice-common-dl.deps}"/>
@@ -1172,7 +1152,7 @@
</target>
<target name="qa1-lookup-simulator.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/test/services/lookupsimulator/LookupSimulatorImpl.class" />
</rmic>
</target>
@@ -1187,7 +1167,7 @@
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl"/>
<arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-lookup-simulator.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-lookup-simulator.deps}"/>
@@ -1202,7 +1182,7 @@
<arg line="-hide com.sun.jini.test"/>
<arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl"/>
<arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-lookup-simulator.jar" index="false" update="true">
<fileset dir="${build.classes.dir}" includesfile="${qa1-lookup-simulator.deps}"/>
@@ -1223,7 +1203,7 @@
<arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorProxyVerifier"/>
<arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl"/>
<arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-lookup-simulator-dl.jar" index="false">
<metainf dir="${src.dir}/manifest/simulator-dl/META-INF">
@@ -1241,7 +1221,7 @@
<arg line="-hide com.sun.jini.test"/>
<arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl"/>
<arg line="com.sun.jini.test.services.lookupsimulator.LookupSimulatorImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-lookup-simulator-dl.jar" index="false" update="true">
<fileset dir="${build.classes.dir}" includesfile="${qa1-lookup-simulator-dl.deps}"/>
@@ -1250,7 +1230,7 @@
</target>
<target name="qa1-share.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/test/share/KillVMUtil$$KillVMObjectImpl.class" />
<include name="com/sun/jini/test/share/reggie/RegistrarImpl.class" />
<include name="com/sun/jini/test/share/TesterTransactionManager.class" />
@@ -1287,7 +1267,7 @@
<arg line="com.sun.jini.test.share.TesterTransactionManager_Stub"/>
<arg line="com.sun.jini.test.share.LeaseBackEndImpl_Stub"/>
<arg line="com.sun.jini.test.share.TestParticipantImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-share-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-share-dl.deps}"/>
@@ -1315,7 +1295,7 @@
<arg line="com.sun.jini.test.share.TesterTransactionManager_Stub"/>
<arg line="com.sun.jini.test.share.LeaseBackEndImpl_Stub"/>
<arg line="com.sun.jini.test.share.TestParticipantImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-share-dl.jar" index="false" update="true">
<fileset dir="${build.classes.dir}" includesfile="${qa1-share-dl.deps}"/>
@@ -1339,7 +1319,7 @@
<arg line="com.sun.jini.test.share.TesterTransactionManager_Stub"/>
<arg line="com.sun.jini.test.share.LeaseBackEndImpl_Stub"/>
<arg line="com.sun.jini.test.share.TestParticipantImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-reggie-race.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-reggie-race.deps}"/>
@@ -1373,7 +1353,7 @@
<arg line="com.sun.jini.test.share.TesterTransactionManager_Stub"/>
<arg line="com.sun.jini.test.share.LeaseBackEndImpl_Stub"/>
<arg line="com.sun.jini.test.share.TestParticipantImpl_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-reggie-race-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-reggie-race-dl.deps}"/>
@@ -1390,7 +1370,7 @@
<arg value="-files"/>
<arg line="-in com.sun.jini.test"/>
<arg line="com.sun.jini.test.support.FullLoggingFilter"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/fullloggingfilter.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${fullloggingfilter.deps}"/>
@@ -1399,7 +1379,7 @@
</target>
<target name="qa1-discoveryservice.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/test/share/DiscoveryServiceUtil$$BasicEventListener.class" />
<include name="com/sun/jini/test/spec/discoveryservice/lease/LeaseExpiration$$ServiceEventListener.class" />
<include name="com/sun/jini/test/spec/discoveryservice/AbstractBaseTest$$LDSEventListener.class"/>
@@ -1419,7 +1399,7 @@
<arg line="com.sun.jini.test.spec.discoveryservice.AbstractBaseTest$$LDSEventListener_Stub"/>
<arg line="com.sun.jini.test.share.AttributesUtil$$TestAttr00"/>
<arg line="com.sun.jini.test.share.AttributesUtil$$TestAttrSC00"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-discoveryservice-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-discoveryservice-dl.deps}"/>
@@ -1458,7 +1438,7 @@
</target>
<target name="iiop.stubs" depends="compile">
- <rmic base="${build.classes.dir}" iiop="true" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" iiop="true" classpathref="river.jars">
<include name="com/sun/jini/test/spec/iiop/util/TestRemoteObject.class" />
</rmic>
</target>
@@ -1496,7 +1476,7 @@
<arg line="${jskplatform.exclude}"/>
<arg line="com.sun.jini.test.spec.io.util.FakeIntegrityVerifier"/>
<arg path="${build.classes.dir}/com/sun/jini/test/spec/io/marshalinputstream"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-io-marshalinputstream-test.jar" index="false" update="true">
<fileset dir="${build.classes.dir}" includesfile="${qa1-io-marshalinputstream-test.deps}"/>
@@ -1524,7 +1504,7 @@
<arg line="${jskplatform.exclude}"/>
<arg line="com.sun.jini.test.spec.io.util.FakeIntegrityVerifier"/>
<arg path="${build.classes.dir}/com/sun/jini/test/spec/io/marshalledinstance"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-io-marshalledinstance-test.jar" index="false" update="true">
<fileset dir="${build.classes.dir}" includesfile="${qa1-io-marshalledinstance-test.deps}"/>
@@ -1532,7 +1512,7 @@
</target>
<target name="qa1-javaspace.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/test/spec/javaspace/conformance/ParticipantImpl.class" />
<include name="com/sun/jini/test/spec/javaspace/conformance/NotifyCounter.class" />
<include name="com/sun/jini/test/spec/javaspace/conformance/TestEventListener05.class" />
@@ -1550,7 +1530,7 @@
<arg line="com.sun.jini.test.spec.javaspace.conformance.ParticipantImpl_Stub"/>
<arg line="com.sun.jini.test.spec.javaspace.conformance.NotifyCounter_Stub"/>
<arg line="com.sun.jini.test.spec.javaspace.conformance.TestEventListener05_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-javaspace-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-javaspace-dl.deps}"/>
@@ -1562,13 +1542,13 @@
</target>
<target name="jrmp.stubs" depends="compile">
- <rmic base="${build.classes.dir}" iiop="true" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" iiop="true" classpathref="river.jars">
<include name="com/sun/jini/test/spec/jrmp/util/TestRemoteObject.class" />
</rmic>
</target>
<target name="qa1-lookupservice.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/test/spec/lookupservice/test_set00/EvntLeaseExpiration$$Listener.class" />
<include name="com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrAdd$$Listener.class" />
<include name="com/sun/jini/test/spec/lookupservice/test_set00/NotifyOnAttrMod$$Listener.class" />
@@ -1630,7 +1610,7 @@
<arg line="com.sun.jini.test.spec.lookupservice.test_set02.NotifyOnAttrSet$$Listener_Stub"/>
<arg line="com.sun.jini.test.spec.lookupservice.test_set02.NotifyOnComboAttrSet$$Listener_Stub"/>
<arg line="com.sun.jini.test.spec.lookupservice.test_set02.NotifyExceptionTest$$Listener_Stub"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-lookupservice-dl.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${qa1-lookupservice-dl.deps}"/>
@@ -1646,7 +1626,7 @@
</target>
<target name="qa1-renewalservice.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.classpath">
+ <rmic base="${build.classes.dir}" stubversion="1.2" classpathref="river.jars">
<include name="com/sun/jini/test/share/LeaseBackEndImpl.class" />
<include name="com/sun/jini/test/share/RemoteListener.class" />
</rmic>
@@ -1667,7 +1647,7 @@
<arg line="com.sun.jini.test.share.ConstrainableTestLease"/>
<arg line="com.sun.jini.test.share.UnreadableTestLease"/>
<arg line="com.sun.jini.test.share.ConstrainableUnreadableTestLease"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-renewalservice-dl.jar" index="false">
<fileset dir="${build.classes.dir}">
@@ -1682,7 +1662,7 @@
<arg line="-in net.jini"/>
<arg line="${jskplatform.exclude}"/>
<arg line="com.sun.jini.proxy.BasicProxyTrustVerifier"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-renewalservice-dl.jar" index="false" update="true">
<fileset dir="${river.classes.dir}" includesfile="${qa1-renewalservice-dl.deps}"/>
@@ -1722,7 +1702,7 @@
<arg line="com.sun.jini.test.spec.servicediscovery.AbstractBaseTest$$TestService"/>
<arg line="com.sun.jini.test.spec.servicediscovery.AbstractBaseTest$$TestServiceIntAttr"/>
<arg line="net.jini.lookup.entry.Name"/>
- <classpath refid="classdep.classpath"/>
+
</classdep>
<jar destfile="${lib.dir}/qa1-servicediscovery-dl.jar" index="false">
<metainf dir="${src.dir}/manifest/servicediscovery-dl/META-INF">
@@ -1744,7 +1724,6 @@
<arg line="com.sun.jini.test.spec.servicediscovery.AbstractBaseTest$$TestService"/>
<arg line="com.sun.jini.test.spec.servicediscovery.AbstractBaseTest$$TestServiceIntAttr"/>
<arg line="net.jini.lookup.entry.Name"/>
- <classpath refid="classdep.classpath"/>
</classdep>
<jar destfile="${lib.dir}/qa1-servicediscovery-dl.jar" index="false" update="true">
<fileset dir="${river.classes.dir}" includesfile="${qa1-servicediscovery-dl.deps}"/>