[jboss-cvs] jboss-admin-console ...
Chi Lin
Chi.Lin at unisys.com
Thu Jul 20 17:26:19 EDT 2006
User: clin
Date: 06/07/20 17:26:19
Modified: jboss-admin-console .classpath-webtest build.xml
Log:
JBADMCON-145 Get 'htmlunit' required jars from either thirdparty repository or project directory.
Revision Changes Path
1.2 +9 -21 jboss-admin-console/.classpath-webtest
(In the diff below, changes in quantity of whitespace are not shown.)
Index: .classpath-webtest
===================================================================
RCS file: /cvsroot/jboss/jboss-admin-console/.classpath-webtest,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- .classpath-webtest 26 Jun 2006 18:14:25 -0000 1.1
+++ .classpath-webtest 20 Jul 2006 21:26:19 -0000 1.2
@@ -4,33 +4,21 @@
<classpathentry output="output/eclipse/test-classes" kind="src" path="src/test"/>
<classpathentry output="output/eclipse/webtest-classes" kind="src" path="src/webtest"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/htmlunit-1.8.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/commons-httpclient-3.0.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/jaxen-1.1-beta-8.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/js-1.6R2.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/nekohtml-0.9.5.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/saxpath-1.0-FCS.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/xercesImpl-2.6.2.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/xmlParserAPIs-2.2.1.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/commons-io-1.1.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/commons-beanutils-1.7.0.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/commons-cli-1.0.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/commons-codec-1.3.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/commons-collections-3.1.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/commons-jelly-1.0.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/commons-jelly-tags-log-1.0.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/commons-jexl-1.0.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/commons-lang-2.0.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/commons-logging-1.0.4.jar"/>
- <classpathentry kind="lib" path="output/eclipse/lib/webtest-jars/dom4j-1.5.jar"/>
+ <classpathentry kind="lib" path="tmp_libs/webtest/htmlunit-1.8.jar"/>
+ <classpathentry kind="lib" path="tmp_libs/webtest/commons-collections-3.1.jar"/>
+ <classpathentry kind="lib" path="tmp_libs/webtest/commons-httpclient-3.0.jar"/>
+ <classpathentry kind="lib" path="tmp_libs/webtest/commons-io-1.1.jar"/>
+ <classpathentry kind="lib" path="tmp_libs/webtest/js-1.6R2.jar"/>
+ <classpathentry kind="lib" path="tmp_libs/webtest/nekohtml-0.9.5.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jaxen/lib/jaxen.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-codec/lib/commons-codec-1.2.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-struts/lib/struts-1.2.6.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-beanutils/lib/commons-beanutils.jar"/>
- <classpathentry kind="lib" path="/thirdparty/apache-collections/lib/commons-collections.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-digester/lib/commons-digester-1.6.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-discovery/lib/commons-discovery.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-fileupload/lib/commons-fileupload.jar"/>
- <classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-lang/lib/commons-lang-2.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-logging/lib/commons-logging.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-pool/lib/commons-pool.jar"/>
1.42 +65 -67 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.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- build.xml 29 Jun 2006 22:05:05 -0000 1.41
+++ build.xml 20 Jul 2006 21:26:19 -0000 1.42
@@ -80,8 +80,6 @@
<property name="dir.src.resources" location="${dir.src}/resources" />
<property name="dir.src.resources.war" location="${dir.src.resources}/admin-console.war" />
- <property name="src.htmlunit" value="http://easynews.dl.sourceforge.net/sourceforge/htmlunit/htmlunit-1.8.zip" />
-
<!-- ===============================
compile: production source code
=============================== -->
@@ -180,25 +178,52 @@
Unit Tests
========== -->
- <!-- ==== classpath for compiling and running tests ====-->
+ <!-- ==== classpath for compiling and running unit tests ====-->
<path id="test.classpath">
- <pathelement location="${dir.out.webtest-classes}" />
<pathelement location="${dir.out.test-classes}" />
<pathelement location="${dir.out.main-classes}" />
+
<!-- include both regular runtime jars and test compile&runtime jars -->
<fileset dir="${dir.out}/lib">
<include name="**/*.jar" />
</fileset>
<fileset dir="${dir}/tmp_libs">
- <include name="**/*.jar" />
+ <include name="*.jar" />
+ </fileset>
+ <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>
- <pathelement location="${dir.src.resources}/admin-console.war" />
+ <fileset dir="${apache.collections.lib}">
+ <include name="commons-collections.jar" />
+ </fileset>
+ <fileset dir="${apache.xalan.lib}">
+ <include name="xalan.jar" />
+ </fileset>
+ <fileset dir="${jboss.common.lib}">
+ <include name="jboss-common.jar" />
+ </fileset>
+
<!-- include regular compile time dependencies -->
<path refid="thirdparty.classpath" />
</path>
<!-- ==== compile unit tests ==== -->
- <target name="compile-test" depends="compile,copy-test-jars">
+ <target name="compile-test" depends="compile">
<mkdir dir="${dir.out.test-classes}" />
<javac destdir="${dir.out.test-classes}" debug="true">
<classpath refid="test.classpath" />
@@ -250,44 +275,6 @@
</copy>
</target>
- <!-- collect all jar files required by unit tests in one location -->
- <!-- TODO: remove this when doing builds declaratively with jbossbuild.xml -->
- <target name="copy-test-jars">
- <mkdir dir="${dir.out.lib.test-jars}" />
- <copy todir="${dir.out.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="${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>
- <fileset dir="${apache.xalan.lib}">
- <include name="xalan.jar" />
- </fileset>
- <fileset dir="${jboss.common.lib}">
- <include name="jboss-common.jar" />
- </fileset>
- </copy>
- </target>
-
-
<!-- ========================== -->
<!-- Integration Tests (webtest)-->
<!-- ========================== -->
@@ -329,13 +316,43 @@
<!-- = production" to build the main console code. = -->
<!-- =============================================================================== -->
+ <!-- ==== classpath for compiling and running webtests ====-->
+ <path id="webtest.classpath">
+ <pathelement location="${dir.out.webtest-classes}" />
+ <pathelement location="${dir.out.test-classes}" />
+ <pathelement location="${dir.out.main-classes}" />
+
+ <!-- tmp_libs/webtest contains jars from htmlunit.zip that are
+ required to run webtest but are either not available in
+ thirdparty or has a version conflict with what's currently
+ used in thirdparty. -->
+ <fileset dir="${dir}/tmp_libs">
+ <include name="webtest/*.jar" />
+ </fileset>
+
+ <fileset dir="${apache.codec.lib}">
+ <include name="commons-codec*.jar" />
+ </fileset>
+ <fileset dir="${apache.xerces.lib}">
+ <include name="xercesImpl.jar" />
+ </fileset>
+ <fileset dir="${oswego.concurrent.lib}">
+ <include name="concurrent.jar" />
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jnp-client.jar" />
+ </fileset>
+
+ <path refid="test.classpath" />
+ </path>
+
<target name="webtest" depends="compile-webtest,copy-WEB-INF-jars,log-init">
<mkdir dir="${dir.out.report}" />
<sequential>
<junit printsummary="yes" haltonfailure="no">
<sysproperty key="adminConsole.jboss.home" value="${jboss.home}" />
<classpath>
- <path refid="test.classpath" />
+ <path refid="webtest.classpath" />
</classpath>
<formatter type="plain" />
<formatter type="xml" />
@@ -352,33 +369,14 @@
</target>
<!-- ======= Compile the integtration tests (manually invoked) ====== -->
- <target name="compile-webtest" depends="compile-test,copy-webtest-jars">
+ <target name="compile-webtest" depends="compile-test">
<mkdir dir="${dir.out.webtest-classes}" />
<javac destdir="${dir.out.webtest-classes}" debug="true" failonerror="true">
- <classpath refid="test.classpath" />
+ <classpath refid="webtest.classpath" />
<src path="${dir.src.webtest}" />
</javac>
</target>
- <!-- copy the htmlUnit distribution to the top of the build path -->
- <target name="copy-webtest-jars" >
- <mkdir dir="${dir.out.lib.webtest-jars}" />
- <mkdir dir="${dir.out.lib.tmp}" />
- <get src="${src.htmlunit}" dest="${dir.out.lib.tmp}/htmlunit-1.8.zip" usetimestamp="true" />
- <unzip src="${dir.out.lib.tmp}/htmlunit-1.8.zip" dest="${dir.out.lib.tmp}" overwrite="false">
- <patternset includes="**/*.jar" />
- </unzip>
- <copy todir="${dir.out.lib.webtest-jars}" flatten="true">
- <fileset dir="${dir.out.lib.tmp}/htmlunit-1.8">
- <include name="**/*.jar" />
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="concurrent.jar" />
- <include name="jnp-client.jar" />
- </fileset>
- </copy>
- </target>
-
<!-- ======= clean the test classes -->
<target name="clean-test">
<delete dir="${dir.out.test-classes}" includeemptydirs="true" />
More information about the jboss-cvs-commits
mailing list