[jboss-cvs] JBossAS SVN: r57697 - projects/admin-console/trunk
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 17 19:24:25 EDT 2006
Author: chilin
Date: 2006-10-17 19:24:24 -0400 (Tue, 17 Oct 2006)
New Revision: 57697
Modified:
projects/admin-console/trunk/build.xml
Log:
Getting various jar files from jboss repository now that they're not available in thirdparty any more.
Modified: projects/admin-console/trunk/build.xml
===================================================================
--- projects/admin-console/trunk/build.xml 2006-10-17 21:36:18 UTC (rev 57696)
+++ projects/admin-console/trunk/build.xml 2006-10-17 23:24:24 UTC (rev 57697)
@@ -44,14 +44,14 @@
<path id="library.classpath">
<!-- NEW LIBRARY: Add path references to additional libraries here, check in libraries.ent.
Should only really need to added entries here for things that are need at compile/junit time -->
- <path refid="apache.struts.classpath" />
+ <!-- path refid="apache.struts.classpath" / -->
<path refid="sun.servlet.classpath" />
<path refid="apache.commons.classpath" />
<path refid="dom4j.dom4j.classpath" />
<path refid="jboss.mq.classpath" />
<path refid="hibernate3.classpath" />
<path refid="apache.beanutils.classpath" />
- <path refid="apache.validator.classpath" />
+ <!-- path refid="apache.validator.classpath" / -->
</path>
<!-- ======= -->
@@ -66,11 +66,18 @@
<path refid="jboss.j2se.classpath" />
<path refid="jboss.varia.classpath" />
<path refid="jboss.system.classpath" />
+ <path refid="jboss.systemjmx.classpath" />
</path>
+
+ <path id="templibrary.classpath">
+ <pathelement path="${basedir}/tmp_libs/struts-1.2.6.jar"/>
+ <pathelement path="${basedir}/tmp_libs/commons-validator-1.1.3.jar"/>
+ </path>
<!-- The combined thirdparty classpath -->
<path id="thirdparty.classpath">
<path refid="library.classpath" />
+ <path refid="templibrary.classpath" />
<path refid="dependentmodule.classpath" />
</path>
@@ -98,20 +105,57 @@
<property name="dir.tmp_libs" location="${dir}/tmp_libs" />
<!-- ==============================================
- get-dom4j: get dom4j.jar from jboss repository
+ get-libs: get libraries from jboss repository
+ since they're not in thirdparty anymore
============================================== -->
- <target name="get-dom4j" description="get dom4j.jar from jboss repository">
+ <target name="get-libs" description="get libraries from jboss repository">
+ <!-- get dom4j.jar -->
<get src="http://repository.jboss.com/dom4j/1.6.1/lib/dom4j.jar"
dest="${dir.tmp_libs}/dom4j.jar"
usetimestamp="true" />
<available file="${dir.tmp_libs}/dom4j.jar" property="dom4j.jar.present" />
<fail unless="dom4j.jar.present" message="dom4j.jar is not present under the tmp_libs directory"/>
+
+ <!-- get struts-1.2.6.jar -->
+ <get src="http://repository.jboss.com/apache-struts/1.2.6/lib/struts-1.2.6.jar"
+ dest="${dir.tmp_libs}/struts-1.2.6.jar"
+ usetimestamp="true" />
+ <available file="${dir.tmp_libs}/struts-1.2.6.jar" property="struts.jar.present" />
+ <fail unless="struts.jar.present" message="struts-1.2.6.jar is not present under the tmp_libs directory"/>
+
+ <!-- get commons-validator-1.1.3.jar -->
+ <get src="http://repository.jboss.com/apache-validator/1.1.3/lib/commons-validator-1.1.3.jar"
+ dest="${dir.tmp_libs}/commons-validator-1.1.3.jar"
+ usetimestamp="true" />
+ <available file="${dir.tmp_libs}/commons-validator-1.1.3.jar" property="validator.jar.present" />
+ <fail unless="validator.jar.present" message="commons-validator-1.1.3.jar is not present under the tmp_libs directory"/>
+
+ <!-- get jstl-1.1.2.jar -->
+ <get src="http://repository.jboss.com/apache-taglibs/1.1.2/lib/jstl-1.1.2.jar"
+ dest="${dir.tmp_libs}/jstl-1.1.2.jar"
+ usetimestamp="true" />
+ <available file="${dir.tmp_libs}/jstl-1.1.2.jar" property="jstl.jar.present" />
+ <fail unless="jstl.jar.present" message="jstl-1.1.2.jar is not present under the tmp_libs directory"/>
+
+ <!-- get standard-1.1.2.jar -->
+ <get src="http://repository.jboss.com/apache-taglibs/1.1.2/lib/standard-1.1.2.jar"
+ dest="${dir.tmp_libs}/standard-1.1.2.jar"
+ usetimestamp="true" />
+ <available file="${dir.tmp_libs}/standard-1.1.2.jar" property="standard.jar.present" />
+ <fail unless="standard.jar.present" message="standard-1.1.2.jar is not present under the tmp_libs directory"/>
+
+ <!-- get strutstest-2.1.3.jar -->
+ <get src="http://repository.jboss.com/struts-test-case/2.1.3/lib/strutstest-2.1.3.jar"
+ dest="${dir.tmp_libs}/strutstest-2.1.3.jar"
+ usetimestamp="true" />
+ <available file="${dir.tmp_libs}/strutstest-2.1.3.jar" property="strutstest.jar.present" />
+ <fail unless="strutstest.jar.present" message="strutstest-2.1.3.jar is not present under the tmp_libs directory"/>
</target>
<!-- ===============================
compile: production source code
=============================== -->
- <target name="compile" depends="get-dom4j" description="compile: production source code">
+ <target name="compile" depends="get-libs" description="compile: production source code">
<mkdir dir="${dir.out.classes}" />
<depend destdir="${dir.out.classes}" srcdir="${dir.src.main}">
<classpath>
@@ -170,17 +214,17 @@
<copy todir="${dir.out.lib.webinf-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="${apache.struts.lib}">
+ <fileset dir="${dir.tmp_libs}">
<include name="struts*.jar" />
</fileset>
<fileset dir="${antlr.antlr.lib}">
<include name="antlr*.jar" />
</fileset>
- <fileset dir="${apache.taglibs.lib}">
+ <fileset dir="${dir.tmp_libs}">
<include name="jstl*.jar" />
<include name="standard*.jar" />
</fileset>
- <fileset dir="${apache.validator.lib}">
+ <fileset dir="${dir.tmp_libs}">
<include name="commons-validator*.jar" />
</fileset>
<fileset dir="${apache.digester.lib}">
@@ -237,7 +281,7 @@
<fileset dir="${easymock.easymock.lib}">
<include name="easymock*.jar" />
</fileset>
- <fileset dir="${struts.test.case.lib}">
+ <fileset dir="${dir.tmp_libs}">
<include name="strutstest*.jar" />
</fileset>
<fileset dir="${cglib.lib}">
@@ -252,9 +296,15 @@
<fileset dir="${apache.xalan.lib}">
<include name="xalan.jar" />
</fileset>
- <fileset dir="${jboss.common.lib}">
- <include name="jboss-common.jar" />
+ <fileset dir="${jboss.common.core.lib}">
+ <include name="jboss-common-core*.jar" />
</fileset>
+ <fileset dir="${jboss.microcontainer.lib}">
+ <include name="jboss-deployers.jar" />
+ </fileset>
+ <fileset dir="${jboss.common.logging.spi.lib}">
+ <include name="jboss-logging-spi*.jar" />
+ </fileset>
<!-- include regular compile time dependencies -->
<path refid="thirdparty.classpath" />
More information about the jboss-cvs-commits
mailing list