You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by th...@apache.org on 2010/11/02 12:15:12 UTC

svn commit: r1030002 - in /incubator/river/jtsk/skunk/Extra_SelfHealingProxy: build.xml common.xml

Author: thobbs
Date: Tue Nov  2 11:15:12 2010
New Revision: 1030002

URL: http://svn.apache.org/viewvc?rev=1030002&view=rev
Log:
Added tasks to build the extras.jar alongside the rest of the River distribution.

Modified:
    incubator/river/jtsk/skunk/Extra_SelfHealingProxy/build.xml
    incubator/river/jtsk/skunk/Extra_SelfHealingProxy/common.xml

Modified: incubator/river/jtsk/skunk/Extra_SelfHealingProxy/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/Extra_SelfHealingProxy/build.xml?rev=1030002&r1=1030001&r2=1030002&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/Extra_SelfHealingProxy/build.xml (original)
+++ incubator/river/jtsk/skunk/Extra_SelfHealingProxy/build.xml Tue Nov  2 11:15:12 2010
@@ -397,7 +397,11 @@
 		depends="river.jars,
             toolswrappers.jars,
             services.jars,
-            browser.jars" />
+            browser.jars,
+    		extras.jars" />
+	
+    <target name="extras.jars" depends="river.jars,
+    									extras.jar"/>
 
     <target name="river.jars" depends="stubs,
             jini-core.jar,
@@ -447,6 +451,15 @@
         </javac-cmd>
     </target>
 
+	<target name="compile-extras" description="Build classes"
+			depends="copy-resources">
+	    	<delete dir="${extras.classes.dir}"/>
+	    	<mkdir dir="${extras.classes.dir}"/>
+	        <javac-cmd source.dir="${extras.dir}" dest.dir="${extras.classes.dir}">
+	            <classpath refid="asm.classpath" />
+	        </javac-cmd>
+	    </target>
+	
     <target name="install-policy"
 		description="Installs jsk-policy.jar into the JRE extensions directory.">
         <copy file="${lib-ext.dir}/jsk-policy.jar" todir="${jre.ext.dir}"/>
@@ -594,6 +607,16 @@
 		      includes="META-INF/services/com.sun.jini.tool.envcheck.Plugin"/>
         </jar>
     </target>
+	
+	<target name="extras.jar" depends="compile-extras">
+	        <delete file="${lib.dir}/extras.jar" quiet="true"/>
+	        <jar destfile="${lib.dir}/extras.jar"
+			     index="false">
+	            <fileset dir="${extras.classes.dir}"
+				 includes="org/apache/river/extra/**"/>
+	        </jar>
+	    </target>
+	
     <!-- Scheduled for removal -->
     <target name="jini-core.jar" depends="stubs">
         <delete file="${lib.dir}/jini-core.jar" quiet="true"/>

Modified: incubator/river/jtsk/skunk/Extra_SelfHealingProxy/common.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/Extra_SelfHealingProxy/common.xml?rev=1030002&r1=1030001&r2=1030002&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/Extra_SelfHealingProxy/common.xml (original)
+++ incubator/river/jtsk/skunk/Extra_SelfHealingProxy/common.xml Tue Nov  2 11:15:12 2010
@@ -32,6 +32,7 @@
     <!-- Standard directory names -->
     <property name="doc" value="doc"/>
     <property name="src" value="src"/>
+	<property name="extras" value="extras"/>
     <property name="poms" value="poms"/>
     <property name="configentry" value="configentry"/>
     <property name="lib" value="lib"/>
@@ -55,6 +56,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="extras.dir" location="${extras}"/>
+	<property name="extras.classes.dir" location="${build}/extras/classes"/>
     <property name="poms.dir" location="${poms}"/>
     <property name="build.dir" location="${build}"/>
     <property name="build.classes.dir" location="${build.classes}"/>