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/04/19 22:58:30 UTC
svn commit: r766515 - /incubator/river/jtsk/trunk/qa/build.xml
Author: jcosters
Date: Sun Apr 19 20:58:30 2009
New Revision: 766515
URL: http://svn.apache.org/viewvc?rev=766515&view=rev
Log:
RIVER-301: fixed missing net/jini/lookup/DiscoveryAdmin in qa1-lookup*.jar, fixed missing resources in jiniharness.jar
Modified:
incubator/river/jtsk/trunk/qa/build.xml
Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=766515&r1=766514&r2=766515&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Sun Apr 19 20:58:30 2009
@@ -76,7 +76,7 @@
<property name="harness.servicemode" value="transient"/>
<!-- resources to copy to classes dir -->
- <property name="resources" value="**/resources/**, **/*.td, **/*.properties,
+ <property name="resources" value="**/resources*/**, **/*.td, **/*.properties,
**/*.policy, **/*.config, **/*.logging, **/*.prop" />
<target name="clean" depends="clean-build, clean-lib, clean-trust, clean-doc"
@@ -133,7 +133,7 @@
<!-- 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}" />
- <!--<jvmarg value="-Djava.security.debug=access" />-->
+ <jvmarg value="-Djava.security.debug=access" />
<jvmarg value="-Djava.util.logging.config.file=${log.config}" />
<jvmarg value="-Dcom.sun.jini.jsk.home=${river.home}" />
<jvmarg value="-Dcom.sun.jini.qa.home=${basedir}" />
@@ -141,8 +141,8 @@
<jvmarg value="-Dcom.sun.jini.qa.harness.configs=${harness.configs}" />
<!-- VM args for each test run: include our JDK extension directories
$${com.sun.jini.qa.harness.globalvmargs},-Dcom.sun.jini.test.home=$${com.sun.jini.test.home},-Dcom.sun.jini.test.port=$${com.sun.jini.test.port},-Dcom.sun.jini.qa.harness.policies=<url: com/sun/jini/test/resources/jinitest.policy>-Djava.security.debug=access-->
- <!--<jvmarg value="-Dcom.sun.jini.qa.harness.globalvmargs=$${com.sun.jini.qa.harness.globalvmargs},-Djava.ext.dirs=${ext.dirs},-Djava.security.debug=access"/>-->
- <jvmarg value="-Dcom.sun.jini.qa.harness.globalvmargs=$${com.sun.jini.qa.harness.globalvmargs},-Djava.ext.dirs=${ext.dirs}"/>
+ <jvmarg value="-Dcom.sun.jini.qa.harness.globalvmargs=$${com.sun.jini.qa.harness.globalvmargs},-Djava.ext.dirs=${ext.dirs},-Djava.security.debug=access"/>
+ <!--<jvmarg value="-Dcom.sun.jini.qa.harness.globalvmargs=$${com.sun.jini.qa.harness.globalvmargs},-Djava.ext.dirs=${ext.dirs}"/>-->
<arg path="${src.dir}/com/sun/jini/test/resources/qaHarness.prop" />
<arg value="-testJar"/>
<arg path="${lib.dir}/jinitests.jar" />
@@ -1084,6 +1084,7 @@
</classdep>
<jar destfile="${lib.dir}/qa1-lookup-simulator.jar" index="false" update="true">
<fileset dir="${build.classes.dir}" includesfile="${qa1-lookup-simulator.deps}"/>
+ <fileset dir="${river.classes.dir}" includesfile="${qa1-lookup-simulator.deps}"/>
</jar>
</target>
@@ -1116,6 +1117,7 @@
</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}"/>
+ <fileset dir="${river.classes.dir}" includesfile="${qa1-lookup-simulator-dl.deps}"/>
</jar>
</target>