|
From: Thomas D. <tdi...@us...> - 2004-04-05 14:09:08
|
User: tdiesler
Date: 04/04/05 06:56:32
Modified: . build.xml
Log:
add xml binding test cases
Revision Changes Path
1.354 +45 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- build.xml 30 Mar 2004 17:33:24 -0000 1.353
+++ build.xml 5 Apr 2004 13:56:23 -0000 1.354
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.353 2004/03/30 17:33:24 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.354 2004/04/05 13:56:23 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -6347,6 +6347,50 @@
</target>
<!--
+ | Test the XML binding framework
+ -->
+
+ <target name="tests-xml" depends="maybejars">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}">
+
+ <jvmarg value="${junit.jvm.options}"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
+ <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
+ <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ </classpath>
+
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}">
+
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/xml/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--
| Run all database related tests
-->
|
|
From: Thomas D. <tdi...@us...> - 2004-04-05 14:34:16
|
User: tdiesler
Date: 04/04/05 07:21:39
Modified: . build.xml
Log:
add xml binding tests to standard unit tests
Revision Changes Path
1.355 +3 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- build.xml 5 Apr 2004 13:56:23 -0000 1.354
+++ build.xml 5 Apr 2004 14:21:39 -0000 1.355
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.354 2004/04/05 13:56:23 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.355 2004/04/05 14:21:39 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -5227,7 +5227,7 @@
tests-jbossmx-compliance,
tests-jbossmx-implementation,
tests-jbossmx-performance,
- tests-iiop-stress,
+ tests-iiop-stress,
tests-report">
</target>
@@ -5242,6 +5242,7 @@
tests-util-unit,
tests-jbossmx-compliance,
tests-jbossmx-implementation,
+ tests-xml,
tests-report">
</target>
|
|
From: Thomas D. <tdi...@us...> - 2004-04-09 22:57:18
|
User: tdiesler
Date: 04/04/09 15:43:55
Modified: . build.xml
Log:
add Tx timer tests
Revision Changes Path
1.356 +3646 -3563jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- build.xml 5 Apr 2004 14:21:39 -0000 1.355
+++ build.xml 9 Apr 2004 22:43:54 -0000 1.356
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.355 2004/04/05 14:21:39 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.356 2004/04/09 22:43:54 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -44,10 +44,10 @@
<target name="init" depends="_buildmagic:init">
<tstamp>
- <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/>
+ <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/>
</tstamp>
- <echo message="${TIMENOW}" file="run.tstamp" />
- <echo message="Set timestamp to: ${TIMENOW}" />
+ <echo message="${TIMENOW}" file="run.tstamp"/>
+ <echo message="Set timestamp to: ${TIMENOW}"/>
</target>
@@ -67,7 +67,7 @@
<target name="configure" unless="configure.disable">
<!-- Give user a chance to override without editing this file
(and without typing -D each time they run it) -->
- <property file=".ant.properties" />
+ <property file=".ant.properties"/>
<!-- =================== -->
<!-- Basic Configuration -->
@@ -109,13 +109,13 @@
<!-- needed for proxy tests -->
<path refid="apache.bcel.classpath"/>
- <!-- needed for security login module tests -->
- <path refid="hsqldb.hsqldb.classpath"/>
+ <!-- needed for security login module tests -->
+ <path refid="hsqldb.hsqldb.classpath"/>
- <!-- needed for webservice tests -->
- <path refid="apache.axis.classpath"/>
- <path refid="ibm.wsdl4j.classpath"/>
- <path refid="ibm.uddi4j.classpath"/>
+ <!-- needed for webservice tests -->
+ <path refid="apache.axis.classpath"/>
+ <path refid="ibm.wsdl4j.classpath"/>
+ <path refid="ibm.uddi4j.classpath"/>
</path>
<!-- ======= -->
@@ -123,9 +123,9 @@
<!-- ======= -->
&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)-->
+ <!-- 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">
@@ -148,7 +148,7 @@
<path refid="jboss.management.classpath"/>
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.varia.classpath"/>
- <path refid="jboss.jbossnet.classpath" />
+ <path refid="jboss.jbossnet.classpath"/>
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
<path refid="jboss.remoting.classpath"/>
@@ -241,7 +241,7 @@
marathon.timeout: ${marathon.timeout}
marathon.duration: ${marathon.duration}
marathon.threadcount: ${marathon.threadcount}
-]]></echo>
+ ]]></echo>
<!-- xdoclet -->
<path id="xdoclet.task.classpath">
@@ -250,23 +250,23 @@
<include name="**/*.jar"/>
</fileset>
<fileset dir="${project.root}/jboss.net/output/lib">
- <include name="xdoclet-*.jar" />
+ <include name="xdoclet-*.jar"/>
</fileset>
</path>
<property name="xdoclet.task.classpath"
- refid="xdoclet.task.classpath"/>
+ refid="xdoclet.task.classpath"/>
<property name="xdoclet.mergedir" value="${project.tools}/etc/xdoclet/templates}"/>
<!-- Setup the version 1 classes so the tests compile -->
- <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces" />
+ <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/>
<copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java"
file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt"
- overwrite="false" />
- <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton" />
+ overwrite="false"/>
+ <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/>
<copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt"
- overwrite="false" />
+ overwrite="false"/>
</target>
@@ -283,21 +283,21 @@
| documentation compiles.
-->
<target name="compile"
- depends="compile-classes, compile-xmbean-dds, compile-etc, compile-stylesheets, compile-resources"
- description="Compile all source files."/>
+ depends="compile-classes, compile-xmbean-dds, compile-etc, compile-stylesheets, compile-resources"
+ description="Compile all source files."/>
<!-- Compile EJB beans with XDoclet -->
<target name="compile-bean-sources" depends="init" unless="noxdoclet">
- <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
+ <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
<mkdir dir="${build.gen-src}"/>
-<!--ejbconf-->
+ <!--ejbconf-->
<mkdir dir="${build.resources}/ejb-conf/readonly/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.resources}/ejb-conf/readonly">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/ejb-conf/readonly">
<fileset dir="${source.java}">
<include name="org/jboss/test/ejbconf/beans/**/*Bean.java"/>
</fileset>
@@ -307,23 +307,23 @@
<homeinterface/>
<localhomeinterface/>
<!--session/-->
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/ejbconf/readonly/META-INF"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/ejbconf/readonly/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/ejbconf/readonly/META-INF"
- mergedir="${source.resources}/ejbconf/readonly/"
- Datasource="java:/DefaultDS"
- Typemapping="Hypersonic SQL"
- />
+ version="3.0"
+ destdir="${build.resources}/ejbconf/readonly/META-INF"
+ mergedir="${source.resources}/ejbconf/readonly/"
+ Datasource="java:/DefaultDS"
+ Typemapping="Hypersonic SQL"
+ />
</ejbdoclet>
<!--eardeployment, SessionA-->
<mkdir dir="${build.resources}/jmx/eardeployment/a/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.resources}/eardeployment/a">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/eardeployment/a">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/eardeployment/a/ejb/*Bean.java"/>
</fileset>
@@ -333,20 +333,20 @@
<homeinterface/>
<localhomeinterface/>
<!--session/-->
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/jmx/eardeployment/a/META-INF"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/jmx/eardeployment/a/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/jmx/eardeployment/a/META-INF"
- mergedir="${source.resources}/jmx/eardeployment/a/"/>
+ version="3.0"
+ destdir="${build.resources}/jmx/eardeployment/a/META-INF"
+ mergedir="${source.resources}/jmx/eardeployment/a/"/>
</ejbdoclet>
<!--eardeployment, SessionB-->
<mkdir dir="${build.resources}/jmx/eardeployment/b/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.resources}/eardeployment/b">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/eardeployment/b">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/eardeployment/b/ejb/*Bean.java"/>
</fileset>
@@ -356,60 +356,60 @@
<homeinterface/>
<localhomeinterface/>
<!--session/-->
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/jmx/eardeployment/b/META-INF"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/jmx/eardeployment/b/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/jmx/eardeployment/b/META-INF"
- mergedir="${source.resources}/jmx/eardeployment/b/"/>
+ version="3.0"
+ destdir="${build.resources}/jmx/eardeployment/b/META-INF"
+ mergedir="${source.resources}/jmx/eardeployment/b/"/>
</ejbdoclet>
<!-- eardepends Dependent[A/B] -->
<mkdir dir="${build.resources}/jmx/eardepends/depend/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.resources}/eardepends/dependent/META-INF">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/eardepends/dependent/META-INF">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/eardepends/dependent/ejb/*Bean.java"/>
</fileset>
<packageSubstitution packages="ejb" substituteWith="interfaces"/>
<remoteinterface/>
<homeinterface/>
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/jmx/eardepends/dependent/META-INF"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/jmx/eardepends/dependent/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.2"
- destdir="${build.resources}/jmx/eardepends/dependent/META-INF"
- mergedir="${source.resources}/jmx/eardepends/dependent/META-INF"/>
+ version="3.2"
+ destdir="${build.resources}/jmx/eardepends/dependent/META-INF"
+ mergedir="${source.resources}/jmx/eardepends/dependent/META-INF"/>
</ejbdoclet>
<!-- eardepends Independent -->
<mkdir dir="${build.resources}/jmx/eardepends/independent/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.resources}/eardepends/independent/META-INF">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/eardepends/independent/META-INF">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/eardepends/independent/ejb/*Bean.java"/>
</fileset>
<packageSubstitution packages="ejb" substituteWith="interfaces"/>
<remoteinterface/>
<homeinterface/>
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/jmx/eardepends/independent/META-INF"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/jmx/eardepends/independent/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.2"
- destdir="${build.resources}/jmx/eardepends/independent/META-INF"
- mergedir="${source.resources}/jmx/eardepends/independent/META-INF"/>
+ version="3.2"
+ destdir="${build.resources}/jmx/eardepends/independent/META-INF"
+ mergedir="${source.resources}/jmx/eardepends/independent/META-INF"/>
</ejbdoclet>
<!-- cmr written after post create -->
<mkdir dir="${build.resources}/cmp2/cmr/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.resources}/cmp2/cmr">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/cmp2/cmr">
<fileset dir="${source.java}">
<include name="org/jboss/test/cmp2/cmr/ejb/*Bean.java"/>
</fileset>
@@ -419,22 +419,22 @@
<homeinterface/>
<localhomeinterface/>
<!--session/-->
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/cmp2/cmr/META-INF"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/cmp2/cmr/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/cmp2/cmr/META-INF"
- mergedir="${source.resources}/cmp2/cmr/"
- Datasource="java:/DefaultDS"
- Typemapping="Hypersonic SQL"/>
+ version="3.0"
+ destdir="${build.resources}/cmp2/cmr/META-INF"
+ mergedir="${source.resources}/cmp2/cmr/"
+ Datasource="java:/DefaultDS"
+ Typemapping="Hypersonic SQL"/>
</ejbdoclet>
<!-- cmp2 passivation integrity test -->
<mkdir dir="${build.resources}/cmp2/passivation/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.resources}/cmp2/passivation">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/cmp2/passivation">
<fileset dir="${source.java}">
<include name="org/jboss/test/cmp2/passivation/ejb/*Bean.java"/>
</fileset>
@@ -444,22 +444,22 @@
<homeinterface/>
<localhomeinterface/>
<deploymentdescriptor
- destdir="${build.resources}/cmp2/passivation/META-INF"
- validatexml="${validatexml}"/>
+ destdir="${build.resources}/cmp2/passivation/META-INF"
+ validatexml="${validatexml}"/>
<jboss
- version="3.2"
- xmlencoding="UTF-8"
- destdir="${build.resources}/cmp2/passivation/META-INF"
- validatexml="${validatexml}"
- mergedir="${source.resources}/cmp2/passivation"/>
+ version="3.2"
+ xmlencoding="UTF-8"
+ destdir="${build.resources}/cmp2/passivation/META-INF"
+ validatexml="${validatexml}"
+ mergedir="${source.resources}/cmp2/passivation"/>
</ejbdoclet>
<!-- optimistic lock test -->
<mkdir dir="${build.resources}/cmp2/optimisticlock/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.resources}/cmp2/optimisticlock">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/cmp2/optimisticlock">
<fileset dir="${source.java}">
<include name="org/jboss/test/cmp2/optimisticlock/ejb/*Bean.java"/>
</fileset>
@@ -473,9 +473,9 @@
<!-- foreign key mapping tests -->
<mkdir dir="${build.resources}/cmp2/fkmapping/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.etc}/cmp2/fkmapping">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.etc}/cmp2/fkmapping">
<fileset dir="${source.java}">
<include name="org/jboss/test/cmp2/fkmapping/ejb/*Bean.java"/>
</fileset>
@@ -488,21 +488,21 @@
<entitycmp/>
<session/>
<deploymentdescriptor
- destdir="${build.resources}/cmp2/fkmapping/META-INF"
- validatexml="${validatexml}"/>
+ destdir="${build.resources}/cmp2/fkmapping/META-INF"
+ validatexml="${validatexml}"/>
<jboss
- version="3.2"
- xmlencoding="UTF-8"
- destdir="${build.resources}/cmp2/fkmapping/META-INF"
- validatexml="${validatexml}"/>
+ version="3.2"
+ xmlencoding="UTF-8"
+ destdir="${build.resources}/cmp2/fkmapping/META-INF"
+ validatexml="${validatexml}"/>
</ejbdoclet>
<!-- foreign key mapping stack overflow error tests -->
<mkdir dir="${build.resources}/cmp2/fkstackoverflow/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.etc}/cmp2/fkstackoverflow">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.etc}/cmp2/fkstackoverflow">
<fileset dir="${source.java}">
<include name="org/jboss/test/cmp2/fkstackoverflow/ejb/*Bean.java"/>
</fileset>
@@ -515,21 +515,21 @@
<entitycmp/>
<session/>
<deploymentdescriptor
- destdir="${build.resources}/cmp2/fkstackoverflow/META-INF"
- validatexml="${validatexml}"/>
+ destdir="${build.resources}/cmp2/fkstackoverflow/META-INF"
+ validatexml="${validatexml}"/>
<jboss
- version="3.2"
- xmlencoding="UTF-8"
- destdir="${build.resources}/cmp2/fkstackoverflow/META-INF"
- validatexml="${validatexml}"/>
+ version="3.2"
+ xmlencoding="UTF-8"
+ destdir="${build.resources}/cmp2/fkstackoverflow/META-INF"
+ validatexml="${validatexml}"/>
</ejbdoclet>
<!-- dbindex and post-table-create tests -->
<mkdir dir="${build.resources}/cmp2/idxandusersql/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.etc}/cmp2/idxandusersql">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.etc}/cmp2/idxandusersql">
<fileset dir="${source.java}">
<include name="org/jboss/test/cmp2/idxandusersql/ejb/*Bean.java"/>
</fileset>
@@ -558,9 +558,9 @@
<!-- ejbselect tests -->
<mkdir dir="${build.resources}/cmp2/ejbselect/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.etc}/cmp2/ejbselect">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.etc}/cmp2/ejbselect">
<fileset dir="${source.java}">
<include name="org/jboss/test/cmp2/ejbselect/*Bean.java"/>
</fileset>
@@ -571,21 +571,21 @@
<entitycmp/>
<session/>
<deploymentdescriptor
- destdir="${build.resources}/cmp2/ejbselect/META-INF"
- validatexml="${validatexml}"/>
+ destdir="${build.resources}/cmp2/ejbselect/META-INF"
+ validatexml="${validatexml}"/>
<jboss
- version="3.2"
- xmlencoding="UTF-8"
- destdir="${build.resources}/cmp2/ejbselect/META-INF"
- validatexml="${validatexml}"/>
+ version="3.2"
+ xmlencoding="UTF-8"
+ destdir="${build.resources}/cmp2/ejbselect/META-INF"
+ validatexml="${validatexml}"/>
</ejbdoclet>
<!-- cmp2 relationship stress tests -->
<mkdir dir="${build.resources}/cmp2/cmrstress/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.resources}/cmp2/cmrstress">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/cmp2/cmrstress">
<fileset dir="${source.java}">
<include name="org/jboss/test/cmp2/cmrstress/ejb/*Bean.java"/>
</fileset>
@@ -594,22 +594,22 @@
<localinterface/>
<homeinterface/>
<localhomeinterface/>
- <utilobject cacheHomes="true" includeGUID="false" kind="physical" />
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/cmp2/cmrstress/META-INF"/>
+ <utilobject cacheHomes="true" includeGUID="false" kind="physical"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/cmp2/cmrstress/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/cmp2/cmrstress/META-INF"
- datasource="java:/DefaultDS"
- datasourceMapping ="Hypersonic SQL"
- />
+ version="3.0"
+ destdir="${build.resources}/cmp2/cmrstress/META-INF"
+ datasource="java:/DefaultDS"
+ datasourceMapping="Hypersonic SQL"
+ />
</ejbdoclet>
<!-- cmp2 enum tests -->
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author"
- mergedir="${source.resources}/cmp2/enum">
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/cmp2/enum">
<fileset dir="${source.java}">
<include name="org/jboss/test/cmp2/enum/ejb/*Bean.java"/>
</fileset>
@@ -617,15 +617,15 @@
<localinterface/>
<homeinterface/>
<localhomeinterface/>
- <utilobject cacheHomes="true" includeGUID="false" kind="physical" />
+ <utilobject cacheHomes="true" includeGUID="false" kind="physical"/>
</ejbdoclet>
<!--undeploy of broken packages-->
<mkdir dir="${build.resources}/jmx/undeploy/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author">
- <!--mergedir="${source.resources}/jmx/ejb"-->
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <!--mergedir="${source.resources}/jmx/ejb"-->
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/ejb/Entity*Bean.java"/>
</fileset>
@@ -635,23 +635,23 @@
<homeinterface/>
<localhomeinterface/>
<!--session/-->
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/jmx/undeploy/META-INF"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/jmx/undeploy/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/jmx/undeploy/META-INF"
- mergedir="${source.resources}/jmx/undeploy/"
- Datasource="java:/DefaultDS"
- Typemapping="Hypersonic SQL"
- />
+ version="3.0"
+ destdir="${build.resources}/jmx/undeploy/META-INF"
+ mergedir="${source.resources}/jmx/undeploy/"
+ Datasource="java:/DefaultDS"
+ Typemapping="Hypersonic SQL"
+ />
</ejbdoclet>
-<!--jca framework tests-->
+ <!--jca framework tests-->
<mkdir dir="${build.resources}/jca/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author">
- <!--mergedir="${source.resources}/jca/ejb"-->
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <!--mergedir="${source.resources}/jca/ejb"-->
<fileset dir="${source.java}">
<include name="org/jboss/test/jca/ejb/*Bean.java"/>
<exclude name="org/jboss/test/jca/ejb/Unshareable*Bean.java"/>
@@ -662,19 +662,19 @@
<homeinterface/>
<localhomeinterface/>
<!--session/-->
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/jca/META-INF"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/jca/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/jca/META-INF"
- mergedir="${source.resources}/jca/"/>
+ version="3.0"
+ destdir="${build.resources}/jca/META-INF"
+ mergedir="${source.resources}/jca/"/>
</ejbdoclet>
<mkdir dir="${build.resources}/jca/bank/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author">
- <!--mergedir="${source.resources}/jca/ejb"-->
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <!--mergedir="${source.resources}/jca/ejb"-->
<fileset dir="${source.java}">
<include name="org/jboss/test/jca/bank/ejb/*Bean.java"/>
</fileset>
@@ -684,19 +684,19 @@
<homeinterface/>
<localhomeinterface/>
<!--session/-->
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/jca/bank/META-INF"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/jca/bank/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/jca/bank/META-INF"
- mergedir="${source.resources}/jca/bank/"/>
+ version="3.0"
+ destdir="${build.resources}/jca/bank/META-INF"
+ mergedir="${source.resources}/jca/bank/"/>
</ejbdoclet>
<mkdir dir="${build.resources}/banknew/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author">
- <!--mergedir="${source.resources}/jca/ejb"-->
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <!--mergedir="${source.resources}/jca/ejb"-->
<fileset dir="${source.java}">
<include name="org/jboss/test/banknew/ejb/*Bean.java"/>
</fileset>
@@ -704,26 +704,26 @@
<entitycmp cmpspec="2.x"/>
<session/>
<remoteinterface/>
-<!-- <localinterface/> -->
+ <!-- <localinterface/> -->
<homeinterface/>
-<!-- <localhomeinterface/> -->
+ <!-- <localhomeinterface/> -->
<dataobject/>
<entitypk/>
<!--session/-->
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/banknew/META-INF"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/banknew/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/banknew/META-INF"
- mergedir="${source.resources}/banknew/"/>
+ version="3.0"
+ destdir="${build.resources}/banknew/META-INF"
+ mergedir="${source.resources}/banknew/"/>
</ejbdoclet>
<!-- Foe-Deployer: Simple Test -->
<mkdir dir="${build.resources}/foedeployer/simple/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author">
- <!--mergedir="${source.resources}/jca/ejb"-->
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <!--mergedir="${source.resources}/jca/ejb"-->
<fileset dir="${source.java}">
<include name="org/jboss/test/foedeployer/ejb/simple/*Bean.java"/>
</fileset>
@@ -731,45 +731,45 @@
<localinterface/>
<homeinterface/>
<localhomeinterface/>
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/foedeployer/simple/META-INF"/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/foedeployer/simple/META-INF"/>
<weblogic version="6.1"
- xmlencoding="UTF-8"
- destdir="${build.resources}/foedeployer/simple/META-INF"
- validatexml="true"
- createtables="True"
- datasource="java:/DefaultDS"
- mergedir="${source.resources}/foedeployer/"/>
- <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
+ xmlencoding="UTF-8"
+ destdir="${build.resources}/foedeployer/simple/META-INF"
+ validatexml="true"
+ createtables="True"
+ datasource="java:/DefaultDS"
+ mergedir="${source.resources}/foedeployer/"/>
+ <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
</ejbdoclet>
<!-- Foe-Deployer: Message Test -->
<mkdir dir="${build.resources}/foedeployer/message/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version,@author">
- <!--mergedir="${source.resources}/jca/ejb"-->
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <!--mergedir="${source.resources}/jca/ejb"-->
<fileset dir="${source.java}">
<include name="org/jboss/test/foedeployer/ejb/message/*Bean.java"/>
</fileset>
- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resourc...
[truncated message content] |
|
From: Adrian B. <ej...@us...> - 2004-04-14 17:04:21
|
User: ejort
Date: 04/04/14 10:04:15
Modified: . Tag: Branch_3_2 build.xml
Log:
Transaction timeout tests
Revision Changes Path
No revision
No revision
1.165.2.149 +15 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.148
retrieving revision 1.165.2.149
diff -u -r1.165.2.148 -r1.165.2.149
--- build.xml 29 Mar 2004 19:23:33 -0000 1.165.2.148
+++ build.xml 14 Apr 2004 17:04:10 -0000 1.165.2.149
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.148 2004/03/29 19:23:33 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.149 2004/04/14 17:04:10 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -4456,7 +4456,7 @@
<!-- build tmtest.sar -->
<jar destfile="${build.lib}/tmtest.sar">
- <metainf dir="${build.resources}/tm">
+ <metainf dir="${build.resources}/tm/mbean">
<include name="jboss-service.xml" />
</metainf>
<fileset dir="${build.classes}">
@@ -4464,7 +4464,19 @@
<include name="org/jboss/test/tm/resource/**"/>
</fileset>
</jar>
- </target>
+
+ <!-- build txtimeouttest.jar -->
+ <jar destfile="${build.lib}/txtimeouttest.jar">
+ <metainf dir="${build.resources}/tm/txtimeout">
+ <include name="*.xml" />
+ </metainf>
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
+ <include name="org/jboss/test/tm/ejb/**"/>
+ <include name="org/jboss/test/tm/interfaces/**"/>
+ </fileset>
+ </jar>
+ </target>
<!-- Web services tests -->
<target name="_jars-webservice">
|
|
From: Adrian B. <ej...@us...> - 2004-04-14 18:13:49
|
User: ejort
Date: 04/04/14 11:13:43
Modified: . build.xml
Log:
Port CMT TransactionTimeout overrides from 3.2
Revision Changes Path
1.357 +18 -6 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- build.xml 9 Apr 2004 22:43:54 -0000 1.356
+++ build.xml 14 Apr 2004 18:13:42 -0000 1.357
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.356 2004/04/09 22:43:54 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.357 2004/04/14 18:13:42 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -4685,13 +4685,25 @@
<mkdir dir="${build.lib}"/>
<!-- build tmtest.sar -->
- <jar jarfile="${build.lib}/tmtest.sar">
- <metainf dir="${build.resources}/tm">
- <include name="jboss-service.xml"/>
+ <jar destfile="${build.lib}/tmtest.sar">
+ <metainf dir="${build.resources}/tm/mbean">
+ <include name="jboss-service.xml" />
</metainf>
<fileset dir="${build.classes}">
- <include name="org/jboss/test/tm/mbean/**"/>
- <include name="org/jboss/test/tm/resource/**"/>
+ <include name="org/jboss/test/tm/mbean/**"/>
+ <include name="org/jboss/test/tm/resource/**"/>
+ </fileset>
+ </jar>
+
+ <!-- build txtimeouttest.jar -->
+ <jar destfile="${build.lib}/txtimeouttest.jar">
+ <metainf dir="${build.resources}/tm/txtimeout">
+ <include name="*.xml" />
+ </metainf>
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
+ <include name="org/jboss/test/tm/ejb/**"/>
+ <include name="org/jboss/test/tm/interfaces/**"/>
</fileset>
</jar>
</target>
|
|
From: Ben W. <bw...@us...> - 2004-04-20 02:43:31
|
User: bwang00
Date: 04/04/19 19:43:24
Modified: . build.xml
Log:
Updated with TreeCacheAop Mbean testing
Revision Changes Path
1.358 +43 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- build.xml 14 Apr 2004 18:13:42 -0000 1.357
+++ build.xml 20 Apr 2004 02:43:23 -0000 1.358
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.357 2004/04/14 18:13:42 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.358 2004/04/20 02:43:23 bwang00 Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1729,11 +1729,29 @@
</fileset>
</copy>
+ <!-- pre-compile the aop classes -->
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
+ <path id="aop.task.classpath">
+ <path refid="javassist.classpath"/>
+ <path refid="trove.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ </path>
+
+ <aopc compilerclasspathref="aop.task.classpath">
+ <classpath refid="thirdparty.classpath"/>
+ <classpath path="${build.classes}"/>
+ <src path="${build.classes}"/>
+ <include name="org/jboss/test/cache/test/standAloneAop/**"/>
+ <aoppath path="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/>
+ </aopc>
+
<!-- build cachetest.jar -->
<jar jarfile="${build.lib}/cachetest.jar"
manifest="${build.resources}/cache/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cache/bean/*.class"/>
+ <include name="org/jboss/test/cache/test/standAloneAop/*.class"/>
</fileset>
<metainf dir="${build.resources}/cache/META-INF/">
<include name="jboss.xml"/>
@@ -1741,6 +1759,7 @@
</metainf>
</jar>
+
<!-- build cachetest.sar -->
<!--
-->
@@ -1751,18 +1770,41 @@
<fileset dir="${jboss.cache.lib}">
<include name="jboss-cache.jar"/>
</fileset>
+ <fileset dir="${jgroups.jgroups.lib}">
+ <include name="jgroups.jar"/>
+ </fileset>
+ <fileset dir="${build.resources}/cache">
+ <include name="**/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- build cacheAoptest.sar -->
+ <!--
+ -->
+ <copy file="${build.resources}/cache/META-INF/tree-aop-service.xml"
+ tofile="${build.resources}/cache/META-INF/jboss-service.xml"/>
+
+ <jar jarfile="${build.lib}/cacheAoptest.sar">
+ <fileset dir="${jboss.cache.lib}">
+ <include name="jboss-cache.jar"/>
+ </fileset>
+ <fileset dir="${jgroups.jgroups.lib}">
+ <include name="jgroups.jar"/>
+ </fileset>
<fileset dir="${build.resources}/cache">
<include name="**/jboss-service.xml"/>
</fileset>
</jar>
<!-- build cachetest.aop -->
+ <!--
<jar jarfile="${build.lib}/cachetest.aop">
<fileset dir="${build.classes}">
<include name="org/jboss/test/cache/bean/aop/*.class"/>
</fileset>
<metainf dir="${build.resources}/cache/aop/META-INF/"/>
</jar>
+ -->
</target>
|
|
From: Ben W. <bw...@us...> - 2004-04-20 07:00:57
|
User: bwang00
Date: 04/04/20 00:00:51
Modified: . build.xml
Log:
Updated for cache testing
Revision Changes Path
1.359 +5 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- build.xml 20 Apr 2004 02:43:23 -0000 1.358
+++ build.xml 20 Apr 2004 07:00:36 -0000 1.359
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.358 2004/04/20 02:43:23 bwang00 Exp $ -->
+<!-- $Id: build.xml,v 1.359 2004/04/20 07:00:36 bwang00 Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1763,6 +1763,7 @@
<!-- build cachetest.sar -->
<!--
-->
+ <delete file="${build.resources}/cache/META-INF/jboss-service.xml"/>
<copy file="${build.resources}/cache/META-INF/tree-service.xml"
tofile="${build.resources}/cache/META-INF/jboss-service.xml"/>
@@ -1774,13 +1775,14 @@
<include name="jgroups.jar"/>
</fileset>
<fileset dir="${build.resources}/cache">
- <include name="**/jboss-service.xml"/>
+ <include name="META-INF/jboss-service.xml"/>
</fileset>
</jar>
<!-- build cacheAoptest.sar -->
<!--
-->
+ <delete file="${build.resources}/cache/META-INF/jboss-service.xml"/>
<copy file="${build.resources}/cache/META-INF/tree-aop-service.xml"
tofile="${build.resources}/cache/META-INF/jboss-service.xml"/>
@@ -1792,7 +1794,7 @@
<include name="jgroups.jar"/>
</fileset>
<fileset dir="${build.resources}/cache">
- <include name="**/jboss-service.xml"/>
+ <include name="META-INF/jboss-service.xml"/>
</fileset>
</jar>
|
|
From: Stephen C. <sc...@us...> - 2004-04-22 13:44:45
|
User: scoy
Date: 04/04/22 06:44:30
Modified: . build.xml
Log:
Use the wsdl4j in apache.axis
Revision Changes Path
1.360 +1 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- build.xml 20 Apr 2004 07:00:36 -0000 1.359
+++ build.xml 22 Apr 2004 13:44:29 -0000 1.360
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.359 2004/04/20 07:00:36 bwang00 Exp $ -->
+<!-- $Id: build.xml,v 1.360 2004/04/22 13:44:29 scoy Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -114,7 +114,6 @@
<!-- needed for webservice tests -->
<path refid="apache.axis.classpath"/>
- <path refid="ibm.wsdl4j.classpath"/>
<path refid="ibm.uddi4j.classpath"/>
</path>
|
|
From: Scott M S. <st...@us...> - 2004-04-26 03:00:24
|
User: starksm
Date: 04/04/25 20:00:15
Modified: . Tag: Branch_3_2 build.xml
Log:
Factor out the clustered http ejbs into a seperate hello-ha.jar
Revision Changes Path
No revision
No revision
1.165.2.150 +38 -5 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.149
retrieving revision 1.165.2.150
diff -u -r1.165.2.149 -r1.165.2.150
--- build.xml 14 Apr 2004 17:04:10 -0000 1.165.2.149
+++ build.xml 26 Apr 2004 03:00:12 -0000 1.165.2.150
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.149 2004/04/14 17:04:10 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.150 2004/04/26 03:00:12 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -989,6 +989,7 @@
<fileset dir="${source.java}">
<include name="org/jboss/test/webservice/arrays/ArraysData.java"/>
<include name="org/jboss/test/webservice/arrays/server/ArraysBean.java"/>
+ <include name="org/jboss/test/webservice/arrays/server/ArraysBean2.java"/>
</fileset>
<entitycmp cmpspec="2.x"/>
<remoteinterface/>
@@ -1607,8 +1608,25 @@
</jar>
<!-- build hello.jar -->
- <jar jarfile="${build.lib}/hello.jar">
- <metainf dir="${build.resources}/hello/META-INF" />
+ <jar destfile="${build.lib}/hello.jar">
+ <metainf dir="${build.resources}/hello/META-INF">
+ <include name="ejb-jar.xml" />
+ <include name="jboss.xml" />
+ <include name="jbosscmp-jdbc.xml" />
+ </metainf>
+ <fileset dir="${build.classes}">
+ <patternset refid="jboss.test.util.ejb.set"/>
+ <include name="org/jboss/test/hello/interfaces/**"/>
+ <include name="org/jboss/test/hello/ejb/**"/>
+ </fileset>
+ </jar>
+
+ <!-- build hello-ha.jar -->
+ <jar destfile="${build.lib}/hello-ha.jar">
+ <zipfileset dir="${build.resources}/hello/META-INF"
+ includes="ejb-jar-ha.xml" fullpath="META-INF/ejb-jar.xml" />
+ <zipfileset dir="${build.resources}/hello/META-INF"
+ includes="jboss-ha.xml" fullpath="META-INF/jboss.xml" />
<fileset dir="${build.classes}">
<patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/hello/interfaces/**"/>
@@ -3291,7 +3309,7 @@
</war>
-->
<!-- war to test FORM auth -->
- <war warfile="${build.lib}/form-auth.war"
+ <war destfile="${build.lib}/form-auth.war"
webxml="${build.resources}/web/WEB-INF/form-auth-web.xml">
<webinf dir="${build.resources}/web/html/other/WEB-INF">
<include name="jboss-web.xml"/>
@@ -3299,10 +3317,22 @@
<classes dir="${build.classes}">
<include name="org/jboss/test/web/servlets/SecureServlet.class" />
</classes>
- <fileset dir="${build.resources}/web/html/root">
+ <fileset dir="${build.resources}/web/html/other">
<include name="**/*.html"/>
</fileset>
</war>
+<!--
+ <ear destfile="${build.lib}/form-auth.ear">
+ appxml="${build.resources}/web/META-INF/application.xml">
+ <metainf dir="${build.resources}/web/META-INF">
+ <include name="jboss-app.xml" />
+ </metainf>
+ <fileset dir="${build.lib}">
+ <include name="form-auth.war"/>
+ <include name="web-sec.sar"/>
+ </fileset>
+ </ear>
+-->
<!-- war to test CLIENT-CERT auth -->
<war warfile="${build.lib}/clientcert-auth.war"
@@ -5864,6 +5894,9 @@
<sysproperty key="jbosstest.secure" value="true"/>
<sysproperty key="java.security.auth.login.config"
value="${build.resources}/security/auth.conf"/>
+ <sysproperty key="javax.net.ssl.trustStore"
+ value="${build.resources}/security/tst.keystore"/>
+ <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true" />
<classpath>
<pathelement location="${build.classes}"/>
|
|
From: Scott M S. <st...@us...> - 2004-04-26 03:47:38
|
User: starksm
Date: 04/04/25 20:47:32
Modified: . build.xml
Log:
Factor out the clustered http ejbs into a seperate hello-ha.jar
Revision Changes Path
1.361 +23 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- build.xml 22 Apr 2004 13:44:29 -0000 1.360
+++ build.xml 26 Apr 2004 03:47:32 -0000 1.361
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.360 2004/04/22 13:44:29 scoy Exp $ -->
+<!-- $Id: build.xml,v 1.361 2004/04/26 03:47:32 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2910,8 +2910,25 @@
</jar>
<!-- build hello.jar -->
- <jar jarfile="${build.lib}/hello.jar">
- <metainf dir="${build.resources}/hello/META-INF"/>
+ <jar destfile="${build.lib}/hello.jar">
+ <metainf dir="${build.resources}/hello/META-INF">
+ <include name="ejb-jar.xml" />
+ <include name="jboss.xml" />
+ <include name="jbosscmp-jdbc.xml" />
+ </metainf>
+ <fileset dir="${build.classes}">
+ <patternset refid="jboss.test.util.ejb.set"/>
+ <include name="org/jboss/test/hello/interfaces/**"/>
+ <include name="org/jboss/test/hello/ejb/**"/>
+ </fileset>
+ </jar>
+
+ <!-- build hello-ha.jar -->
+ <jar destfile="${build.lib}/hello-ha.jar">
+ <zipfileset dir="${build.resources}/hello/META-INF"
+ includes="ejb-jar-ha.xml" fullpath="META-INF/ejb-jar.xml" />
+ <zipfileset dir="${build.resources}/hello/META-INF"
+ includes="jboss-ha.xml" fullpath="META-INF/jboss.xml" />
<fileset dir="${build.classes}">
<patternset refid="jboss.test.util.ejb.set"/>
<include name="org/jboss/test/hello/interfaces/**"/>
@@ -6774,6 +6791,9 @@
<sysproperty key="jbosstest.secure" value="true"/>
<sysproperty key="java.security.auth.login.config"
value="${build.resources}/security/auth.conf"/>
+ <sysproperty key="javax.net.ssl.trustStore"
+ value="${build.resources}/security/tst.keystore"/>
+ <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true" />
<classpath>
<pathelement location="${build.classes}"/>
|
|
From: Adrian B. <ej...@us...> - 2004-04-27 12:50:58
|
User: ejort
Date: 04/04/27 05:50:44
Modified: . build.xml
Log:
Add a test for an MBean that does not expose jbossInternalLifecyle but does extend ServiceMBeanSupport
Revision Changes Path
1.362 +11 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- build.xml 26 Apr 2004 03:47:32 -0000 1.361
+++ build.xml 27 Apr 2004 12:50:44 -0000 1.362
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.361 2004/04/26 03:47:32 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.362 2004/04/27 12:50:44 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3818,6 +3818,16 @@
<filter token="codebase" value="file://${codebaseURL}"/>
</filterset>
</copy>
+
+ <!-- internal test sar -->
+ <jar jarfile="${build.lib}/jmx-nointernal.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/internal/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/internal">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
</target>
<!-- jrmp test -->
|
|
From: Adrian B. <ej...@us...> - 2004-04-27 14:31:36
|
User: ejort
Date: 04/04/27 07:31:29
Modified: . Tag: Branch_3_2 build.xml
Log:
Add a test for an MBean that does not expose jbossInternalLifecycle but does extend ServiceMBeanSupport
Revision Changes Path
No revision
No revision
1.165.2.151 +11 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.150
retrieving revision 1.165.2.151
diff -u -r1.165.2.150 -r1.165.2.151
--- build.xml 26 Apr 2004 03:00:12 -0000 1.165.2.150
+++ build.xml 27 Apr 2004 14:31:11 -0000 1.165.2.151
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.150 2004/04/26 03:00:12 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.151 2004/04/27 14:31:11 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2655,6 +2655,16 @@
<filter token="codebase" value="file://${codebaseURL}"/>
</filterset>
</copy>
+
+ <!-- internal test sar -->
+ <jar jarfile="${build.lib}/jmx-nointernal.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/internal/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/internal">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
</target>
<!-- naming test -->
|
|
From: Thomas D. <tdi...@us...> - 2004-05-06 16:24:27
|
User: tdiesler
Date: 04/05/06 09:24:20
Modified: . build.xml
Log:
add ws4ee tests
Revision Changes Path
1.363 +190 -170 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- build.xml 27 Apr 2004 12:50:44 -0000 1.362
+++ build.xml 6 May 2004 16:24:20 -0000 1.363
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.362 2004/04/27 12:50:44 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.363 2004/05/06 16:24:20 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -134,25 +134,26 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.aspects.classpath"/>
+ <path refid="jboss.cache.classpath"/>
+ <path refid="jboss.cluster.classpath"/>
<path refid="jboss.common.classpath"/>
- <path refid="jboss.system.classpath"/>
- <path refid="jboss.naming.classpath"/>
- <path refid="jboss.server.classpath"/>
<path refid="jboss.internal-server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
- <path refid="jboss.security.classpath"/>
+ <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jbossnet.classpath"/>
<path refid="jboss.jca.classpath"/>
- <path refid="jboss.cluster.classpath"/>
<path refid="jboss.management.classpath"/>
+ <path refid="jboss.media.classpath"/>
+ <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.remoting.classpath"/>
+ <path refid="jboss.security.classpath"/>
+ <path refid="jboss.server.classpath"/>
+ <path refid="jboss.system.classpath"/>
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.varia.classpath"/>
- <path refid="jboss.jbossnet.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="jboss.aspects.classpath"/>
- <path refid="jboss.remoting.classpath"/>
- <path refid="jboss.cache.classpath"/>
- <path refid="jboss.media.classpath"/>
+ <!--path refid="jboss.webservice.classpath"/-->
</path>
<!-- ===== -->
@@ -1319,61 +1320,62 @@
<target name="jars" description="Builds all jar files."
depends="compile,
-_jars-aop,
-_jars-bank,
-_jars-bank-new,
-_jars-bankiiop,
-_jars-bench,
-_jars-bmp,
-_jars-cache,
-_jars-classloader,
-_jars-client,
-_jars-cmp2,
-_jars-cts,
-_jars-dbtest,
-_jars-deadlock,
-_jars-ejbconf,
-_jars-entity,
-_jars-entityexc,
-_jars-excepiiop,
-_jars-exception,
-_jars-foedeployer,
-_jars-hello,
-_jars-helloiiop,
-_jars-hellojrmpiiop,
-_jars-idgen,
-_jars-iiop,
-_jars-invokers,
-_jars-jbossmq,
-_jars-jbossmx,
-_jars-jca,
-_jars-jmsra,
-_jars-jmx,
-_jars-jrmp,
-_jars-jsr77,
-_jars-load,
-_jars-lock,
-_jars-marathon,
-_jars-mdb,
-_jars-media,
-_jars-naming,
-_jars-perf,
-_jars-pooled,
-_jars-proxycompiler,
-_jars-readahead,
-_jars-retry,
-_jars-security,
-_jars-testbean,
-_jars-testbeancluster,
-_jars-threading,
-_jars-timer,
-_jars-tm,
-_jars-txiiop,
-_jars-txtimer,
-_jars-util,
-_jars-web,
-_jars-webservice,
-_jars-xa">
+ _jars-aop,
+ _jars-bank,
+ _jars-bank-new,
+ _jars-bankiiop,
+ _jars-bench,
+ _jars-bmp,
+ _jars-cache,
+ _jars-classloader,
+ _jars-client,
+ _jars-cmp2,
+ _jars-cts,
+ _jars-dbtest,
+ _jars-deadlock,
+ _jars-ejbconf,
+ _jars-entity,
+ _jars-entityexc,
+ _jars-excepiiop,
+ _jars-exception,
+ _jars-foedeployer,
+ _jars-hello,
+ _jars-helloiiop,
+ _jars-hellojrmpiiop,
+ _jars-idgen,
+ _jars-iiop,
+ _jars-invokers,
+ _jars-jbossmq,
+ _jars-jbossmx,
+ _jars-jca,
+ _jars-jmsra,
+ _jars-jmx,
+ _jars-jrmp,
+ _jars-jsr77,
+ _jars-load,
+ _jars-lock,
+ _jars-marathon,
+ _jars-mdb,
+ _jars-media,
+ _jars-naming,
+ _jars-perf,
+ _jars-pooled,
+ _jars-proxycompiler,
+ _jars-readahead,
+ _jars-retry,
+ _jars-security,
+ _jars-testbean,
+ _jars-testbeancluster,
+ _jars-threading,
+ _jars-timer,
+ _jars-tm,
+ _jars-txiiop,
+ _jars-txtimer,
+ _jars-util,
+ _jars-web,
+ _jars-webservice,
+ _jars-ws4ee,
+ _jars-xa">
</target>
<!--
@@ -5049,93 +5051,83 @@
<include name="**/*.xml"/>
</fileset>
</jar>
+ </target>
- <!-- build ws4eesimple-ejb.ear -->
+ <!-- ws4ee tests -->
+ <target name="_jars-ws4ee">
+ <mkdir dir="${build.lib}"/>
+
+ <!-- build ws4eesimple.jar -->
<jar destfile="${build.lib}/ws4eesimple.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eesimple/Hello.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloBean.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloHome.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/Hello.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloBean.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloHome.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
</fileset>
- <fileset dir="${source.resources}/webservice/ws4eesimple">
+ <fileset dir="${source.resources}/ws4ee/ws4eesimple">
<include name="META-INF/ejb-jar.xml"/>
<include name="META-INF/webservices.xml"/>
<include name="META-INF/Hello.wsdl"/>
<include name="META-INF/HelloMapping.xml"/>
</fileset>
</jar>
- <ear destfile="${build.lib}/ws4eesimple-ejb.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/webservice/ws4eesimple/META-INF/application-ejb.xml">
- <fileset dir="${build.lib}">
- <include name="ws4eesimple.jar"/>
- </fileset>
- </ear>
- <!-- build ws4eesimple-web.ear -->
+ <!-- build ws4eesimple.war -->
<war warfile="${build.lib}/ws4eesimple.war"
- webxml="${source.resources}/webservice/ws4eesimple/WEB-INF/web.xml">
+ webxml="${source.resources}/ws4ee/ws4eesimple/WEB-INF/web.xml">
<classes dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eesimple/HelloJavaBean.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
</classes>
- <webinf dir="${source.resources}/webservice/ws4eesimple/META-INF">
+ <webinf dir="${source.resources}/ws4ee/ws4eesimple/META-INF">
<include name="Hello.wsdl"/>
<include name="HelloMapping.xml"/>
</webinf>
- <webinf dir="${source.resources}/webservice/ws4eesimple/WEB-INF">
+ <webinf dir="${source.resources}/ws4ee/ws4eesimple/WEB-INF">
<include name="webservices.xml"/>
</webinf>
</war>
- <ear destfile="${build.lib}/ws4eesimple-web.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/webservice/ws4eesimple/META-INF/application-web.xml">
- <fileset dir="${build.lib}">
- <include name="ws4eesimple.war"/>
- </fileset>
- </ear>
<!-- build ws4eesimple-client.ear -->
<jar destfile="${build.lib}/ws4eesimple-client.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWsClientApp.class"/>
- </fileset>
- <fileset dir="${source.resources}/webservice/ws4eesimple-client">
- <include name="META-INF/application-client.xml"/>
- <include name="META-INF/webservicesclient.xml"/>
- <include name="META-INF/HelloClient.wsdl"/>
- <include name="META-INF/HelloMapping.xml"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWsClientApp.class"/>
</fileset>
+ <metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="HelloClient.wsdl"/>
+ <include name="HelloMapping.xml"/>
+ </metainf>
</jar>
<war warfile="${build.lib}/ws4eesimple-client.war"
- webxml="${source.resources}/webservice/ws4eesimple-client/WEB-INF/web.xml">
+ webxml="${source.resources}/ws4ee/ws4eesimple-client/WEB-INF/web.xml">
<classes dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWsClientServlet.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWsClientServlet.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
</classes>
- <webinf dir="${source.resources}/webservice/ws4eesimple-client/META-INF">
+ <webinf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
<include name="HelloClient.wsdl"/>
<include name="HelloMapping.xml"/>
</webinf>
- <webinf dir="${source.resources}/webservice/ws4eesimple-client/WEB-INF">
- </webinf>
</war>
<jar destfile="${build.lib}/ws4eesimple-client-ejb.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/Hello.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloClientBean.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloHome.class"/>
- </fileset>
- <fileset dir="${source.resources}/webservice/ws4eesimple-client">
- <include name="META-INF/ejb-jar.xml"/>
- <include name="META-INF/webservicesclient.xml"/>
- <include name="META-INF/HelloClient.wsdl"/>
- <include name="META-INF/HelloMapping.xml"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/Hello.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloClientBean.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloHome.class"/>
</fileset>
+ <metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="HelloClient.wsdl"/>
+ <include name="HelloMapping.xml"/>
+ </metainf>
</jar>
<ear destfile="${build.lib}/ws4eesimple-client.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/webservice/ws4eesimple-client/META-INF/application.xml">
+ appxml="${source.resources}/ws4ee/ws4eesimple-client/META-INF/application.xml">
<fileset dir="${build.lib}">
<include name="ws4eesimple-client.jar"/>
<include name="ws4eesimple-client.war"/>
@@ -5143,85 +5135,58 @@
</fileset>
</ear>
- <!-- build ws4eesimple-secure.war -->
- <war warfile="${build.lib}/ws4eesimple-secure.war"
- webxml="${source.resources}/webservice/ws4eesimple/WEB-INF/web-secure.xml">
- <classes dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eesimple/HelloJavaBean.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/>
- </classes>
- <webinf dir="${source.resources}/webservice/ws4eesimple/WEB-INF/">
- <include name="webservices.xml"/>
- </webinf>
- <webinf dir="${source.resources}/webservice/ws4eesimple/META-INF">
- <include name="Hello.wsdl"/>
- <include name="HelloMapping.xml"/>
- </webinf>
- </war>
-
- <!-- build ws4eecomplex-ejb.ear -->
+ <!-- build ws4eecomplex.jar -->
+ <!--
<jar destfile="${build.lib}/ws4eecomplex.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eecomplex/Complex1Bean.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/Complex1.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/ComplexSer1.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/ComplexSer2.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/Complex1Home.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/Complex1Ws.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Bean.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer1.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer2.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Home.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Ws.class"/>
</fileset>
- <fileset dir="${source.resources}/webservice/ws4eecomplex">
+ <fileset dir="${source.resources}/ws4ee/ws4eecomplex">
<include name="META-INF/ejb-jar.xml"/>
<include name="META-INF/Complex1.wsdl"/>
<include name="META-INF/Complex1Mapping.xml"/>
<include name="META-INF/webservices.xml"/>
</fileset>
</jar>
+ -->
- <ear destfile="${build.lib}/ws4eecomplex-ejb.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/webservice/ws4eecomplex/META-INF/server-ejb-application.xml">
- <fileset dir="${build.lib}">
- <include name="ws4eecomplex.jar"/>
- </fileset>
- </ear>
-
- <!-- build ws4eecomplex-web.ear -->
+ <!-- build ws4eecomplex.war -->
+ <!--
<war warfile="${build.lib}/ws4eecomplex.war"
- webxml="${source.resources}/webservice/ws4eecomplex/WEB-INF/web.xml">
+ webxml="${source.resources}/ws4ee/ws4eecomplex/WEB-INF/web.xml">
<classes dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eecomplex/Complex1Ws.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/Complex1WsClientServlet.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/ComplexSer1.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/ComplexSer2.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Ws.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1WsClientServlet.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer1.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer2.class"/>
</classes>
- <webinf dir="${source.resources}/webservice/ws4eecomplex/META-INF">
+ <webinf dir="${source.resources}/ws4ee/ws4eecomplex/META-INF">
<include name="Complex1.wsdl"/>
<include name="Complex1Mapping.xml"/>
</webinf>
- <webinf dir="${source.resources}/webservice/ws4eecomplex/WEB-INF">
- </webinf>
</war>
+ -->
- <ear destfile="${build.lib}/ws4eecomplex-web.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/webservice/ws4eecomplex/META-INF/server-web-application.xml">
- <fileset dir="${build.lib}">
- <include name="ws4eecomplex.war"/>
- </fileset>
- </ear>
-
- <!-- build ws4eehandler.ear -->
+ <!-- build ws4eehandler.jar -->
+ <!--
<jar destfile="${build.lib}/ws4eehandler.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/test/util/**"/>
- <include name="org/jboss/test/webservice/ws4eehandler/*.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eehandler/*.class"/>
</fileset>
- <fileset dir="${source.resources}/webservice/ws4eehandler">
+ <fileset dir="${source.resources}/ws4ee/ws4eehandler">
<include name="META-INF/ejb-jar.xml"/>
<include name="META-INF/webservices.xml"/>
<include name="META-INF/Handler.wsdl"/>
<include name="META-INF/HandlerMapping.xml"/>
</fileset>
</jar>
-
+ -->
</target>
<!-- xa test -->
@@ -5355,6 +5320,7 @@
tests-txtimer-unit,
tests-util-unit,
tests-webservice-unit,
+ tests-ws4ee-unit,
tests-xml-unit">
</target>
@@ -6040,7 +6006,7 @@
| JBoss server distribution build that contains jboss-net.
-->
- <target name="tests-webservice-unit" depends="init">
+ <target name="tests-webservice-unit" depends="maybejars">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<!-- choose a testpattern via a property -->
@@ -6088,6 +6054,60 @@
</target>
<!--
+ | J2EE webservice tests that should run successfully against a
+ | JBoss server distribution build that contains jboss-ws4ee.sar
+ -->
+
+ <target name="tests-ws4ee-unit" depends="maybejars">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <!-- choose a testpattern via a property -->
+ <property name="jbosstest.pattern" value="**/*"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}">
+
+ <jvmarg line="${junit.jvm.options}"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="jbosstest.secure" value="true"/>
+
+ <jvmarg value="-Djava.security.manager"/>
+ <sysproperty key="java.security.policy"
+ value="${build.resources}/security/tst.policy"/>
+ <sysproperty key="java.security.auth.login.config"
+ value="${build.resources}/security/auth.conf"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}/security"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}">
+
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/ws4ee/ws4eesimple/SimpleEJBTestCase.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/SimpleJSETestCase.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/SimpleClientTestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--
| Standard marathon tests that should run successfully against a default
| JBoss server distribution build.
-->
|
|
From: Thomas D. <tdi...@us...> - 2004-05-06 18:49:17
|
User: tdiesler
Date: 04/05/06 11:49:05
Modified: . build.xml
Log:
fix classpath and packaging issue with ws4ee client test
Revision Changes Path
1.364 +6 -4 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- build.xml 6 May 2004 16:24:20 -0000 1.363
+++ build.xml 6 May 2004 18:49:04 -0000 1.364
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.363 2004/05/06 16:24:20 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.364 2004/05/06 18:49:04 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -153,7 +153,7 @@
<path refid="jboss.system.classpath"/>
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.varia.classpath"/>
- <!--path refid="jboss.webservice.classpath"/-->
+ <path refid="jboss.webservice.classpath"/>
</path>
<!-- ===== -->
@@ -4853,7 +4853,7 @@
</target>
<!-- webservice tests -->
- <target name="_jars-webservice" depends="compile">
+ <target name="_jars-webservice">
<mkdir dir="${build.lib}"/>
<!-- The wsr.wsr -->
@@ -5094,6 +5094,8 @@
<fileset dir="${build.classes}">
<include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
<include name="org/jboss/test/ws4ee/ws4eesimple/HelloWsClientApp.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloHome.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/Hello.class"/>
</fileset>
<metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
<include name="application-client.xml"/>
@@ -5116,9 +5118,9 @@
<jar destfile="${build.lib}/ws4eesimple-client-ejb.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
- <include name="org/jboss/test/ws4ee/ws4eesimple/Hello.class"/>
<include name="org/jboss/test/ws4ee/ws4eesimple/HelloClientBean.class"/>
<include name="org/jboss/test/ws4ee/ws4eesimple/HelloHome.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/Hello.class"/>
</fileset>
<metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
<include name="ejb-jar.xml"/>
|
|
From: Thomas D. <tdi...@us...> - 2004-05-09 14:35:27
|
User: tdiesler
Date: 04/05/09 07:35:21
Modified: . build.xml
Log:
+ enable ws4ee marshall tests for rpc/encoded, rpc/literal, doc/encoded, doc/literal
Revision Changes Path
1.365 +17 -4 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- build.xml 6 May 2004 18:49:04 -0000 1.364
+++ build.xml 9 May 2004 14:35:19 -0000 1.365
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.364 2004/05/06 18:49:04 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.365 2004/05/09 14:35:19 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -5137,6 +5137,20 @@
</fileset>
</ear>
+ <!-- build ws4eemarshall.jar -->
+ <jar destfile="${build.lib}/ws4eemarshall.jar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestHome.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestRemote.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestBean.class"/>
+ </fileset>
+ <metainf dir="${source.resources}/ws4ee/marshalltest/META-INF">
+ <include name="*.xml"/>
+ <include name="*.wsdl"/>
+ </metainf>
+ </jar>
+
<!-- build ws4eecomplex.jar -->
<!--
<jar destfile="${build.lib}/ws4eecomplex.jar" manifest="${build.etc}/manifest.mf">
@@ -6101,9 +6115,8 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/ws4ee/ws4eesimple/SimpleEJBTestCase.class"/>
- <include name="org/jboss/test/ws4ee/ws4eesimple/SimpleJSETestCase.class"/>
- <include name="org/jboss/test/ws4ee/ws4eesimple/SimpleClientTestCase.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/*TestCase.class"/>
+ <include name="org/jboss/test/ws4ee/marshalltest/*TestCase.class"/>
</fileset>
</batchtest>
</junit>
|
|
From: Thomas D. <tdi...@us...> - 2004-05-09 17:19:48
|
User: tdiesler
Date: 04/05/09 10:19:42
Modified: . build.xml
Log:
+ introduce compile-wsdl target
+ move to dynamically generated wsdl docs
Revision Changes Path
1.366 +56 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -r1.365 -r1.366
--- build.xml 9 May 2004 14:35:19 -0000 1.365
+++ build.xml 9 May 2004 17:19:41 -0000 1.366
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.365 2004/05/09 14:35:19 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.366 2004/05/09 17:19:41 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -283,7 +283,7 @@
| documentation compiles.
-->
<target name="compile"
- depends="compile-classes, compile-xmbean-dds, compile-etc, compile-stylesheets, compile-resources"
+ depends="compile-classes, compile-xmbean-dds, compile-etc, compile-stylesheets, compile-resources, compile-wsdl"
description="Compile all source files."/>
<!-- Compile EJB beans with XDoclet -->
@@ -1308,7 +1308,60 @@
</copy>
</target>
+ <!-- Compile wsdl files -->
+ <target name="compile-wsdl" depends="init">
+ <!-- ws4ee/marshalltest -->
+ <mkdir dir="${build.resources}/ws4ee/marshalltest/META-INF"/>
+ <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
+ <classpath refid="tests.classpath"/>
+ <classpath path="${build.classes}"/>
+ <arg value="-lhttp://dummy-host:8080/dummy-path"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/rpc-encoded.wsdl"/>
+ <arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
+ <arg value="-SMarshallTestService"/>
+ <arg value="-sMarshallTestPort"/>
+ <arg value="-yRPC"/>
+ <arg value="-uENCODED"/>
+ <arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/>
+ </java>
+ <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
+ <classpath refid="tests.classpath"/>
+ <classpath path="${build.classes}"/>
+ <arg value="-lhttp://dummy-host:8080/dummy-path"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/rpc-literal.wsdl"/>
+ <arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
+ <arg value="-SMarshallTestService"/>
+ <arg value="-sMarshallTestPort"/>
+ <arg value="-yRPC"/>
+ <arg value="-uLITERAL"/>
+ <arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/>
+ </java>
+ <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
+ <classpath refid="tests.classpath"/>
+ <classpath path="${build.classes}"/>
+ <arg value="-lhttp://dummy-host:8080/dummy-path"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/doc-encoded.wsdl"/>
+ <arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
+ <arg value="-SMarshallTestService"/>
+ <arg value="-sMarshallTestPort"/>
+ <arg value="-yDOCUMENT"/>
+ <arg value="-uENCODED"/>
+ <arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/>
+ </java>
+ <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
+ <classpath refid="tests.classpath"/>
+ <classpath path="${build.classes}"/>
+ <arg value="-lhttp://dummy-host:8080/dummy-path"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/doc-literal.wsdl"/>
+ <arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
+ <arg value="-SMarshallTestService"/>
+ <arg value="-sMarshallTestPort"/>
+ <arg value="-yDOCUMENT"/>
+ <arg value="-uLITERAL"/>
+ <arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/>
+ </java>
+ </target>
<!-- ================================================================== -->
<!-- Archives -->
@@ -5145,7 +5198,7 @@
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/>
<include name="org/jboss/test/ws4ee/marshalltest/MarshallTestBean.class"/>
</fileset>
- <metainf dir="${source.resources}/ws4ee/marshalltest/META-INF">
+ <metainf dir="${build.resources}/ws4ee/marshalltest/META-INF">
<include name="*.xml"/>
<include name="*.wsdl"/>
</metainf>
|
|
From: Thomas D. <tdi...@us...> - 2004-05-12 11:46:41
|
User: tdiesler
Date: 04/05/12 04:46:34
Modified: . build.xml
Log:
add the ws4ee handler flow test
Revision Changes Path
1.367 +84 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- build.xml 9 May 2004 17:19:41 -0000 1.366
+++ build.xml 12 May 2004 11:46:33 -0000 1.367
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.366 2004/05/09 17:19:41 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.367 2004/05/12 11:46:33 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1361,6 +1361,21 @@
<arg value="-uLITERAL"/>
<arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/>
</java>
+
+ <!-- ws4ee/handlerflow -->
+ <mkdir dir="${build.resources}/ws4ee/handlerflow/META-INF"/>
+ <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
+ <classpath refid="tests.classpath"/>
+ <classpath path="${build.classes}"/>
+ <arg value="-lhttp://localhost:8080/ws4ee/services/HelloService"/>
+ <arg value="-o${build.resources}/ws4ee/handlerflow/META-INF/Hello.wsdl"/>
+ <arg value="-nhttp://test.jboss.org/ws4ee/handlerflow"/>
+ <arg value="-SHelloService"/>
+ <arg value="-sHelloPort"/>
+ <arg value="-yRPC"/>
+ <arg value="-uENCODED"/>
+ <arg value="org.jboss.test.ws4ee.handlerflow.HelloEndpoint"/>
+ </java>
</target>
<!-- ================================================================== -->
@@ -5204,6 +5219,74 @@
</metainf>
</jar>
+ <!-- build ws4eehandlerflow-ejb.ear -->
+ <jar destfile="${build.lib}/ws4eehandlerflow.jar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/ws4ee/handlerflow/HelloHome.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/HelloRemote.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/HelloEndpoint.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/HelloBean.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/HandlerBase.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/HandlerTracker.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/ClientHandler1.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/ClientHandler2.class"/>
+ <!-- although the server handler are not needed, keep them for the test -->
+ <include name="org/jboss/test/ws4ee/handlerflow/ServerHandler1.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/ServerHandler2.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/ws4ee/handlerflow/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="HelloMapping.xml"/>
+ <include name="Hello.wsdl"/>
+ </metainf>
+ </jar>
+ <ear destfile="${build.lib}/ws4eehandlerflow-ejb.ear" manifest="${build.etc}/manifest.mf"
+ appxml="${source.resources}/ws4ee/handlerflow/META-INF/application.xml">
+ <fileset dir="${build.lib}">
+ <include name="ws4eehandlerflow.jar"/>
+ </fileset>
+ <metainf dir="${build.resources}/ws4ee/handlerflow/META-INF">
+ <include name="jboss-app.xml"/>
+ </metainf>
+ </ear>
+ <!-- delete file="${build.lib}/ws4eehandlerflow.jar"/-->
+
+ <!-- build ws4eehandlerflow.war -->
+ <war warfile="${build.lib}/ws4eehandlerflow.war"
+ webxml="${build.resources}/ws4ee/handlerflow/WEB-INF/web.xml">
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/ws4ee/handlerflow/HelloEndpoint.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/HelloJSE.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/HelloFeedbackServlet.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/HandlerBase.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/HandlerTracker.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/ServerHandler1.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/ServerHandler2.class"/>
+ <!-- although the client handler are not needed, keep them for the test -->
+ <include name="org/jboss/test/ws4ee/handlerflow/ClientHandler1.class"/>
+ <include name="org/jboss/test/ws4ee/handlerflow/ClientHandler2.class"/>
+ </classes>
+ <webinf dir="${build.resources}/ws4ee/handlerflow/META-INF">
+ <include name="Hello.wsdl"/>
+ <include name="HelloMapping.xml"/>
+ </webinf>
+ <webinf dir="${build.resources}/ws4ee/handlerflow/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <ear destfile="${build.lib}/ws4eehandlerflow-jse.ear" manifest="${build.etc}/manifest.mf"
+ appxml="${source.resources}/ws4ee/handlerflow/WEB-INF/application.xml">
+ <fileset dir="${build.lib}">
+ <include name="ws4eehandlerflow.war"/>
+ </fileset>
+ <metainf dir="${build.resources}/ws4ee/handlerflow/WEB-INF">
+ <include name="jboss-app.xml"/>
+ </metainf>
+ </ear>
+ <!-- delete file="${build.lib}/ws4eehandlerflow.war"/ -->
+
<!-- build ws4eecomplex.jar -->
<!--
<jar destfile="${build.lib}/ws4eecomplex.jar" manifest="${build.etc}/manifest.mf">
|
|
From: Adrian B. <ej...@us...> - 2004-05-20 19:54:16
|
User: ejort
Date: 04/05/20 12:54:09
Modified: . build.xml
Log:
Add a test for two ears in isolated classloaders where
an ejb in one ear invokes an ejb in the other ear.
Revision Changes Path
1.368 +52 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- build.xml 12 May 2004 11:46:33 -0000 1.367
+++ build.xml 20 May 2004 19:54:08 -0000 1.368
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.367 2004/05/12 11:46:33 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.368 2004/05/20 19:54:08 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1413,6 +1413,7 @@
_jars-idgen,
_jars-iiop,
_jars-invokers,
+ _jars-isolation,
_jars-jbossmq,
_jars-jbossmx,
_jars-jca,
@@ -4081,6 +4082,56 @@
</jar>
</target>
+ <!-- isolation test -->
+ <target name="_jars-isolation">
+ <mkdir dir="${build.lib}"/>
+
+ <!-- build isolationA.jar -->
+ <jar jarfile="${build.lib}/isolationA.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/isolation/ejb/a/**"/>
+ <include name="org/jboss/test/isolation/interfaces/**"/>
+ <include name="org/jboss/test/util/Debug.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/isolation/a/ejb">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- build isolationB.jar -->
+ <jar jarfile="${build.lib}/isolationB.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/isolation/ejb/b/**"/>
+ <include name="org/jboss/test/isolation/interfaces/**"/>
+ <include name="org/jboss/test/util/Debug.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/isolation/b/ejb">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- build isolationA.ear -->
+ <jar jarfile="${build.lib}/isolationA.ear">
+ <fileset dir="${build.lib}">
+ <include name="isolationA.jar"/>
+ </fileset>
+ <fileset dir="${build.resources}/isolation/a/ear">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- build isolationB.ear -->
+ <jar jarfile="${build.lib}/isolationB.ear">
+ <fileset dir="${build.lib}">
+ <include name="isolationB.jar"/>
+ </fileset>
+ <fileset dir="${build.resources}/isolation/b/ear">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+ </target>
+
<!-- naming test -->
<target name="_jars-naming">
<mkdir dir="${build.lib}"/>
|
|
From: Adrian B. <ej...@us...> - 2004-05-21 03:31:13
|
User: ejort
Date: 04/05/20 20:31:06
Modified: . Tag: Branch_3_2 build.xml
Log:
Backport isolation test from head
Revision Changes Path
No revision
No revision
1.165.2.152 +52 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.151
retrieving revision 1.165.2.152
diff -u -r1.165.2.151 -r1.165.2.152
--- build.xml 27 Apr 2004 14:31:11 -0000 1.165.2.151
+++ build.xml 21 May 2004 03:31:02 -0000 1.165.2.152
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.151 2004/04/27 14:31:11 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.152 2004/05/21 03:31:02 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1152,6 +1152,7 @@
_jars-jca,
_jars-cache,
_jars-jmx,
+ _jars-isolation,
_jars-naming,
_jars-jbossmq,
_jars-load,
@@ -2667,6 +2668,56 @@
</jar>
</target>
+ <!-- isolation test -->
+ <target name="_jars-isolation">
+ <mkdir dir="${build.lib}"/>
+
+ <!-- build isolationA.jar -->
+ <jar jarfile="${build.lib}/isolationA.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/isolation/ejb/a/**"/>
+ <include name="org/jboss/test/isolation/interfaces/**"/>
+ <include name="org/jboss/test/util/Debug.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/isolation/a/ejb">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- build isolationB.jar -->
+ <jar jarfile="${build.lib}/isolationB.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/isolation/ejb/b/**"/>
+ <include name="org/jboss/test/isolation/interfaces/**"/>
+ <include name="org/jboss/test/util/Debug.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/isolation/b/ejb">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- build isolationA.ear -->
+ <jar jarfile="${build.lib}/isolationA.ear">
+ <fileset dir="${build.lib}">
+ <include name="isolationA.jar"/>
+ </fileset>
+ <fileset dir="${build.resources}/isolation/a/ear">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- build isolationB.ear -->
+ <jar jarfile="${build.lib}/isolationB.ear">
+ <fileset dir="${build.lib}">
+ <include name="isolationB.jar"/>
+ </fileset>
+ <fileset dir="${build.resources}/isolation/b/ear">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+ </target>
+
<!-- naming test -->
<target name="_jars-naming">
<mkdir dir="${build.lib}"/>
|
|
From: Adrian B. <ej...@us...> - 2004-05-27 01:43:34
|
User: ejort
Date: 04/05/26 18:43:25
Modified: . Tag: Branch_3_2 build.xml
Log:
Perform a login for the secure invoker access.
Also add auth.conf for the testsuite "test" target when running
a package's tests.
Revision Changes Path
No revision
No revision
1.165.2.153 +5 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.152
retrieving revision 1.165.2.153
diff -u -r1.165.2.152 -r1.165.2.153
--- build.xml 21 May 2004 03:31:02 -0000 1.165.2.152
+++ build.xml 27 May 2004 01:43:22 -0000 1.165.2.153
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.152 2004/05/21 03:31:02 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.153 2004/05/27 01:43:22 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -5791,13 +5791,16 @@
jvm="${junit.jvm}">
<jvmarg value="${junit.jvm.options}"/>
+ <jvmarg value="-Djava.security.manager"/>
+ <jvmarg value="-Djava.security.policy==${build.resources}/client.policy"/>
<sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
-
+ <sysproperty key="java.security.auth.login.config"
+ value="${build.resources}/security/auth.conf"/>
<classpath>
<pathelement location="${build.classes}"/>
|
|
From: Claudio V. <ca...@us...> - 2004-06-03 10:50:51
|
User: cazzius
Date: 04/06/03 03:50:44
Modified: . Tag: Branch_3_2 build.xml
Log:
make jmx archivestest run on windows
Revision Changes Path
No revision
No revision
1.165.2.154 +10 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.153
retrieving revision 1.165.2.154
diff -u -r1.165.2.153 -r1.165.2.154
--- build.xml 27 May 2004 01:43:22 -0000 1.165.2.153
+++ build.xml 3 Jun 2004 10:50:42 -0000 1.165.2.154
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.153 2004/05/27 01:43:22 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.154 2004/06/03 10:50:42 cazzius Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2648,12 +2648,20 @@
<pathconvert targetos="unix" property="codebaseURL">
<path path="${build.lib}"/>
</pathconvert>
+ <condition property="url.prefix" value="file:///">
+ <os family="windows"/>
+ </condition>
+ <condition property="url.prefix" value="file://">
+ <not>
+ <os family="windows"/>
+ </not>
+ </condition>
<echo message="+++ codebase=${codebaseURL}" />
<echo message="+++ build.lib=${build.lib}" />
<copy todir="${build.lib}" filtering="true" overwrite="true"
file="${source.resources}/jmx/archivestest-service.xml">
<filterset>
- <filter token="codebase" value="file://${codebaseURL}"/>
+ <filter token="codebase" value="${url.prefix}${codebaseURL}"/>
</filterset>
</copy>
|
|
From: Scott M S. <st...@us...> - 2004-06-05 08:10:16
|
User: starksm Date: 04/06/05 01:10:09 Modified: . build.xml Log: Disable the jboss.net tests for now Revision Changes Path 1.369 +13 -9 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.368 retrieving revision 1.369 diff -u -r1.368 -r1.369 --- build.xml 20 May 2004 19:54:08 -0000 1.368 +++ build.xml 5 Jun 2004 08:10:08 -0000 1.369 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.368 2004/05/20 19:54:08 ejort Exp $ --> +<!-- $Id: build.xml,v 1.369 2004/06/05 08:10:08 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -249,9 +249,11 @@ <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> <include name="**/*.jar"/> </fileset> +<!-- <fileset dir="${project.root}/jboss.net/output/lib"> <include name="xdoclet-*.jar"/> </fileset> +--> </path> <property name="xdoclet.task.classpath" refid="xdoclet.task.classpath"/> @@ -954,13 +956,13 @@ <classpath refid="thirdparty.classpath"/> </java> - <!-- these taskdefs allow to call jboss.net specific xdoclet functionality --> + <!-- these taskdefs allow to call jboss.net specific xdoclet functionality - <taskdef name="webserviceejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/> <taskdef name="webservicejmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/> - <!-- generate ejbsimple meta-data and interfaces --> + <!- - generate ejbsimple meta-data and interfaces <webserviceejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> @@ -983,7 +985,7 @@ targetNameSpace="http://test.jboss.org/ejbsimple"/> </webserviceejbdoclet> - <!-- generate jmx meta-data and interfaces --> + <!- - generate jmx meta-data and interfaces <webservicejmxdoclet destdir="${build.gen-src}" excludedtags="@version,@author"> <fileset dir="${source.java}"> @@ -997,7 +999,7 @@ targetNameSpace="http://test.jboss.org/jmx"/> </webservicejmxdoclet> - <!-- generate state test meta-data --> + <!- - generate state test meta-data <webserviceejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> @@ -1017,7 +1019,7 @@ targetNameSpace="http://test.jboss.org/state"/> </webserviceejbdoclet> - <!-- generate security test meta-data --> + <!- - generate security test meta-data - - <webserviceejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> @@ -1039,7 +1041,7 @@ targetNameSpace="http://test.jboss.org/security"/> </webserviceejbdoclet> - <!-- generate external test meta-data --> + <!- - generate external test meta-data - - <webserviceejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> @@ -1062,6 +1064,7 @@ destdir="${build.resources}/webservice/external/wsr/META-INF" targetNameSpace="http://test.jboss.org/external"/> </webserviceejbdoclet> +--> <!-- aop test --> <mkdir dir="${build.resources}/aop/simpleejb/META-INF"/> @@ -1269,6 +1272,7 @@ <classpath refid="tests.classpath"/> <include name="${javac.includes}"/> <exclude name="${javac.excludes}"/> + <exclude name="org/jboss/test/webservice/**" /> </javac> </target> @@ -1280,12 +1284,13 @@ <include name="**/*"/> </fileset> </copy> - <!-- we copy the standard client-config to the resources folder --> + <!-- we copy the standard client-config to the resources folder <copy todir="${build.resources}" filtering="no"> <fileset dir="${jboss.jbossnet.etc}"> <include name="**/client-config.xml"/> </fileset> </copy> +--> </target> <!-- Compile stylesheets files --> @@ -1442,7 +1447,6 @@ _jars-txtimer, _jars-util, _jars-web, - _jars-webservice, _jars-ws4ee, _jars-xa"> </target> |
|
From: Anil S. <osd...@us...> - 2004-07-09 21:19:30
|
User: osdchicago
Date: 04/07/09 14:19:24
Modified: . build.xml
Log:
Test Framework for HttpSessionReplication on jboss-head
Revision Changes Path
1.371 +110 -5 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- build.xml 7 Jun 2004 20:40:36 -0000 1.370
+++ build.xml 9 Jul 2004 21:19:24 -0000 1.371
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.370 2004/06/07 20:40:36 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.371 2004/07/09 21:19:24 osdchicago Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1441,6 +1441,7 @@
_jars-security,
_jars-testbean,
_jars-testbeancluster,
+ _jars-httpsessionreplication,
_jars-threading,
_jars-timer,
_jars-tm,
@@ -4675,7 +4676,6 @@
<include name="org/jboss/test/testbeancluster/interfaces/**"/>
<include name="org/jboss/test/testbean/bean/**"/>
<include name="org/jboss/test/testbeancluster/bean/**"/>
- <include name="org/somepackage/**"/>
</fileset>
<fileset dir="${build.resources}/testbeancluster">
<include name="**/*.xml"/>
@@ -4683,6 +4683,26 @@
</jar>
</target>
+ <!-- httpsessionreplication test -->
+ <target name="_jars-httpsessionreplication">
+ <mkdir dir="${build.lib}"/>
+
+ <!-- build httpsessionreplication.jar -->
+ <jar jarfile="${build.lib}/httpsessionreplication.jar">
+ <!--
+ <fileset dir="${build.classes}">
+ <patternset refid="jboss.test.util.ejb.set"/>
+ <include name="org/jboss/test/testbean/interfaces/**"/>
+ <include name="org/jboss/test/testbeancluster/interfaces/**"/>
+ <include name="org/jboss/test/testbean/bean/**"/>
+ <include name="org/jboss/test/testbeancluster/bean/**"/>
+ </fileset>
+ -->
+ <fileset dir="${build.resources}/cluster">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
+ </target>
<!-- web test -->
<target name="_jars-web" depends="_jars-cts">
<mkdir dir="${build.lib}"/>
@@ -5592,8 +5612,18 @@
</target>
<target name="tests-clustering-noreport"
- depends="init, tests-clustering-unit">
+ depends="init, tests-clustering-unit,tests-http-clustering-unit">
+ </target>
+
+ <!-- HTTP Clustering Tests-->
+ <target name="tests-http-clustering-noreport"
+ depends="init, tests-http-clustering-unit">
+ </target>
+
+ <target name="tests-http-clustering" description="Execute clustering tests requiring two nodes."
+ depends="init, tests-http-clustering-noreport, tests-report-xml">
</target>
+ <!--Till Here-->
<!--
| Helper for running all jbossmx tests
@@ -5737,6 +5767,8 @@
<target name="tests-clustering-unit" depends="maybejars">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log"/>
<junit dir="${module.output}"
printsummary="${junit.printsummary}"
haltonerror="${junit.haltonerror}"
@@ -5769,13 +5801,86 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
-
<include name="org/jboss/test/testbeancluster/**/*UnitTestCase*.class"/>
-
</fileset>
</batchtest>
</junit>
</target>
+
+ <!-- Test HTTP Clustering -->
+ <target name="tests-http-clustering-unit" depends="maybejars">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <echo>first round test</echo>
+ <antcall target="tests-http-cluster"> </antcall>
+ <echo>Bringing down the first instance</echo>
+ <!-- <exec>shutdown.sh -s localhost:1199</exec> -->
+ <!--
+ <antcall target="shutdowninstance">
+ <param name="instanceport" value="localhost:1099"/>
+ </antcall>
+ <echo>Sleeping for 30 seconds</echo>
+ <sleep seconds="30" />
+ <echo>second round test</echo>
+ <antcall target="tests-http-cluster"> </antcall>
+ <echo>Bringing down the second instance</echo>
+ <antcall target="shutdowninstance">
+ <param name="instanceport" value="localhost:1199"/>
+ </antcall>
+ <echo>Sleeping for 30 seconds</echo>
+ <sleep seconds="30" />
+ <echo>Third round test(Http Session Replication must fail)</echo>
+ <antcall target="tests-http-cluster"> </antcall>
+ -->
+ </target>
+
+ <target name="shutdowninstance">
+ <echo>Shutting Down an Instance of JBoss Running</echo>
+ <java classname="org.jboss.Shutdown" fork="yes" >
+ <arg value="-s ${instanceport}"/>
+ <classpath>
+ <pathelement location="/Users/anil/jboss-head/build/output/jboss-4.0.0DR4/bin/shutdown.jar"/>
+ <pathelement location="/Users/anil/jboss-head/build/output/jboss-4.0.0DR4/client/jbossall-client.jar"/>
+ </classpath>
+ </java>
+ </target>
+
+
+ <target name="tests-http-cluster">
+ <echo>Calling tests-http-cluster</echo>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}">
+
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}">
+
+ <fileset dir="${build.classes}">
+ <!-- Following added by Anil -->
+ <include name="org/jboss/test/cluster/**/*UnitTestCase*.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<target name="tests-standalone-aop-unit" depends="maybejars">
<!--
|
|
From: Bill B. <pat...@us...> - 2004-07-13 00:59:26
|
User: patriot1burke
Date: 04/07/12 17:59:18
Modified: . build.xml
Log:
added tests for annotations for tx, security, and tx lock
Revision Changes Path
1.372 +156 -143 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- build.xml 9 Jul 2004 21:19:24 -0000 1.371
+++ build.xml 13 Jul 2004 00:59:18 -0000 1.372
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.371 2004/07/09 21:19:24 osdchicago Exp $ -->
+<!-- $Id: build.xml,v 1.372 2004/07/13 00:59:18 patriot1burke Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1472,148 +1472,161 @@
<include name="org/jboss/test/util/ejb/**"/>
</patternset>
- <!-- aop test -->
- <target name="_jars-aop">
- <mkdir dir="${build.lib}"/>
- <!-- build aopest.jar -->
- <jar jarfile="${build.lib}/aoptest.jar"
- manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <patternset refid="common.test.client.classes"/>
- <include name="org/jboss/test/aop/test/**"/>
- <include name="org/somepackage/**"/>
- </fileset>
- <fileset dir="${build.resources}/aop">
- <include name="*.*"/>
- </fileset>
- </jar>
-
- <!-- build simpleejb.jar -->
- <jar jarfile="${build.lib}/simpleejb.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/aop/simpleejb/"/>
- </fileset>
- <metainf dir="${build.resources}/aop/simpleejb/META-INF/"/>
- </jar>
-
- <jar jarfile="${build.lib}/aop-call-logging.aop">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/aop/test/CallLoggingUnitTestCase.class"/>
- </fileset>
- <metainf dir="${build.resources}/aop/calllogging/META-INF/"/>
- </jar>
-
- <jar jarfile="${build.lib}/aop-invocationlog.aop">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/aop/test/InvocationLogUnitTestCase.class"/>
- <include name="org/jboss/test/aop/bean/POJO.class"/>
- <include name="org/jboss/test/aop/bean/SomeException.class"/>
- </fileset>
- <fileset dir="${build.resources}/aop/invocationlog">
- <include name="META-INF/jboss-aop.xml"/>
- </fileset>
- </jar>
- <jar jarfile="${build.lib}/aop-invocationlog.sar">
- <fileset dir="${build.lib}">
- <include name="aop-invocationlog.aop"/>
- </fileset>
- <fileset dir="${build.resources}/aop/invocationlog">
- <include name="META-INF/jboss-service.xml"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/aoptest.aop"
- manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/aop/bean/Implements*.class"/>
- <include name="org/jboss/test/aop/bean/CFlowedPOJO.class"/>
- <include name="org/jboss/test/aop/bean/InstanceOfInterceptor.class"/>
- <include name="org/jboss/test/aop/bean/InterceptorCounter.class"/>
- <include name="org/jboss/test/aop/bean/SomeInterface.class"/>
- <include name="org/jboss/test/aop/bean/EmptyInterface.class"/>
- <include name="org/jboss/test/aop/bean/Aspect.class"/>
- <include name="org/jboss/test/aop/bean/Person.class"/>
- <include name="org/jboss/test/aop/bean/Address.class"/>
- <include name="org/jboss/test/aop/bean/NoInterceptorsPOJO*.class"/>
- <include name="org/jboss/test/aop/bean/NonadvisedPOJO.class"/>
- <include name="org/jboss/test/aop/bean/SecuredPOJO.class"/>
- <include name="org/jboss/test/aop/bean/SomeException.class"/>
- <include name="org/jboss/test/aop/bean/POJO*.class"/>
- <include name="org/jboss/test/aop/bean/Call*.class"/>
- <include name="org/jboss/test/aop/bean/SomeIntroduction.class"/>
- <include name="org/jboss/test/aop/bean/SubclassIntroduction.class"/>
- <include name="org/jboss/test/aop/bean/AnotherIntroduction.class"/>
- <include name="org/jboss/test/aop/bean/Introduction.class"/>
- <include name="org/jboss/test/aop/bean/Introduction2.class"/>
- <include name="org/jboss/test/aop/bean/InterfaceMixin.class"/>
- <include name="org/jboss/test/aop/bean/TxPOJO.class"/>
- <include name="org/jboss/test/aop/bean/TxLockedPOJO.class"/>
- <include name="org/jboss/test/aop/bean/VersionedPOJO.class"/>
- <include name="org/jboss/test/aop/bean/SimpleInterceptor.class"/>
- <include name="org/jboss/test/aop/bean/SimpleInterceptorFactory.class"/>
- <include name="org/jboss/test/aop/bean/SimpleBeanInterceptor.class"/>
- <include name="org/jboss/test/aop/bean/SimpleBeanInterceptorFactory.class"/>
- <include name="org/jboss/test/aop/bean/Temperature*.class"/>
- <include name="org/jboss/test/aop/bean/Observable*.class"/>
- <include name="org/jboss/test/aop/bean/LogUtil*.class"/>
- </fileset>
- <fileset dir="${build.resources}/aop">
- <include name="META-INF/jboss-aop.xml"/>
- </fileset>
- </jar>
-
- <!-- build aop.jar -->
- <jar jarfile="${build.lib}/aoptest.sar">
- <fileset dir="${build.lib}">
- <include name="aoptest.aop"/>
- </fileset>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/aop/bean/AOPTester.class"/>
- <include name="org/jboss/test/aop/bean/AOPTesterMBean.class"/>
- <include name="org/jboss/test/aop/bean/RemotingTester.class"/>
- <include name="org/jboss/test/aop/bean/RemotingTesterMBean.class"/>
- <include name="org/jboss/test/aop/bean/SecurityTester.class"/>
- <include name="org/jboss/test/aop/bean/SecurityTesterMBean.class"/>
- <include name="org/jboss/test/aop/bean/TxTester.class"/>
- <include name="org/jboss/test/aop/bean/TxTesterMBean.class"/>
- <include name="org/jboss/test/aop/bean/TxLockTester.class"/>
- <include name="org/jboss/test/aop/bean/TxLockTesterMBean.class"/>
- <include name="org/jboss/test/aop/bean/VersionedObjectTester.class"/>
- <include name="org/jboss/test/aop/bean/VersionedObjectTesterMBean.class"/>
- <include name="org/jboss/test/aop/bean/CacheTester.class"/>
- <include name="org/jboss/test/aop/bean/CacheTesterMBean.class"/>
- <include name="org/jboss/test/aop/bean/BeforeInterceptor.class"/>
- <include name="org/jboss/test/aop/bean/AfterInterceptor.class"/>
- <include name="org/jboss/test/aop/bean/LogUtil.class"/>
- <include name="org/jboss/test/aop/bean/Temperature.class"/>
- <include name="org/jboss/test/aop/bean/ObservableTester.class"/>
- <include name="org/jboss/test/aop/bean/ObservableTesterMBean.class"/>
- </fileset>
- <fileset dir="${build.resources}/aop">
- <include name="users.properties"/>
- <include name="roles.properties"/>
- </fileset>
- <fileset dir="${build.resources}/aop">
- <include name="META-INF/jboss-service.xml"/>
- </fileset>
- </jar>
- <!-- ok, we have created the loadtime jars, let us now precompile the classes for standalone test -->
-
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <path id="aop.task.classpath">
- <path refid="javassist.classpath"/>
- <path refid="trove.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="jboss.common.classpath"/>
- </path>
- <aopc compilerclasspathref="aop.task.classpath">
- <classpath refid="thirdparty.classpath"/>
- <classpath path="${build.classes}"/>
- <src path="${build.classes}"/>
- <include name="org/jboss/test/aop/bean/**"/>
- <aoppath path="${source.resources}/aop/META-INF/jboss-aop.xml"/>
- </aopc>
- </target>
+ <!-- aop test -->
+ <target name="_jars-aop">
+ <mkdir dir="${build.lib}"/>
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
+ <path id="aop.task.classpath">
+ <path refid="javassist.classpath"/>
+ <path refid="qdox.classpath"/>
+ <path refid="trove.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ </path>
+ <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
+ <annotationc compilerclasspathref="aop.task.classpath" bytecode="true">
+ <classpath refid="thirdparty.classpath"/>
+ <classpath path="${build.classes}"/>
+ <src path="${source.java}"/>
+ <include name="org/jboss/test/aop/bean/AnnotatedSecuredPOJO.java"/>
+ <include name="org/jboss/test/aop/bean/AnnotatedTxPOJO.java"/>
+ <include name="org/jboss/test/aop/bean/AnnotatedTxLockedPOJO.java"/>
+ </annotationc>
+ <!-- build aopest.jar -->
+ <jar jarfile="${build.lib}/aoptest.jar"
+ manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
+ <include name="org/jboss/test/aop/test/**"/>
+ <include name="org/somepackage/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="*.*"/>
+ </fileset>
+ </jar>
+
+ <!-- build simpleejb.jar -->
+ <jar jarfile="${build.lib}/simpleejb.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/simpleejb/"/>
+ </fileset>
+ <metainf dir="${build.resources}/aop/simpleejb/META-INF/"/>
+ </jar>
+
+ <jar jarfile="${build.lib}/aop-call-logging.aop">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/test/CallLoggingUnitTestCase.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/aop/calllogging/META-INF/"/>
+ </jar>
+
+ <jar jarfile="${build.lib}/aop-invocationlog.aop">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/test/InvocationLogUnitTestCase.class"/>
+ <include name="org/jboss/test/aop/bean/POJO.class"/>
+ <include name="org/jboss/test/aop/bean/SomeException.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop/invocationlog">
+ <include name="META-INF/jboss-aop.xml"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${build.lib}/aop-invocationlog.sar">
+ <fileset dir="${build.lib}">
+ <include name="aop-invocationlog.aop"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop/invocationlog">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/aoptest.aop"
+ manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/bean/Implements*.class"/>
+ <include name="org/jboss/test/aop/bean/CFlowedPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/InstanceOfInterceptor.class"/>
+ <include name="org/jboss/test/aop/bean/InterceptorCounter.class"/>
+ <include name="org/jboss/test/aop/bean/SomeInterface.class"/>
+ <include name="org/jboss/test/aop/bean/EmptyInterface.class"/>
+ <include name="org/jboss/test/aop/bean/Aspect.class"/>
+ <include name="org/jboss/test/aop/bean/Person.class"/>
+ <include name="org/jboss/test/aop/bean/Address.class"/>
+ <include name="org/jboss/test/aop/bean/NoInterceptorsPOJO*.class"/>
+ <include name="org/jboss/test/aop/bean/NonadvisedPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/SecuredPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/AnnotatedSecuredPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/SomeException.class"/>
+ <include name="org/jboss/test/aop/bean/POJO*.class"/>
+ <include name="org/jboss/test/aop/bean/Call*.class"/>
+ <include name="org/jboss/test/aop/bean/SomeIntroduction.class"/>
+ <include name="org/jboss/test/aop/bean/SubclassIntroduction.class"/>
+ <include name="org/jboss/test/aop/bean/AnotherIntroduction.class"/>
+ <include name="org/jboss/test/aop/bean/Introduction.class"/>
+ <include name="org/jboss/test/aop/bean/Introduction2.class"/>
+ <include name="org/jboss/test/aop/bean/InterfaceMixin.class"/>
+ <include name="org/jboss/test/aop/bean/AnnotatedTxPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/TxPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/TxLockedPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/AnnotatedTxLockedPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/VersionedPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleInterceptor.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleInterceptorFactory.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleBeanInterceptor.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleBeanInterceptorFactory.class"/>
+ <include name="org/jboss/test/aop/bean/Temperature*.class"/>
+ <include name="org/jboss/test/aop/bean/Observable*.class"/>
+ <include name="org/jboss/test/aop/bean/LogUtil*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="META-INF/jboss-aop.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- build aop.jar -->
+ <jar jarfile="${build.lib}/aoptest.sar">
+ <fileset dir="${build.lib}">
+ <include name="aoptest.aop"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/bean/AOPTester.class"/>
+ <include name="org/jboss/test/aop/bean/AOPTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/RemotingTester.class"/>
+ <include name="org/jboss/test/aop/bean/RemotingTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/SecurityTester.class"/>
+ <include name="org/jboss/test/aop/bean/SecurityTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/TxTester.class"/>
+ <include name="org/jboss/test/aop/bean/TxTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/TxLockTester*.class"/>
+ <include name="org/jboss/test/aop/bean/TxLockTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/VersionedObjectTester.class"/>
+ <include name="org/jboss/test/aop/bean/VersionedObjectTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/CacheTester.class"/>
+ <include name="org/jboss/test/aop/bean/CacheTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/BeforeInterceptor.class"/>
+ <include name="org/jboss/test/aop/bean/AfterInterceptor.class"/>
+ <include name="org/jboss/test/aop/bean/LogUtil.class"/>
+ <include name="org/jboss/test/aop/bean/Temperature.class"/>
+ <include name="org/jboss/test/aop/bean/ObservableTester.class"/>
+ <include name="org/jboss/test/aop/bean/ObservableTesterMBean.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="users.properties"/>
+ <include name="roles.properties"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+ <!-- ok, we have created the loadtime jars, let us now precompile the classes for standalone test -->
+
+ <aopc compilerclasspathref="aop.task.classpath">
+ <classpath refid="thirdparty.classpath"/>
+ <classpath path="${build.classes}"/>
+ <src path="${build.classes}"/>
+ <include name="org/jboss/test/aop/bean/**"/>
+ <aoppath path="${source.resources}/aop/META-INF/jboss-aop.xml"/>
+ </aopc>
+ </target>
<!-- bank test -->
<target name="_jars-bank">
|
|
From: Adrian B. <ej...@us...> - 2004-07-13 13:50:40
|
User: ejort
Date: 04/07/13 06:50:33
Modified: . Tag: Branch_3_2 build.xml
Log:
Add a test for log4j accessed from context listener inside an isolated ear.
Revision Changes Path
No revision
No revision
1.165.2.155 +29 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.154
retrieving revision 1.165.2.155
diff -u -r1.165.2.154 -r1.165.2.155
--- build.xml 3 Jun 2004 10:50:42 -0000 1.165.2.154
+++ build.xml 13 Jul 2004 13:50:32 -0000 1.165.2.155
@@ -15,7 +15,7 @@
<!-- -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.165.2.154 2004/06/03 10:50:42 cazzius Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.155 2004/07/13 13:50:32 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2724,6 +2724,34 @@
</fileset>
</jar>
+ <!-- build isolationC.war -->
+ <war warfile="${build.lib}/isolationC.war"
+ webxml="${build.resources}/isolation/c/war/WEB-INF/web.xml">
+ <webinf dir="${build.resources}/isolation/c/war">
+ <include name="WEB-INF/*.xml"/>
+ <exclude name="WEB-INF/web.xml"/>
+ </webinf>
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/isolation/web/c/**"/>
+ </classes>
+ <classes dir="${build.resources}/isolation/c/war/WEB-INF/classes">
+ <include name="**/*"/>
+ </classes>
+ <lib dir="${apache.log4j.lib}">
+ <include name="log4j.jar"/>
+ </lib>
+ </war>
+
+ <!-- build isolationC.ear -->
+ <jar jarfile="${build.lib}/isolationC.ear">
+ <fileset dir="${build.lib}">
+ <include name="isolationC.war"/>
+ </fileset>
+ <fileset dir="${build.resources}/isolation/c/ear">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
</target>
<!-- naming test -->
|