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

svn commit: r1043952 - in /incubator/river/jtsk/trunk: build.xml common.xml hudson.xml qa/build.xml

Author: sijskes
Date: Thu Dec  9 13:03:03 2010
New Revision: 1043952

URL: http://svn.apache.org/viewvc?rev=1043952&view=rev
Log:
removed extlibs

Modified:
    incubator/river/jtsk/trunk/build.xml
    incubator/river/jtsk/trunk/common.xml
    incubator/river/jtsk/trunk/hudson.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=1043952&r1=1043951&r2=1043952&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/build.xml (original)
+++ incubator/river/jtsk/trunk/build.xml Thu Dec  9 13:03:03 2010
@@ -239,9 +239,7 @@
             <pathelement path="${src.dir}"/>
         </path>
         <path id="javadoc.classpath" >
-            <fileset dir="${extlibs.dir}">
-                <include name="*.jar"/>
-            </fileset>
+            <fileset refid="asm.jars"/>
         </path>
     </target>
 
@@ -495,7 +493,7 @@
 
     <target name="copy-extlibs" >
         <copy todir="lib">
-            <fileset dir="${extlibs.dir}" includes="*.jar"/>
+            <fileset refid="asm.jars"/>
         </copy>
     </target>
 

Modified: incubator/river/jtsk/trunk/common.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/common.xml?rev=1043952&r1=1043951&r2=1043952&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/common.xml (original)
+++ incubator/river/jtsk/trunk/common.xml Thu Dec  9 13:03:03 2010
@@ -71,8 +71,6 @@
     <property name="lib-dl.dir" location="${lib-dl}"/>
     <property name="lib-ext.dir" location="${lib-ext}"/>
 
-    <property name="extlibs.dir" location="${root}/extlibs"/>
-
     <property name="test.dir" value="${test}"/>
     <property name="test.src.dir" value="${test.src}"/>
     <property name="test.lib.dir" value="${test.lib}"/>
@@ -106,8 +104,6 @@
     <property name="river.classes.dir" location="${river.home}/${build.classes}"/>
     <property name="river.src.dir" location="${river.home}/${src}"/>
 
-    <property name="asm.jars.pattern" value="asm*.jar" />
-
     <property name="debug" value="true"/>
     <property name="verbose" value="false"/>
     <!-- Possible values for 'debuglevel': none or combination of lines,source,vars -->
@@ -129,8 +125,9 @@
         <pathelement path="${river.classes.dir}"/>
     </path>
 
-    <fileset id="asm.jars" dir="${river.lib.dir}">
-        <include name="${asm.jars.pattern}"/>
+    <fileset id="asm.jars" dir="asm">
+        <include name="asm-3.2.jar" />
+        <include name="asm-commons-3.2.jar" />
     </fileset>
 
     <path id="asm.classpath">

Modified: incubator/river/jtsk/trunk/hudson.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/hudson.xml?rev=1043952&r1=1043951&r2=1043952&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/hudson.xml (original)
+++ incubator/river/jtsk/trunk/hudson.xml Thu Dec  9 13:03:03 2010
@@ -24,7 +24,7 @@
             <fileset dir="animal-sniffer">
                 <include name="**/*.jar"/>
             </fileset>
-            <fileset dir="extlibs">
+            <fileset dir="asm">
                 <include name="**/*.jar"/>
             </fileset>
         </classpath>

Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=1043952&r1=1043951&r2=1043952&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Thu Dec  9 13:03:03 2010
@@ -400,9 +400,7 @@
                 >
             <bottom><![CDATA[${api.copyright}]]></bottom>
             <classpath>
-                <fileset dir="${extlibs.dir}">
-                    <include name="*.jar"/>
-                </fileset>
+                <fileset refid="asm.jars"/>
             </classpath>
             <sourcepath>
                 <pathelement path="${src.dir}/../../src/"/>