river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcost...@apache.org
Subject svn commit: r766472 - in /incubator/river/jtsk/skunk/jcosters: common.xml qa/build.xml
Date Sun, 19 Apr 2009 14:16:28 GMT
Author: jcosters
Date: Sun Apr 19 14:16:26 2009
New Revision: 766472

URL: http://svn.apache.org/viewvc?rev=766472&view=rev
Log:
RIVER-301:
- fixed missing tie class for spec/jrmp tests
- add build.properties inclusion to common.xml allowing user to override build settings
- cosmetics

Modified:
    incubator/river/jtsk/skunk/jcosters/common.xml
    incubator/river/jtsk/skunk/jcosters/qa/build.xml

Modified: incubator/river/jtsk/skunk/jcosters/common.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/jcosters/common.xml?rev=766472&r1=766471&r2=766472&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/jcosters/common.xml (original)
+++ incubator/river/jtsk/skunk/jcosters/common.xml Sun Apr 19 14:16:26 2009
@@ -18,6 +18,9 @@
  !-->
 <project name="common" default="" basedir=".">
 
+    <!-- User specific settings -->
+    <property file="build.properties" />
+
     <!-- Product version info -->
     <property name="version" value="2.1.1"/>
     <property name="product.name" value="apache-river-${version}-incubating"/>

Modified: incubator/river/jtsk/skunk/jcosters/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/jcosters/qa/build.xml?rev=766472&r1=766471&r2=766472&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/jcosters/qa/build.xml (original)
+++ incubator/river/jtsk/skunk/jcosters/qa/build.xml Sun Apr 19 14:16:26 2009
@@ -81,23 +81,23 @@
     <property name="resources" value="**/resources/**, **/*.td, **/*.properties,
         **/*.policy, **/*.config, **/*.logging, **/*.prop" />
 
-    <target name="clean" depends="clean.build, clean.lib, clean.trust, clean.doc"
+    <target name="clean" depends="clean-build, clean-lib, clean-trust, clean-doc"
         description="Clean up build" />
 
-    <target name="clean.build">
+    <target name="clean-build">
         <delete dir="${build.dir}" />
     </target>
 
-    <target name="clean.lib">
+    <target name="clean-lib">
         <delete dir="${lib.dir}" />
         <delete dir="${lib-ext.dir}" />
     </target>
 
-    <target name="clean.doc">
+    <target name="clean-doc">
         <delete dir="${doc.api.dir}" />
     </target>
 
-    <target name="clean.trust">
+    <target name="clean-trust">
         <delete>
             <fileset dir="${trust.dir}">
                 <include name="*.cert" />
@@ -143,6 +143,7 @@
                 <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=&lt;url:
com/sun/jini/test/resources/jinitest.policy&gt;-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}"/>
                 <arg path="${src.dir}/com/sun/jini/test/resources/qaHarness.prop" />
                 <arg value="-testJar"/>
@@ -288,11 +289,11 @@
         qa1-lookup-simulator.stubs,
         qa1-share.stubs,
         qa1-discoveryservice.stubs,
-        iiop.stubs,
         qa1-javaspace.stubs,
-        jrmp.stubs,
         qa1-lookupservice.stubs,
-        qa1-renewalservice.stubs"
+        qa1-renewalservice.stubs,
+        jrmp.stubs,
+        iiop.stubs"
         description="Compile stubs"/>
 
     <target name="harness-killer.stubs" depends="compile">
@@ -1403,8 +1404,8 @@
     </target>
 
     <target name="jrmp.stubs" depends="compile">
-        <rmic base="${classes.dir}" stubversion="1.2" classpathref="river.classpath">
-            <include name="com/sun/jini/test/spec/iiop/util/TestRemoteObject.class" />
+        <rmic base="${classes.dir}" iiop="true" classpathref="river.classpath">
+            <include name="com/sun/jini/test/spec/jrmp/util/TestRemoteObject.class" />
         </rmic>
     </target>
 



Mime
View raw message