From: Ruel L. <rue...@jb...> - 2005-08-18 19:33:59
|
User: rloehr Date: 05/08/17 14:51:45 Modified: jboss-admin-console build.xml Log: added properties to libraries.ent file, removed hardcoding of paths in lieau of property references, updated version of antlr used Revision Changes Path 1.24 +60 -30 jboss-admin-console/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-admin-console/build.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -b -r1.23 -r1.24 --- build.xml 4 Aug 2005 19:07:12 -0000 1.23 +++ build.xml 17 Aug 2005 18:51:45 -0000 1.24 @@ -28,11 +28,7 @@ <!-- ========= --> &libraries; - <!-- Add libraries here that are not in libraries.ent --> - <path id="apache.commons.beanutils.classpath"> - <pathelement path="${apache.commons.lib}/commons-beanutils.jar"/> - <pathelement path="${apache.commons.lib}/commons-validator-1.1.3.jar"/> - </path> + <!-- The combined library classpath --> <path id="library.classpath"> @@ -41,10 +37,11 @@ <path refid="apache.struts.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="apache.commons.classpath"/> - <path refid="apache.commons.beanutils.classpath"/> <path refid="dom4j.dom4j.classpath"/> <path refid="jboss.messaging.classpath"/> <path refid="hibernate3.classpath"/> + <path refid="apache.beanutils.classpath"/> + <path refid="apache.validator.classpath"/> </path> <!-- ======= --> @@ -138,20 +135,42 @@ <copy todir="output/ant/lib/WEB-INF-jars/" flatten="true"> <!-- NEW LIBRARY: Add path to jars to be included in WEB-INF/lib here. This will include all runtime dependencies --> - <fileset dir="${basedir}/.." includes=" - thirdparty/apache-struts/lib/struts-1.2.6.jar, - thirdparty/antlr/lib/antlr-2.7.4.jar, - thirdparty/apache-taglibs/lib/jstl-1.1.2.jar, - thirdparty/apache-taglibs/lib/standard-1.1.2.jar, - thirdparty/apache-oro/lib/jakarta-oro-2.0.8.jar, - thirdparty/apache-commons/lib/commons-validator-1.1.3.jar, - thirdparty/apache-commons/lib/commons-digester-1.6.jar, - thirdparty/apache-commons/lib/commons-logging.jar, - thirdparty/apache-commons/lib/commons-beanutils.jar, - thirdparty/apache-commons/lib/commons-fileupload.jar, - thirdparty/apache-commons/lib/commons-lang-2.0.jar, - thirdparty/dom4j-dom4j/lib/dom4j.jar - "/> + <fileset dir="${apache.struts.lib}"> + <include name="struts*.jar"/> + </fileset> + <fileset dir="${antlr.antlr.lib}"> + <include name="antlr-2.7.5H3.jar"/> + </fileset> + <fileset dir="${apache.taglibs.lib}"> + <include name="jstl*.jar"/> + <include name="standard*.jar"/> + </fileset> + <fileset dir="${apache.oro.lib}"> + <include name="jakarta-oro*.jar"/> + </fileset> + <fileset dir="${apache.validator.lib}"> + <include name="commons-validator*.jar"/> + </fileset> + <fileset dir="${apache.digester.lib}"> + <include name="commons-digester-1.6.jar"/> + </fileset> + <fileset dir="${apache.logging.lib}"> + <include name="commons-logging.jar"/> + </fileset> + <fileset dir="${apache.beanutils.lib}"> + <include name="commons-beanutils*.jar"/> + </fileset> + <fileset dir="${apache.fileupload.lib}"> + <include name="commons-fileupload*.jar"/> + </fileset> + <fileset dir="${apache.lang.lib}"> + <include name="commons-lang-2.0.jar"/> + </fileset> + <fileset dir="${dom4j.dom4j.lib}"> + <include name="dom4j*.jar"/> + </fileset> + + <fileset dir="${basedir}/tmp_libs" includes="displaytag-1.0-rc1.jar, wsabi4j2ee.jar, @@ -166,16 +185,27 @@ <copy todir="output/ant/lib/test-jars/" flatten="true"> <!-- NEW LIBRARY: Add path to jars which are required for running tests here. This will include all compile time and run time test specific dependencies --> - <fileset dir="${basedir}/.." includes=" - thirdparty/apache-log4j/lib/log4j.jar - thirdparty/junit-junit/lib/junit.jar, - thirdparty/easymock/lib/easymock-1.1.jar, - thirdparty/easymock/lib/easymockclassextension.jar, - thirdparty/struts-test-case/lib/strutstest-2.1.3.jar, - thirdparty/apache-commons/lib/commons-collections.jar, - thirdparty/cglib/lib/cglib-2.1.1.jar, - thirdparty/hibernate/lib/asm.jar - "/> + <fileset dir="${apache.log4j.lib}"> + <include name="log4j*.jar"/> + </fileset> + <fileset dir="${junit.junit.lib}"> + <include name="junit*.jar"/> + </fileset> + <fileset dir="${easymock.easymock.lib}"> + <include name="easymock*.jar"/> + </fileset> + <fileset dir="${struts.test.case.lib}"> + <include name="strutstest*.jar"/> + </fileset> + <fileset dir="${cglib.lib}"> + <include name="cglib*.jar"/> + </fileset> + <fileset dir="${asm.asm.lib}"> + <include name="asm.jar"/> + </fileset> + <fileset dir="${apache.collections.lib}"> + <include name="commons-collections.jar"/> + </fileset> </copy> </target> |