[jboss-cvs] JBossAS SVN: r90567 - trunk/testsuite.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 24 15:17:06 EDT 2009
Author: pgier
Date: 2009-06-24 15:17:06 -0400 (Wed, 24 Jun 2009)
New Revision: 90567
Modified:
trunk/testsuite/build.xml
Log:
[JBBUILD-531] Move path generation into a target.
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-06-24 18:36:41 UTC (rev 90566)
+++ trunk/testsuite/build.xml 2009-06-24 19:17:06 UTC (rev 90567)
@@ -113,8 +113,16 @@
&libraries;
&testsuite-libraries;
- <!-- The combined library classpath -->
- <path id="library.classpath">
+ <!-- ======= -->
+ <!-- Modules -->
+
+ &modules;
+
+ <target name="init-paths" depends="init-dependencies"
+ description="initialize the classpath refs">
+
+ <!-- The combined library classpath -->
+ <path id="library.classpath">
<path refid="apache.avalon.classpath"/>
<path refid="apache.commons.classpath"/>
<path refid="apache.codec.classpath"/>
@@ -175,8 +183,8 @@
<path refid="hibernate3.classpath"/>
<path refid="odmg.classpath"/>
<path refid="cglib.classpath"/>
- <!-- Need spring jar for spring-based tests -->
- <path refid="spring.classpath"/>
+ <!-- Need spring jar for spring-based tests -->
+ <path refid="spring.classpath"/>
<!-- xml binding -->
<path refid="xmlunit.xmlunit.classpath"/>
@@ -193,28 +201,23 @@
<!-- org.jboss.aspects:jboss-aspects -->
<path refid="org.jboss.aspects.classpath"/>
- </path>
+ </path>
- <!-- ======= -->
- <!-- Modules -->
-
- &modules;
-
- <!-- ======= -->
- <!-- InternalServer -->
- <!-- This could be a mistake. Perhaps, though, it would be a good idea to separate
- tests that need internal jboss classes from those that don't. When I put it in, only
- the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)-->
- <property name="jboss.internal-server.root" value="${project.root}/server/output"/>
- <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/>
- <path id="jboss.internal-server.classpath">
+ <!-- ======= -->
+ <!-- InternalServer -->
+ <!-- This could be a mistake. Perhaps, though, it would be a good idea to separate
+ tests that need internal jboss classes from those that don't. When I put it in, only
+ the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)-->
+ <property name="jboss.internal-server.root" value="${project.root}/server/output"/>
+ <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/>
+ <path id="jboss.internal-server.classpath">
<pathelement path="${jboss.server.lib}/jboss.jar"/>
<pathelement path="${jboss.server.lib}/jboss-main.jar"/>
<pathelement path="${jboss.server.lib}/jboss-system.jar"/>
- </path>
+ </path>
- <!-- The combined dependant module classpath -->
- <path id="dependentmodule.classpath">
+ <!-- The combined dependant module classpath -->
+ <path id="dependentmodule.classpath">
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
<path refid="jboss.cluster.classpath"/>
@@ -249,8 +252,60 @@
<path refid="jboss.varia.classpath"/>
<path refid="jboss.web.classpath"/>
<path refid="jboss.spring.classpath"/>
- </path>
+ </path>
+ <!-- The combined thirdparty classpath -->
+ <path id="thirdparty.classpath">
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ </path>
+
+ <path id="javac.classpath">
+ <path refid="thirdparty.classpath"/>
+ </path>
+
+ <!-- classpath and local.classpath must have a value using with a path -->
+ <property name="classpath" value=""/>
+ <property name="local.classpath" value=""/>
+
+ <!-- Classpath to build and run the tests -->
+ <path id="tests.compile.classpath">
+ <pathelement path="${classpath}"/>
+ <pathelement path="${local.classpath}"/>
+ <pathelement path="${project.tools}/lib/ant.jar"/>
+ <pathelement path="${project.tools}/lib/ant-junit.jar"/>
+ <path refid="jboss.ejb3.classpath"/>
+ <path refid="jboss.jmx-remoting.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ <path refid="jboss.tomcat.classpath"/>
+ <path refid="thirdparty.classpath"/>
+ </path>
+
+ <!-- Classpath to build and run the tests -->
+ <path id="tests.classpath">
+ <fileset dir="${jboss.dist}/client">
+ <include name="**/*.jar"/>
+ <exclude name="jaxws-rt.jar"/>
+ <exclude name="jaxws-tools.jar"/>
+ </fileset>
+
+ <pathelement path="${classpath}"/>
+ <pathelement path="${local.classpath}"/>
+ <pathelement path="${project.tools}/lib/ant.jar"/>
+ <pathelement path="${project.tools}/lib/ant-junit.jar"/>
+ <path refid="jboss.ejb3.classpath"/>
+ <path refid="jboss.jmx-remoting.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ <path refid="thirdparty.classpath"/>
+ </path>
+
+ <!-- The classpath required to build javadocs. -->
+ <path id="javadoc.classpath">
+ <path refid="tests.compile.classpath"/>
+ </path>
+
+ </target>
+
<!-- RMI Stub generation -->
<patternset id="rmic.includes"
description="The patternset passed to the compile-stubs target">
@@ -291,59 +346,9 @@
<property name="release.id" value="${install.id}"/>
<property name="install.root" value="${module.output}/${install.id}"/>
- <!-- The combined thirdparty classpath -->
- <path id="thirdparty.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </path>
-
- <path id="javac.classpath">
- <path refid="thirdparty.classpath"/>
- </path>
-
- <!-- classpath and local.classpath must have a value using with a path -->
- <property name="classpath" value=""/>
- <property name="local.classpath" value=""/>
-
- <!-- Classpath to build and run the tests -->
- <path id="tests.compile.classpath">
- <pathelement path="${classpath}"/>
- <pathelement path="${local.classpath}"/>
- <pathelement path="${project.tools}/lib/ant.jar"/>
- <pathelement path="${project.tools}/lib/ant-junit.jar"/>
- <path refid="jboss.ejb3.classpath"/>
- <path refid="jboss.jmx-remoting.classpath"/>
- <path refid="jboss.test.classpath"/>
- <path refid="jboss.tomcat.classpath"/>
- <path refid="thirdparty.classpath"/>
- </path>
-
<!-- Import the jboss server run targets -->
<import file="imports/server-config.xml"/>
- <!-- Classpath to build and run the tests -->
- <path id="tests.classpath">
- <fileset dir="${jboss.dist}/client">
- <include name="**/*.jar"/>
- <exclude name="jaxws-rt.jar"/>
- <exclude name="jaxws-tools.jar"/>
- </fileset>
-
- <pathelement path="${classpath}"/>
- <pathelement path="${local.classpath}"/>
- <pathelement path="${project.tools}/lib/ant.jar"/>
- <pathelement path="${project.tools}/lib/ant-junit.jar"/>
- <path refid="jboss.ejb3.classpath"/>
- <path refid="jboss.jmx-remoting.classpath"/>
- <path refid="jboss.test.classpath"/>
- <path refid="thirdparty.classpath"/>
- </path>
-
- <!-- The classpath required to build javadocs. -->
- <path id="javadoc.classpath">
- <path refid="tests.compile.classpath"/>
- </path>
-
<!-- Packages to include when generating api documentation -->
<property name="javadoc.packages" value="org.jboss.*"/>
@@ -403,7 +408,7 @@
</target>
- <target name="init" depends="init-dependencies">
+ <target name="init" depends="init-paths">
<record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
<mkdir dir="${build.gen-src}/org/jboss/test/cts/ejb"/>
<mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/>
More information about the jboss-cvs-commits
mailing list