Menu
▾
▴
jboss-cvs-commits
|
From: Adrian B. <ej...@us...> - 2003-02-13 09:37:35
|
User: ejort
Date: 03/02/13 01:37:33
Modified: . Tag: Branch_3_2 build.xml
Log:
Add a test of an entity barfing errors to test the container handles them properly
Revision Changes Path
No revision
No revision
1.165.2.41 +21 -7 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.40
retrieving revision 1.165.2.41
diff -u -r1.165.2.40 -r1.165.2.41
--- build.xml 13 Feb 2003 04:17:02 -0000 1.165.2.40
+++ build.xml 13 Feb 2003 09:37:32 -0000 1.165.2.41
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.40 2003/02/13 04:17:02 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.41 2003/02/13 09:37:32 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -835,12 +835,12 @@
</xdoclet>
<!-- entity test -->
- <mkdir dir="${build.resources}/entity/META-INF"/>
+ <mkdir dir="${build.resources}/entity/entity/META-INF"/>
<xdoclet destdir="${build.gen-src}"
classpath="${xdoclet.task.classpath}"
ejbspec="2.0"
excludedtags="@version,@author"
- mergedir="${source.resources}/entity">
+ mergedir="${source.resources}/entity/entity">
<fileset dir="${source.java}">
<include name="org/jboss/test/entity/beans/*Bean.java"/>
</fileset>
@@ -853,12 +853,12 @@
<entitycmp/>
<utilobject kind="physical"/>
<deploymentdescriptor xmlencoding="UTF-8"
- destdir="${build.resources}/entity/META-INF"/>
+ destdir="${build.resources}/entity/entity/META-INF"/>
<jboss xmlencoding="UTF-8"
version="3.0"
datasource="java:/DefaultDS"
typemapping="Hypersonic SQL"
- destdir="${build.resources}/entity/META-INF"/>
+ destdir="${build.resources}/entity/entity/META-INF"/>
</xdoclet>
</target>
@@ -3364,9 +3364,23 @@
<patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/entity/interfaces/**"/>
<include name="org/jboss/test/entity/beans/**"/>
- <include name="org/jboss/test/entity/test/**"/>
+ <include name="org/jboss/test/entity/test/EntityUnitTestCase"/>
</fileset>
- <fileset dir="${build.resources}/entity">
+ <fileset dir="${build.resources}/entity/entity">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
+ <!-- build jboss-test-entity.jar -->
+ <jar jarfile="${build.lib}/jboss-test-pathological-entity.jar"
+ manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
+ <include name="org/jboss/test/entity/interfaces/**"/>
+ <include name="org/jboss/test/entity/ejb/**"/>
+ <include name="org/jboss/test/entity/test/PathologicalUnitTestCase"/>
+ </fileset>
+ <fileset dir="${build.resources}/entity/pathological">
<include name="**"/>
</fileset>
</jar>
|
|
From: Adrian B. <ej...@us...> - 2003-02-14 01:07:18
|
User: ejort
Date: 03/02/13 17:07:17
Modified: . Tag: Branch_3_0 build.xml
Log:
Add a test of an entity throwning errors to test they are handled correctly by the container
Revision Changes Path
No revision
No revision
1.106.2.63 +21 -7 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.62
retrieving revision 1.106.2.63
diff -u -r1.106.2.62 -r1.106.2.63
--- build.xml 18 Jan 2003 11:50:31 -0000 1.106.2.62
+++ build.xml 14 Feb 2003 01:07:16 -0000 1.106.2.63
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.62 2003/01/18 11:50:31 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.63 2003/02/14 01:07:16 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -644,12 +644,12 @@
</xdoclet>
<!-- entity test -->
- <mkdir dir="${build.resources}/entity/META-INF"/>
+ <mkdir dir="${build.resources}/entity/entity/META-INF"/>
<xdoclet destdir="${build.gen-src}"
classpath="${xdoclet.task.classpath}"
ejbspec="2.0"
excludedtags="@version,@author"
- mergedir="${source.resources}/entity">
+ mergedir="${source.resources}/entity/entity">
<fileset dir="${source.java}">
<include name="org/jboss/test/entity/beans/*Bean.java"/>
</fileset>
@@ -662,12 +662,12 @@
<entitycmp/>
<utilobject kind="physical"/>
<deploymentdescriptor xmlencoding="UTF-8"
- destdir="${build.resources}/entity/META-INF"/>
+ destdir="${build.resources}/entity/entity/META-INF"/>
<jboss xmlencoding="UTF-8"
version="3.0"
datasource="java:/DefaultDS"
typemapping="Hypersonic SQL"
- destdir="${build.resources}/entity/META-INF"/>
+ destdir="${build.resources}/entity/entity/META-INF"/>
</xdoclet>
</target>
@@ -2897,9 +2897,23 @@
<patternset refid="common.test.client.classes"/>
<include name="org/jboss/test/entity/interfaces/**"/>
<include name="org/jboss/test/entity/beans/**"/>
- <include name="org/jboss/test/entity/test/**"/>
+ <include name="org/jboss/test/entity/test/EntityUnitTestCase"/>
</fileset>
- <fileset dir="${build.resources}/entity">
+ <fileset dir="${build.resources}/entity/entity">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
+ <!-- build jboss-test-pathological-entity.jar -->
+ <jar jarfile="${build.lib}/jboss-test-pathological-entity.jar"
+ manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
+ <include name="org/jboss/test/entity/interfaces/**"/>
+ <include name="org/jboss/test/entity/ejb/**"/>
+ <include name="org/jboss/test/entity/test/PathologicalUnitTestCase"/>
+ </fileset>
+ <fileset dir="${build.resources}/entity/pathological">
<include name="**"/>
</fileset>
</jar>
|
|
From: David J. <d_j...@us...> - 2003-02-15 06:51:43
|
User: d_jencks
Date: 03/02/14 22:51:42
Modified: . Tag: Branch_3_2 build.xml
Log:
backport the check-connection-when-matched functionality from head, add a test, and clean up quite a bit of stuff in the jca-jdbc wrappers.
Revision Changes Path
No revision
No revision
1.165.2.42 +12 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.41
retrieving revision 1.165.2.42
diff -u -r1.165.2.41 -r1.165.2.42
--- build.xml 13 Feb 2003 09:37:32 -0000 1.165.2.41
+++ build.xml 15 Feb 2003 06:51:42 -0000 1.165.2.42
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.41 2003/02/13 09:37:32 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.42 2003/02/15 06:51:42 d_jencks Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1702,6 +1702,17 @@
<target name="_jars-jca"
depends="compile">
<mkdir dir="${build.lib}"/>
+
+ <!-- build test jdbc driver with config inside sar -->
+ <jar jarfile="${build.lib}/jbosstestdriver.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jca/jdbc/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/jca/jdbc">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
<!-- build test adapter -->
<jar jarfile="${build.lib}/jbosstestadapter.jar">
|
|
From: David J. <d_j...@us...> - 2003-02-15 21:01:43
|
User: d_jencks
Date: 03/02/15 13:01:42
Modified: . Tag: Branch_3_0 build.xml
Log:
backport CachedConnectionManager changes, and test-connection-before-handing-it-out feature. This replaces the old jca-jdbc wrappers with the versions from 3.2/4, enabling oracle xa support in 3.0
Revision Changes Path
No revision
No revision
1.106.2.64 +22 -10 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.63
retrieving revision 1.106.2.64
diff -u -r1.106.2.63 -r1.106.2.64
--- build.xml 14 Feb 2003 01:07:16 -0000 1.106.2.63
+++ build.xml 15 Feb 2003 21:01:40 -0000 1.106.2.64
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.63 2003/02/14 01:07:16 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.64 2003/02/15 21:01:40 d_jencks Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -274,8 +274,9 @@
<property name="jboss.connector.root" value="${project.root}/connector/output"/>
<property name="jboss.connector.lib" value="${jboss.connector.root}/lib"/>
<path id="jboss.connector.classpath">
- <pathelement path="${jboss.connector.lib}/jboss-jca.jar"/>
- <pathelement path="${jboss.connector.lib}/local-ra-jdbc-libs.jar"/>
+ <pathelement path="${jboss.connector.lib}/jboss-jca.sar"/>
+ <pathelement path="${jboss.connector.lib}/jboss-local-jdbc.jar"/>
+ <pathelement path="${jboss.connector.lib}/jboss-common-jdbc-wrapper.jar"/>
</path>
<!-- Cluster -->
@@ -457,8 +458,7 @@
classpath="${xdoclet.task.classpath}"
ejbspec="2.0"
excludedtags="@version,@author"
- mergedir="${source.resources}/ejb-conf/readonly">
-
+ mergedir="${source.resources}/ejb-conf/readonly">
<fileset dir="${source.java}">
<include name="org/jboss/test/ejbconf/beans/**/*Bean.java"/>
</fileset>
@@ -474,8 +474,9 @@
version="3.0"
destdir="${build.resources}/ejbconf/readonly/META-INF"
mergedir="${source.resources}/ejbconf/readonly/"
- Datasource="java:/DefaultDS"
- Typemapping="Hypersonic SQL"/>
+ Datasource="java:/DefaultDS"
+ Typemapping="Hypersonic SQL"
+ />
</xdoclet>
<!--eardeployment, SessionA-->
@@ -484,7 +485,7 @@
classpath="${xdoclet.task.classpath}"
ejbspec="2.0"
excludedtags="@version,@author"
- mergedir="${source.resources}/eardeployment/a">
+ mergedir="${source.resources}/eardeployment/a">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/eardeployment/a/ejb/SessionABean.java"/>
</fileset>
@@ -652,7 +653,7 @@
mergedir="${source.resources}/entity/entity">
<fileset dir="${source.java}">
<include name="org/jboss/test/entity/beans/*Bean.java"/>
- </fileset>
+ </fileset>
<packageSubstitution packages="beans" substituteWith="interfaces"/>
<valueobject/>
<remoteinterface/>
@@ -1419,12 +1420,23 @@
depends="compile">
<mkdir dir="${build.lib}"/>
+ <!-- build test jdbc driver with config inside sar -->
+ <jar jarfile="${build.lib}/jbosstestdriver.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jca/jdbc/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/jca/jdbc">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
+
<!-- build test adapter -->
<jar jarfile="${build.lib}/jbosstestadapter.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/jca/adapter/**"/>
</fileset>
- </jar>
+ </jar>
<jar jarfile="${build.lib}/jbosstestadapter.rar">
<fileset dir="${build.lib}">
|
|
From: David J. <d_j...@us...> - 2003-02-16 05:22:01
|
User: d_jencks
Date: 03/02/15 21:21:59
Modified: . build.xml
Log:
enable running all tests including module and testsuite tests from main build file using tests target (preliminary support)
Revision Changes Path
1.217 +7 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- build.xml 22 Jan 2003 17:32:39 -0000 1.216
+++ build.xml 16 Feb 2003 05:21:59 -0000 1.217
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.216 2003/01/22 17:32:39 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.217 2003/02/16 05:21:59 d_jencks Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -108,7 +108,9 @@
<pathelement path="${jboss.security.lib}/jbosssx.jar"/>
<pathelement path="${jboss.security.lib}/jboss-jaas.jar"/>
<pathelement path="${jboss.connector.lib}/jboss-jca.sar"/>
- <pathelement path="${jboss.connector.lib}/local-ra-jdbc-libs.jar"/>
+ <pathelement path="${jboss.connector.lib}/jboss-common-jdbc-wrapper.jar"/>
+ <pathelement path="${jboss.connector.lib}/jboss-local-jdbc.jar"/>
+ <pathelement path="${jboss.connector.lib}/jboss-xa-jdbc.jar"/>
<pathelement path="${jboss.cluster.lib}/jbossha-client.jar"/>
<pathelement path="${jboss.jmx.lib}/jboss-jmx.jar"/>
<pathelement path="${jboss.transaction.lib}/testsuite-support.jar"/>
@@ -3124,6 +3126,9 @@
<target name="clean" depends="_default:clean">
<!-- Add module specific elements here. -->
+ <delete>
+ <fileset dir="${project.root}/testsuite" includes="junit-*.properties"/>
+ </delete>
</target>
<target name="clobber" depends="_default:clobber">
|
|
From: David J. <d_j...@us...> - 2003-02-16 19:36:07
|
User: d_jencks
Date: 03/02/16 11:36:03
Modified: . build.xml
Log:
Port nested tx-related exceptions, txrolledbackException on 1pc commit failure, test of test-connections-on-match, pool flush and related work from 3.2 and 3.0
Revision Changes Path
1.218 +15 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- build.xml 16 Feb 2003 05:21:59 -0000 1.217
+++ build.xml 16 Feb 2003 19:36:03 -0000 1.218
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.217 2003/02/16 05:21:59 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.218 2003/02/16 19:36:03 d_jencks Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -1386,6 +1386,20 @@
<!-- jca test -->
<target name="_output:jca" depends="_output:support">
<!-- <mkdir dir="${build.lib}"/> -->
+
+ <!-- build test jdbc driver without config, we don't deploy embedded *-ds.xml files at the moment -->
+ <jar jarfile="${build.lib}/jbosstestdriver.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jca/jdbc/**"/>
+ </fileset>
+ </jar>
+
+ <!-- test driver config -->
+ <copy todir="${build.lib}" filtering="no">
+ <fileset dir="${build.resources}/jca/jdbc">
+ <include name="testdriver-ds.xml"/>
+ </fileset>
+ </copy>
<!-- build test adapter -->
<jar jarfile="${build.lib}/jbosstestadapter.jar">
|
|
From: Bill B. <pat...@us...> - 2003-02-20 21:01:48
|
User: patriot1burke
Date: 03/02/20 13:01:45
Modified: . build.xml
Log:
expanded testsuite coverage for AOP and the AOP TxInterceptor
Revision Changes Path
1.219 +4 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- build.xml 16 Feb 2003 19:36:03 -0000 1.218
+++ build.xml 20 Feb 2003 21:01:45 -0000 1.219
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.218 2003/02/16 19:36:03 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.219 2003/02/20 21:01:45 patriot1burke Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -2182,6 +2182,7 @@
manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/test/aop/bean/POJO*.class"/>
+ <include name="org/jboss/test/aop/bean/TxPOJO.class"/>
<include name="org/jboss/test/aop/bean/SimpleInterceptor.class"/>
<include name="org/jboss/test/aop/bean/SimpleInterceptorFactory.class"/>
</fileset>
@@ -2198,6 +2199,8 @@
<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/TxTester.class"/>
+ <include name="org/jboss/test/aop/bean/TxTesterMBean.class"/>
<include name="org/jboss/test/aop/bean/BeforeInterceptor.class"/>
<include name="org/jboss/test/aop/bean/AfterInterceptor.class"/>
</fileset>
|
|
From: David J. <d_j...@us...> - 2003-02-28 00:09:42
|
User: d_jencks
Date: 03/02/27 16:09:42
Modified: . build.xml
Log:
comment and xdoclet-ize exception tests and make them work prior to refactoring
Revision Changes Path
1.220 +44 -6 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- build.xml 20 Feb 2003 21:01:45 -0000 1.219
+++ build.xml 28 Feb 2003 00:09:41 -0000 1.220
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.219 2003/02/20 21:01:45 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.220 2003/02/28 00:09:41 d_jencks Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -154,6 +154,14 @@
<property name="jbosstest.data.dir" value="${module.output}/data"/>
+ <!-- ejbdoclet setup defaults -->
+ <property name="default.test.jboss-version" value="3.0"/>
+ <property name="default.test.datasource" value="java:/DefaultDS"/>
+ <property name="default.test.typemapping" value="Hypersonic SQL"/>
+ <property name="default.test.create-table" value="true"/>
+ <property name="default.test.remove-table" value="true"/>
+
+
<!-- Classpath to build and run the tests -->
<path id="tests.classpath">
<pathelement path="${classpath}"/>
@@ -623,8 +631,11 @@
excludedtags="@version,@author"
mergedir="${source.resources}/entity">
<fileset dir="${source.java}">
- <include name="org/jboss/test/entity/beans/*Bean.java"/>
- </fileset>
+ <include name="org/jboss/test/entity/beans/*Bean.java"/>
+ </fileset>
+ <fileset dir="${jboss.blocks.source.java}">
+ <include name="org/jboss/blocks/junit/ejb/EJBTestRunnerBean.java"/>
+ </fileset>
<packageSubstitution packages="beans" substituteWith="interfaces"/>
<valueobject/>
<remoteinterface/>
@@ -632,14 +643,41 @@
<homeinterface/>
<localhomeinterface/>
<entitycmp/>
+ <session/>
<utilobject kind="physical"/>
<deploymentdescriptor xmlencoding="UTF-8"
destdir="${build.resources}/entity/META-INF"/>
<jboss xmlencoding="UTF-8"
- version="3.0"
- datasource="java:/DefaultDS"
- typemapping="Hypersonic SQL"
+ version="${default.test.jboss-version}"
+ datasource="${default.test.datasource}"
+ typemapping="${default.test.typemapping}"
+ createTable="${default.test.create-table}"
+ removeTable="${default.test.remove-table}"
destdir="${build.resources}/entity/META-INF"/>
+ </ejbdoclet>
+
+ <!-- exception test -->
+ <mkdir dir="${build.resources}/exception/META-INF"/>
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/exception/*Bean.java"/>
+ </fileset>
+ <!--packageSubstitution packages="beans" substituteWith="interfaces"/-->
+ <remoteinterface/>
+ <localinterface/>
+ <homeinterface/>
+ <localhomeinterface/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/exception/META-INF"/>
+ <jboss xmlencoding="UTF-8"
+ version="${default.test.jboss-version}"
+ datasource="${default.test.datasource}"
+ typemapping="${default.test.typemapping}"
+ createTable="${default.test.create-table}"
+ removeTable="${default.test.remove-table}"
+ destdir="${build.resources}/exception/META-INF"/>
</ejbdoclet>
</target>
|
|
From: Adrian B. <ej...@us...> - 2003-02-28 04:10:43
|
User: ejort
Date: 03/02/27 20:10:41
Modified: . Tag: Branch_3_2 build.xml
Log:
Simple tests for the JMX RMI Adaptor that uses the invokers
Revision Changes Path
No revision
No revision
1.165.2.43 +23 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.42
retrieving revision 1.165.2.43
diff -u -r1.165.2.42 -r1.165.2.43
--- build.xml 15 Feb 2003 06:51:42 -0000 1.165.2.42
+++ build.xml 28 Feb 2003 04:10:40 -0000 1.165.2.43
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.42 2003/02/15 06:51:42 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.43 2003/02/28 04:10:40 ejort Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -234,6 +234,7 @@
<property name="jboss.server.lib" value="${jboss.server.root}/lib"/>
<path id="jboss.server.classpath">
<pathelement path="${jboss.server.lib}/jboss-client.jar"/>
+ <pathelement path="${jboss.server.lib}/jmx-invoker-adaptor-client.jar"/>
<pathelement path="${jboss.server.lib}/jmx-rmi-connector-client.jar"/>
<pathelement path="${jboss.server.lib}/testsuite-support.jar"/>
</path>
@@ -873,6 +874,7 @@
excludedtags="@version,@author">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/deployer/*.java"/>
+ <include name="org/jboss/test/jmx/invoker/*.java"/>
<include name="org/jboss/test/jmx/mbean/*.java"/>
<include name="org/jboss/test/jmx/missingclass/*.java"/>
</fileset>
@@ -2163,6 +2165,26 @@
<jar jarfile="${build.lib}/missingclassmbean.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/jmx/missingclass/*.class"/>
+ </fileset>
+ </jar>
+
+ <!-- invoker adaptor test sar -->
+ <jar jarfile="${build.lib}/invoker-adaptor-test.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/invoker/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/invoker/sar">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- invoker adaptor test ear -->
+ <jar jarfile="${build.lib}/invoker-adaptor-test.ear">
+ <fileset dir="${build.lib}">
+ <include name="invoker-adaptor-test.sar"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/invoker/ear">
+ <include name="META-INF/*.xml"/>
</fileset>
</jar>
|
|
From: David J. <d_j...@us...> - 2003-03-02 03:39:34
|
User: d_jencks
Date: 03/03/01 19:39:33
Modified: . build.xml
Log:
Refactor tx interceptor support: combine CMT and BMT (mostly), make server side TxSupport run without need of client-side TxSupport, move functionality of AbstractTxInterceptor into TxSupport. Another try at making Exception unit test run
Revision Changes Path
1.221 +4 -4 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- build.xml 28 Feb 2003 00:09:41 -0000 1.220
+++ build.xml 2 Mar 2003 03:39:33 -0000 1.221
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.220 2003/02/28 00:09:41 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.221 2003/03/02 03:39:33 d_jencks Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -633,9 +633,6 @@
<fileset dir="${source.java}">
<include name="org/jboss/test/entity/beans/*Bean.java"/>
</fileset>
- <fileset dir="${jboss.blocks.source.java}">
- <include name="org/jboss/blocks/junit/ejb/EJBTestRunnerBean.java"/>
- </fileset>
<packageSubstitution packages="beans" substituteWith="interfaces"/>
<valueobject/>
<remoteinterface/>
@@ -664,6 +661,9 @@
<fileset dir="${source.java}">
<include name="org/jboss/test/exception/*Bean.java"/>
</fileset>
+ <fileset dir="${jboss.blocks.source.java}">
+ <include name="org/jboss/blocks/junit/ejb/EJBTestRunnerBean.java"/>
+ </fileset>
<!--packageSubstitution packages="beans" substituteWith="interfaces"/-->
<remoteinterface/>
<localinterface/>
|
|
From: Alexey L. <lou...@us...> - 2003-03-02 17:51:59
|
User: loubyansky
Date: 03/03/02 09:51:58
Modified: . build.xml
Log:
added cmp/aop tests. target tests-cmpaop runs all the cmp/aop tests.
Revision Changes Path
1.222 +57 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- build.xml 2 Mar 2003 03:39:33 -0000 1.221
+++ build.xml 2 Mar 2003 17:51:57 -0000 1.222
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.221 2003/03/02 03:39:33 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.222 2003/03/02 17:51:57 loubyansky Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -805,6 +805,7 @@
<call target="_output:classloader"/>
<call target="_output:timer"/>
<call target="_output:entity"/>
+ <call target="_output:cmpaop"/>
</parallel>
</target>
@@ -3161,6 +3162,17 @@
</jar>
</target>
+ <!-- cmp aop test -->
+ <target name="_output:cmpaop" depends="_output:support">
+ <!-- build jboss-cmp-aop.jar -->
+ <jar jarfile="${build.lib}/jboss-cmp-aop.jar"
+ manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/cmp/aop/**"/>
+ </fileset>
+ </jar>
+ </target>
+
<!--+====================================================================+-->
<!--| Documents |-->
@@ -4284,6 +4296,50 @@
</junit>
</target>
+
+ <!--
+ | Run all cmp aop related tests
+ -->
+
+ <target name="tests-cmpaop" depends="init, run-cmp-aop-tests, tests-report-html"/>
+ <target name="run-cmp-aop-tests" depends="maybejars">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.log}"/>
+ <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.log" value="${build.log}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="jbosstest.data.dir" value="${jbosstest.data.dir}"/>
+ <sysproperty key="jbosstest.iterationcount" value="2"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
+ extension=".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="**/cmp/aop/**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
<!--
|
|
From: Peter A. <pr...@us...> - 2003-03-05 09:17:57
|
User: pra
Date: 03/03/05 01:17:55
Modified: . Tag: Branch_3_0 build.xml
Log:
Added testcase for jmx-invoker-adapter against an mbean deployed in a scoped ear deployment
Revision Changes Path
No revision
No revision
1.106.2.65 +23 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.64
retrieving revision 1.106.2.65
diff -u -r1.106.2.64 -r1.106.2.65
--- build.xml 15 Feb 2003 21:01:40 -0000 1.106.2.64
+++ build.xml 5 Mar 2003 09:17:54 -0000 1.106.2.65
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.64 2003/02/15 21:01:40 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.65 2003/03/05 09:17:54 pra Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -242,6 +242,7 @@
<pathelement path="${jboss.server.lib}/jboss-client.jar"/>
<pathelement path="${jboss.server.lib}/jmx-rmi-connector-client.jar"/>
<pathelement path="${jboss.server.lib}/testsuite-support.jar"/>
+ <pathelement path="${jboss.server.lib}/jmx-invoker-adaptor-client.jar"/>
</path>
<!-- InternalServer -->
@@ -685,6 +686,7 @@
<include name="org/jboss/test/jmx/deployer/*.java"/>
<include name="org/jboss/test/jmx/mbean/*.java"/>
<include name="org/jboss/test/jmx/missingclass/*.java"/>
+ <include name="org/jboss/test/jmx/invoker/RemoteService.java"/>
</fileset>
<mbeaninterface mergedir="${project.tools}/etc/xdoclet/templates"/>
</jmxdoclet>
@@ -1871,6 +1873,26 @@
</fileset>
<metainf dir="${source.resources}/jmx/undeploy/good-inf" />
</jar>
+
+ <!-- JRMP invoker test -->
+ <jar jarfile="${build.lib}/remoteservice.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/invoker/*.class"/>
+ </fileset>
+ <fileset dir="${source.resources}/jmx/invoker">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
+ <ear earfile="${build.lib}/remoteservice.ear"
+ appxml="${source.resources}/jmx/invoker/META-INF/application.xml">
+ <fileset dir="${build.lib}">
+ <include name="remoteservice.sar"/>
+ </fileset>
+ <fileset dir="${source.resources}/jmx/invoker">
+ <include name="META-INF/jboss-app.xml"/>
+ </fileset>
+ </ear>
</target>
|
|
From: Christian R. <lq...@us...> - 2003-03-07 05:21:19
|
User: lqd
Date: 03/03/06 21:21:17
Modified: . Tag: Branch_3_2 build.xml
Log:
- backport testcase for SF Bug #629145 and #650929 to Branch_3_2
Revision Changes Path
No revision
No revision
1.165.2.44 +15 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.43
retrieving revision 1.165.2.44
diff -u -r1.165.2.43 -r1.165.2.44
--- build.xml 28 Feb 2003 04:10:40 -0000 1.165.2.43
+++ build.xml 7 Mar 2003 05:21:06 -0000 1.165.2.44
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.43 2003/02/28 04:10:40 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.44 2003/03/07 05:21:06 lqd Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2680,6 +2680,19 @@
</fileset>
</jar>
+ <!-- build websubdir/relative.jar -->
+ <mkdir dir="${build.lib}/websubdir"/>
+ <jar jarfile="${build.lib}/websubdir/relative.jar">
+ <fileset dir="${build.resources}/web/websubdir">
+ <include name="**/*.xml"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/web/ejb/StatelessSessionBean.class"/>
+ <include name="org/jboss/test/web/interfaces/StatelessSession*.class"/>
+ </fileset>
+ </jar>
+
+
<!-- build root-web.war -->
<war warfile="${build.lib}/root-web.war"
webxml="${build.resources}/web/WEB-INF/root-web.xml">
@@ -2764,6 +2777,7 @@
<include name="wars/notjbosstest-web.war"/>
<include name="cts.jar"/>
<include name="lib/util.jar"/>
+ <include name="websubdir/relative.jar"/>
</fileset>
</ear>
|
|
From: Jeremy B. <jb...@us...> - 2003-03-09 00:23:11
|
User: jboynes
Date: 03/03/08 16:23:10
Modified: . build.xml
Log:
Move generic persistence code to new module
Revision Changes Path
1.223 +2 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- build.xml 2 Mar 2003 17:51:57 -0000 1.222
+++ build.xml 9 Mar 2003 00:23:10 -0000 1.223
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.222 2003/03/02 17:51:57 loubyansky Exp $ -->
+<!-- $Id: build.xml,v 1.223 2003/03/09 00:23:10 jboynes Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -102,6 +102,7 @@
<pathelement path="${jboss.naming.lib}/jnpserver.jar"/>
<pathelement path="${jboss.server.lib}/jboss-client.jar"/>
<pathelement path="${jboss.server.lib}/jmx-rmi-connector-client.jar"/>
+ <pathelement path="${jboss.persistence.lib}/testsuite-support.jar"/>
<pathelement path="${jboss.server.lib}/testsuite-support.jar"/>
<pathelement path="${jboss.messaging.lib}/jbossmq-client.jar"/>
<pathelement path="${jboss.security.lib}/jbosssx-client.jar"/>
|
|
From: Christian R. <lq...@us...> - 2003-03-12 10:42:24
|
User: lqd
Date: 03/03/12 02:42:23
Modified: . Tag: Branch_3_0 build.xml
Log:
- i- backport testcase for SF Bug #629145 and #650929 to Branch_3_0
Revision Changes Path
No revision
No revision
1.106.2.66 +14 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.65
retrieving revision 1.106.2.66
diff -u -r1.106.2.65 -r1.106.2.66
--- build.xml 5 Mar 2003 09:17:54 -0000 1.106.2.65
+++ build.xml 12 Mar 2003 10:42:22 -0000 1.106.2.66
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.65 2003/03/05 09:17:54 pra Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.66 2003/03/12 10:42:22 lqd Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -2314,6 +2314,18 @@
</fileset>
</jar>
+ <!-- build websubdir/relative.jar -->
+ <mkdir dir="${build.lib}/websubdir"/>
+ <jar jarfile="${build.lib}/websubdir/relative.jar">
+ <fileset dir="${build.resources}/web/websubdir">
+ <include name="**/*.xml"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/web/ejb/StatelessSessionBean.class"/>
+ <include name="org/jboss/test/web/interfaces/StatelessSession*.class"/>
+ </fileset>
+ </jar>
+
<!-- build root-web.war -->
<war warfile="${build.lib}/root-web.war"
webxml="${build.resources}/web/WEB-INF/root-web.xml">
@@ -2397,6 +2409,7 @@
<include name="jbosstest-web.war"/>
<include name="wars/notjbosstest-web.war"/>
<include name="cts.jar"/>
+ <include name="websubdir/relative.jar"/>
</fileset>
</ear>
|
|
From: David J. <d_j...@us...> - 2003-03-13 19:20:47
|
User: d_jencks
Date: 03/03/13 11:20:46
Modified: . build.xml
Log:
jca 1.5 deployment implementation
Revision Changes Path
1.224 +36 -5 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- build.xml 9 Mar 2003 00:23:10 -0000 1.223
+++ build.xml 13 Mar 2003 19:20:45 -0000 1.224
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.223 2003/03/09 00:23:10 jboynes Exp $ -->
+<!-- $Id: build.xml,v 1.224 2003/03/13 19:20:45 d_jencks Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -712,8 +712,10 @@
excludedtags="@version,@author">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/xmbean/*.java"/>
+ <include name="org/jboss/test/jca/adapter15/*.java"/>
</fileset>
<jbossxmbean/>
+ <jbossXmlServiceTemplate servicefile="testjca15deployment"/>
</jmxdoclet>
</target>
@@ -1462,8 +1464,36 @@
<fileset dir="${build.resources}/jca/adapter">
<include name="testadapter-ds.xml"/>
</fileset>
+ <fileset dir="${build.resources}/jca/adapter15">
+ <include name="testadapter15-ds.xml"/>
+ </fileset>
+ </copy>
+
+ <!--test adapter jca 15-->
+ <jar jarfile="${build.lib}/jbosstestadapter15.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jca/adapter15/**"/>
+ <include name="org/jboss/test/jca/adapter/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/xmbean">
+ <include name="org/jboss/test/jca/adapter15/**.xml"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/jbosstestadapter15.rar">
+ <fileset dir="${build.lib}">
+ <include name="jbosstestadapter15.jar"/>
+ </fileset>
+ <fileset dir="${build.resources}/jca/adapter15">
+ <include name="META-INF/ra.xml"/>
+ </fileset>
+ </jar>
+
+ <copy todir="${build.lib}" filtering="no">
+ <fileset dir="${build.resources}/jmx/xmbean">
+ <include name="testjca15deployment-service.xml"/>
+ </fileset>
</copy>
-
<!-- build jcatest.jar -->
<jar jarfile="${build.lib}/jcatest.jar">
@@ -1494,9 +1524,9 @@
<jar jarfile="${build.lib}/jca15testmdb.jar">
- <!--fileset dir="${build.classes}">
- <include name="org/jboss/test/jca/inflow/**"/>
- </fileset-->
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jca/inflow/EndpointMDB.class"/>
+ </fileset>
<fileset dir="${build.resources}/jca/inflow">
<include name="**/ejb-jar.xml"/>
<include name="**/jboss.xml"/>
@@ -1510,6 +1540,7 @@
</fileset>
<fileset dir="${build.classes}">
<include name="org/jboss/test/jca/inflow/**"/>
+ <exclude name="org/jboss/test/jca/inflow/EndpointMDB.class"/>
</fileset>
<fileset dir="${build.resources}/jca/inflow">
<include name="**/jboss-service.xml"/>
|
|
From: Bill B. <pat...@us...> - 2003-03-17 01:32:11
|
User: patriot1burke
Date: 03/03/16 17:32:08
Modified: . build.xml
Log:
new aop tests
Revision Changes Path
1.225 +7 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- build.xml 13 Mar 2003 19:20:45 -0000 1.224
+++ build.xml 17 Mar 2003 01:32:08 -0000 1.225
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.224 2003/03/13 19:20:45 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.225 2003/03/17 01:32:08 patriot1burke Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -97,6 +97,7 @@
<path refid="jboss.j2ee.classpath"/>
<path refid="jboss.common.classpath"/>
<path refid="jboss.blocks.classpath"/>
+ <path refid="jboss.remoting.classpath"/>
<pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
<pathelement path="${jboss.system.lib}/testsuite-support.jar"/>
<pathelement path="${jboss.naming.lib}/jnpserver.jar"/>
@@ -2270,6 +2271,8 @@
<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/TxTester.class"/>
<include name="org/jboss/test/aop/bean/TxTesterMBean.class"/>
<include name="org/jboss/test/aop/bean/BeforeInterceptor.class"/>
@@ -4379,7 +4382,7 @@
| name in -Dtest=dirname in tests/dirname/test/**TestCase.class
-->
- <target name="test" depends="maybejars" if="test"
+ <target name="test" depends="init" if="maybejars"
description="Execute a single test.">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.log}"/>
@@ -4394,6 +4397,8 @@
jvm="${junit.jvm}">
<jvmarg value="${junit.jvm.options}"/>
+ <jvmarg value="-Djava.security.manager"/>
+ <jvmarg value="-Djava.security.policy==${build.resources}/${test}/client.policy"/>
<sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
<sysproperty key="build.log" value="${build.log}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
|
|
From: Bill B. <pat...@us...> - 2003-03-17 02:20:16
|
User: patriot1burke
Date: 03/03/16 18:20:11
Modified: . build.xml
Log:
fixed aop tests
Revision Changes Path
1.226 +4 -2 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- build.xml 17 Mar 2003 01:32:08 -0000 1.225
+++ build.xml 17 Mar 2003 02:20:11 -0000 1.226
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.225 2003/03/17 01:32:08 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.226 2003/03/17 02:20:11 patriot1burke Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -2253,6 +2253,7 @@
<jar jarfile="${build.lib}/aoptest.aop"
manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/bean/NonadvisedPOJO.class"/>
<include name="org/jboss/test/aop/bean/POJO*.class"/>
<include name="org/jboss/test/aop/bean/TxPOJO.class"/>
<include name="org/jboss/test/aop/bean/SimpleInterceptor.class"/>
@@ -4382,8 +4383,9 @@
| name in -Dtest=dirname in tests/dirname/test/**TestCase.class
-->
- <target name="test" depends="init" if="maybejars"
+ <target name="test" depends="init"
description="Execute a single test.">
+ <echo message="executing ${test}"/>
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.log}"/>
<!-- Remove the test.log so each run has a fresh log -->
|
|
From: Alexey L. <lou...@us...> - 2003-03-17 13:07:05
|
User: loubyansky
Date: 03/03/17 05:07:03
Modified: . Tag: Branch_3_2 build.xml
Log:
added foreign key mapping tests.
Revision Changes Path
No revision
No revision
1.165.2.45 +35 -9 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.44
retrieving revision 1.165.2.45
diff -u -r1.165.2.44 -r1.165.2.45
--- build.xml 7 Mar 2003 05:21:06 -0000 1.165.2.44
+++ build.xml 17 Mar 2003 13:06:59 -0000 1.165.2.45
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.44 2003/03/07 05:21:06 lqd Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.45 2003/03/17 13:06:59 loubyansky Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -581,14 +581,26 @@
<localinterface/>
<homeinterface/>
<localhomeinterface/>
- <!-- <deploymentdescriptor xmlencoding ="UTF-8"
- destdir="${build.resources}/cmp2/optimisticlock/META-INF"/> -->
- <!-- <jboss xmlencoding="UTF-8"
- version="3.0"
- destdir="${build.resources}/cmp2/optimisticlock/META-INF"
- mergedir="${source.resources}/cmp2/optimisticlock/"
- Datasource="java:/DefaultDS"
- Typemapping="Hypersonic SQL"/> -->
+ </xdoclet>
+
+ <!-- foreign key mapping tests -->
+ <mkdir dir="${build.resources}/cmp2/fkmapping/META-INF"/>
+ <xdoclet destdir="${build.gen-src}"
+ classpath="${xdoclet.task.classpath}"
+ ejbspec="2.0"
+ excludedtags="@version,@author"
+ mergedir="${source.resources}/cmp2/fkmapping">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/cmp2/fkmapping/ejb/*Bean.java"/>
+ </fileset>
+ <remoteinterface/>
+ <localinterface/>
+ <homeinterface/>
+ <localhomeinterface/>
+ <entitypk/>
+ <utilobject cacheHomes="true" includeGUID="false"/>
+ <entitycmp/>
+ <session/>
</xdoclet>
<!--undeploy of broken packages-->
@@ -3166,6 +3178,20 @@
<include name="org/jboss/test/cmp2/optimisticlock/**"/>
</fileset>
<fileset dir="${build.resources}/cmp2/optimisticlock">
+ <include name="**/*.*"/>
+ </fileset>
+ <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
+ includes="net/**/*.*"/>
+ <zipfileset src="${junit.junit.lib}/junit.jar"
+ includes="junit/**/*.*"/>
+ </jar>
+
+ <!-- build cmp2-fkmapping.jar -->
+ <jar jarfile="${build.lib}/cmp2-fkmapping.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/cmp2/fkmapping/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/cmp2/fkmapping">
<include name="**/*.*"/>
</fileset>
<zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
|
|
From: Bill B. <pat...@us...> - 2003-03-18 16:28:55
|
User: patriot1burke
Date: 03/03/18 08:28:46
Modified: . build.xml
Log:
cluster AOP remoting test
Revision Changes Path
1.227 +2 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- build.xml 17 Mar 2003 02:20:11 -0000 1.226
+++ build.xml 18 Mar 2003 16:28:45 -0000 1.227
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.226 2003/03/17 02:20:11 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.227 2003/03/18 16:28:45 patriot1burke Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -98,6 +98,7 @@
<path refid="jboss.common.classpath"/>
<path refid="jboss.blocks.classpath"/>
<path refid="jboss.remoting.classpath"/>
+ <path refid="jboss.cluster.classpath"/>
<pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
<pathelement path="${jboss.system.lib}/testsuite-support.jar"/>
<pathelement path="${jboss.naming.lib}/jnpserver.jar"/>
|
|
From: Scott M S. <st...@us...> - 2003-03-19 17:26:47
|
User: starksm
Date: 03/03/19 09:26:46
Modified: . Tag: Branch_3_2 build.xml
Log:
Add the class loading scoping test elements
Revision Changes Path
No revision
No revision
1.165.2.46 +84 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.45
retrieving revision 1.165.2.46
diff -u -r1.165.2.45 -r1.165.2.46
--- build.xml 17 Mar 2003 13:06:59 -0000 1.165.2.45
+++ build.xml 19 Mar 2003 17:26:45 -0000 1.165.2.46
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.45 2003/03/17 13:06:59 loubyansky Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.46 2003/03/19 17:26:45 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -436,10 +436,15 @@
<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" />
<copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java"
file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt"
overwrite="true" />
+ <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="true" />
</target>
@@ -3424,6 +3429,84 @@
<include name="loadingresource.sar" />
</fileset>
</ear>
+
+ <!-- Build version 1 of the singleton.jar -->
+ <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="true" />
+ <copy todir="${build.classes}/org/jboss/test/classloader/scoping/singleton"
+ overwrite="true">
+ <fileset dir="${source.java}/org/jboss/test/classloader/scoping/singleton">
+ <include name="jboss-service.xml" />
+ </fileset>
+ <filterset>
+ <filter token="VERSION" value="V1"/>
+ </filterset>
+ </copy>
+
+ <javac destdir="${build.classes}" optimize="${javac.optimize}"
+ target="${javac.target}" debug="${javac.debug}" >
+ <src path="${build.gen-src}"/>
+ <src path="${source.java}"/>
+ <classpath refid="tests.classpath"/>
+ <include name="org/jboss/test/classloader/scoping/singleton/**" />
+ </javac>
+ <jar jarfile="${build.lib}/singleton1.sar">
+ <metainf dir="${build.classes}/org/jboss/test/classloader/scoping/singleton">
+ <include name="jboss-service.xml" />
+ </metainf>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/classloader/scoping/singleton/*"/>
+ <exclude name="org/jboss/test/classloader/scoping/singleton/*.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- Build version 2 of the singleton.jar -->
+ <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
+ file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V2.txt"
+ overwrite="true" />
+ <copy todir="${build.classes}/org/jboss/test/classloader/scoping/singleton"
+ overwrite="true">
+ <fileset dir="${source.java}/org/jboss/test/classloader/scoping/singleton">
+ <include name="jboss-service.xml" />
+ </fileset>
+ <filterset>
+ <filter token="VERSION" value="V2"/>
+ </filterset>
+ </copy>
+
+ <javac destdir="${build.classes}" optimize="${javac.optimize}"
+ target="${javac.target}" debug="${javac.debug}" >
+ <src path="${build.gen-src}"/>
+ <src path="${source.java}"/>
+ <classpath refid="tests.classpath"/>
+ <include name="org/jboss/test/classloader/scoping/singleton/**" />
+ </javac>
+ <jar jarfile="${build.lib}/singleton2.sar">
+ <metainf dir="${build.classes}/org/jboss/test/classloader/scoping/singleton">
+ <include name="jboss-service.xml" />
+ </metainf>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/classloader/scoping/singleton/*"/>
+ <exclude name="org/jboss/test/classloader/scoping/singleton/*.xml"/>
+ </fileset>
+ </jar>
+
+ <war warfile="${build.lib}/log4j113.war"
+ webxml="${build.resources}/classloader/scoping/override/log4j113/WEB-INF/web.xml">
+ <webinf dir="${build.resources}/classloader/scoping/override/log4j113/WEB-INF">
+ <include name="jboss-web.xml" />
+ </webinf>
+ <lib dir="${build.resources}/classloader/scoping/override/log4j113">
+ <include name="*.jar"/>
+ </lib>
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/classloader/scoping/override/web/log4j113/*"/>
+ </classes>
+ <classes dir="${build.resources}/classloader/scoping/override/log4j113">
+ <include name="log4j.properties"/>
+ </classes>
+ </war>
</target>
<!-- entity test -->
|
|
From: Stephen C. <sc...@us...> - 2003-03-21 13:41:56
|
User: scoy
Date: 03/03/21 05:41:53
Modified: . Tag: Branch_3_2 build.xml
Log:
XDoclet 1.2 update.
Standardized task names to ejbdoclet and jmxdoclet where appropriate.
Adjusted xdoclet classpath to suit.
Revision Changes Path
No revision
No revision
1.165.2.47 +51 -61 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.46
retrieving revision 1.165.2.47
diff -u -r1.165.2.46 -r1.165.2.47
--- build.xml 19 Mar 2003 17:26:45 -0000 1.165.2.46
+++ build.xml 21 Mar 2003 13:41:52 -0000 1.165.2.47
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.46 2003/03/19 17:26:45 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.47 2003/03/21 13:41:52 scoy Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -116,6 +116,14 @@
<pathelement path="${apache.crimson.lib}/crimson.jar"/>
</path>
+ <!-- Apache Commons -->
+ <property name="apache.commons.root" value="${project.thirdparty}/apache/commons"/>
+ <property name="apache.commons.lib" value="${apache.commons.root}/lib"/>
+ <path id="apache.commons.classpath">
+ <pathelement path="${apache.commons.lib}/commons-collections.jar"/>
+ <pathelement path="${apache.commons.lib}/commons-logging.jar"/>
+ </path>
+
<!-- Log4j -->
<property name="apache.log4j.root" value="${project.thirdparty}/apache/log4j"/>
<property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
@@ -181,6 +189,7 @@
<path refid="sun.javamail.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="apache.crimson.classpath"/>
+ <path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
@@ -466,14 +475,14 @@
<!-- Compile EJB beans with XDoclet -->
<target name="compile-bean-sources" depends="init" unless="noxdoclet">
- <taskdef name="xdoclet" classname="xdoclet.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
+
+ <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
<mkdir dir="${build.gen-src}"/>
<!--ejbconf-->
<mkdir dir="${build.resources}/ejb-conf/readonly/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/ejb-conf/readonly">
@@ -495,12 +504,11 @@
Datasource="java:/DefaultDS"
Typemapping="Hypersonic SQL"
/>
- </xdoclet>
+ </ejbdoclet>
<!--eardeployment, SessionA-->
<mkdir dir="${build.resources}/jmx/eardeployment/a/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/eardeployment/a">
@@ -519,12 +527,11 @@
version="3.0"
destdir="${build.resources}/jmx/eardeployment/a/META-INF"
mergedir="${source.resources}/jmx/eardeployment/a/"/>
- </xdoclet>
+ </ejbdoclet>
<!--eardeployment, SessionB-->
<mkdir dir="${build.resources}/jmx/eardeployment/b/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/eardeployment/b">
@@ -543,12 +550,11 @@
version="3.0"
destdir="${build.resources}/jmx/eardeployment/b/META-INF"
mergedir="${source.resources}/jmx/eardeployment/b/"/>
- </xdoclet>
+ </ejbdoclet>
<!-- cmr written after post create -->
<mkdir dir="${build.resources}/cmp2/cmr/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/cmp2/cmr">
@@ -569,12 +575,11 @@
mergedir="${source.resources}/cmp2/cmr/"
Datasource="java:/DefaultDS"
Typemapping="Hypersonic SQL"/>
- </xdoclet>
+ </ejbdoclet>
<!-- optimistic lock test -->
<mkdir dir="${build.resources}/cmp2/optimisticlock/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/cmp2/optimisticlock">
@@ -586,12 +591,11 @@
<localinterface/>
<homeinterface/>
<localhomeinterface/>
- </xdoclet>
+ </ejbdoclet>
<!-- foreign key mapping tests -->
<mkdir dir="${build.resources}/cmp2/fkmapping/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/cmp2/fkmapping">
@@ -606,12 +610,11 @@
<utilobject cacheHomes="true" includeGUID="false"/>
<entitycmp/>
<session/>
- </xdoclet>
+ </ejbdoclet>
<!--undeploy of broken packages-->
<mkdir dir="${build.resources}/jmx/undeploy/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jmx/ejb"-->
@@ -633,12 +636,11 @@
Datasource="java:/DefaultDS"
Typemapping="Hypersonic SQL"
/>
- </xdoclet>
+ </ejbdoclet>
<!--jca framework tests-->
<mkdir dir="${build.resources}/jca/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -657,11 +659,10 @@
version="3.0"
destdir="${build.resources}/jca/META-INF"
mergedir="${source.resources}/jca/"/>
- </xdoclet>
+ </ejbdoclet>
<mkdir dir="${build.resources}/jca/bank/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -680,11 +681,10 @@
version="3.0"
destdir="${build.resources}/jca/bank/META-INF"
mergedir="${source.resources}/jca/bank/"/>
- </xdoclet>
+ </ejbdoclet>
<mkdir dir="${build.resources}/banknew/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -707,12 +707,11 @@
version="3.0"
destdir="${build.resources}/banknew/META-INF"
mergedir="${source.resources}/banknew/"/>
- </xdoclet>
+ </ejbdoclet>
<!-- Foe-Deployer: Simple Test -->
<mkdir dir="${build.resources}/foedeployer/simple/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -733,12 +732,11 @@
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
<!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
- </xdoclet>
+ </ejbdoclet>
<!-- Foe-Deployer: Message Test -->
<mkdir dir="${build.resources}/foedeployer/message/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -755,12 +753,11 @@
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
<!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
- </xdoclet>
+ </ejbdoclet>
<!-- Foe-Deployer: O2MB Test -->
<mkdir dir="${build.resources}/foedeployer/o2mb/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -781,12 +778,11 @@
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
<!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
- </xdoclet>
+ </ejbdoclet>
<!-- Foe-Deployer: M2MB Test -->
<mkdir dir="${build.resources}/foedeployer/m2mb/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -807,12 +803,11 @@
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
<!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
- </xdoclet>
+ </ejbdoclet>
<!-- Foe-Deployer: QL Test -->
<mkdir dir="${build.resources}/foedeployer/ql/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -833,12 +828,11 @@
datasource="java:/DefaultDS"
mergedir="${source.resources}/foedeployer/"/>
<!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
- </xdoclet>
+ </ejbdoclet>
<!-- cpmanifest test -->
<mkdir dir="${build.resources}/jmx/loading/cpmanifest/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<fileset dir="${source.java}">
@@ -850,12 +844,11 @@
<!--session/-->
<deploymentdescriptor xmlencoding ="UTF-8"
destdir="${build.resources}/jmx/loading/cpmanifest/META-INF"/>
- </xdoclet>
+ </ejbdoclet>
<!-- entity test -->
<mkdir dir="${build.resources}/entity/entity/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/entity/entity">
@@ -877,16 +870,15 @@
datasource="java:/DefaultDS"
typemapping="Hypersonic SQL"
destdir="${build.resources}/entity/entity/META-INF"/>
- </xdoclet>
+ </ejbdoclet>
</target>
<target name="compile-mbean-sources" depends="init" unless="noxdoclet">
- <taskdef name="jmxdoclet" classname="xdoclet.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
+ <taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
<echo message="xdoclet.mergedir: ${xdoclet.mergedir}"/>
<mkdir dir="${build.gen-src}"/>
<jmxdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
force="true"
excludedtags="@version,@author">
<fileset dir="${source.java}">
@@ -901,11 +893,10 @@
</target>
<target name="compile-xmbean-dds" depends="init" unless="noxdoclet">
- <taskdef name="jmxdoclet" classname="xdoclet.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
+ <taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
<echo message="xdoclet.mergedir: ${xdoclet.mergedir}"/>
<mkdir dir="${build.resources}/jmx/xmbean/META-INF"/>
<jmxdoclet destdir="${build.resources}/jmx/xmbean/META-INF"
- classpath="${xdoclet.task.classpath}"
force="true"
excludedtags="@version,@author">
<fileset dir="${source.java}">
@@ -917,13 +908,12 @@
</target>
<target name="compile-proxycompiler-bean-sources" depends="init" unless="noxdoclet">
- <taskdef name="xdoclet" classname="xdoclet.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
+ <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
<mkdir dir="${build.gen-src}"/>
<mkdir dir="${build.resources}/proxycompiler/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/proxycompiler">
@@ -942,7 +932,7 @@
version="3.0"
destdir="${build.resources}/proxycompiler/META-INF"
mergedir="${source.resources}/proxycompiler"/>
- </xdoclet>
+ </ejbdoclet>
</target>
|
|
From: Scott M S. <st...@us...> - 2003-03-21 21:28:12
|
User: starksm
Date: 03/03/21 13:28:11
Modified: . Tag: Branch_3_2 build.xml
Log:
Add the log4j113-ejb.jar target
Revision Changes Path
No revision
No revision
1.165.2.48 +14 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.47
retrieving revision 1.165.2.48
diff -u -r1.165.2.47 -r1.165.2.48
--- build.xml 21 Mar 2003 13:41:52 -0000 1.165.2.47
+++ build.xml 21 Mar 2003 21:28:11 -0000 1.165.2.48
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.47 2003/03/21 13:41:52 scoy Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.48 2003/03/21 21:28:11 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3479,6 +3479,19 @@
<fileset dir="${build.classes}">
<include name="org/jboss/test/classloader/scoping/singleton/*"/>
<exclude name="org/jboss/test/classloader/scoping/singleton/*.xml"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/log4j113-ejb.jar">
+ <metainf dir="${build.resources}/classloader/scoping/override/log4j113/META-INF">
+ <include name="ejb-jar.xml" />
+ <include name="jboss.xml" />
+ </metainf>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/classloader/scoping/override/ejb/log4j113/*"/>
+ </fileset>
+ <fileset dir="${build.resources}/classloader/scoping/override/log4j113">
+ <include name="*.jar"/>
</fileset>
</jar>
|
|
From: Stephen C. <sc...@us...> - 2003-03-22 03:11:59
|
User: scoy
Date: 03/03/21 19:11:58
Modified: . Tag: Branch_3_0 build.xml
Log:
XDoclet 1.2 update.
Standardized task names to ejbdoclet and jmxdoclet where appropriate.
Adjusted xdoclet classpath to suit.
Revision Changes Path
No revision
No revision
1.106.2.67 +50 -47 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.66
retrieving revision 1.106.2.67
diff -u -r1.106.2.66 -r1.106.2.67
--- build.xml 12 Mar 2003 10:42:22 -0000 1.106.2.66
+++ build.xml 22 Mar 2003 03:11:58 -0000 1.106.2.67
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.66 2003/03/12 10:42:22 lqd Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.67 2003/03/22 03:11:58 scoy Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -121,6 +121,14 @@
<pathelement path="${sun.servlet.lib}/servlet.jar"/>
</path>
+ <!-- Apache Commons -->
+ <property name="apache.commons.root" value="${project.thirdparty}/apache/commons"/>
+ <property name="apache.commons.lib" value="${apache.commons.root}/lib"/>
+ <path id="apache.commons.classpath">
+ <pathelement path="${apache.commons.lib}/commons-collections.jar"/>
+ <pathelement path="${apache.commons.lib}/commons-logging.jar"/>
+ </path>
+
<!-- Log4j -->
<property name="apache.log4j.root" value="${project.thirdparty}/apache/log4j"/>
<property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
@@ -188,6 +196,7 @@
<path refid="sun.javamail.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="apache.log4j.classpath"/>
+ <path refid="apache.commons.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
<path refid="junit.junit.classpath"/>
@@ -416,9 +425,9 @@
<!-- xdoclet -->
<path id="xdoclet.task.classpath">
<path refid="tests.classpath"/>
- <pathelement location="${project.tools}/lib/xdoclet.jar"/>
- <pathelement location="${project.tools}/lib/xjavadoc.jar"/>
- <pathelement location="${project.tools}/lib/ant.jar"/>
+ <fileset dir="${project.thirdparty}/xdoclet/xdoclet/lib">
+ <include name="**/*.jar"/>
+ </fileset>
</path>
<property name="xdoclet.task.classpath"
refid="xdoclet.task.classpath"/>
@@ -449,17 +458,18 @@
<!-- Compile EJB beans with XDoclet -->
<target name="compile-bean-sources" depends="init" unless="noxdoclet">
- <taskdef name="xdoclet" classname="xdoclet.ejb.EjbDocletTask"/>
+ <taskdef name="ejbdoclet"
+ classname="xdoclet.modules.ejb.EjbDocletTask"
+ classpathref="xdoclet.task.classpath"/>
<mkdir dir="${build.gen-src}"/>
<!--ejbconf-->
<mkdir dir="${build.resources}/ejb-conf/readonly/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
- mergedir="${source.resources}/ejb-conf/readonly">
+ mergedir="${source.resources}/ejb-conf/readonly">
<fileset dir="${source.java}">
<include name="org/jboss/test/ejbconf/beans/**/*Bean.java"/>
</fileset>
@@ -478,15 +488,14 @@
Datasource="java:/DefaultDS"
Typemapping="Hypersonic SQL"
/>
- </xdoclet>
+ </ejbdoclet>
<!--eardeployment, SessionA-->
<mkdir dir="${build.resources}/jmx/eardeployment/a/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
- mergedir="${source.resources}/eardeployment/a">
+ mergedir="${source.resources}/eardeployment/a">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/eardeployment/a/ejb/SessionABean.java"/>
</fileset>
@@ -502,15 +511,14 @@
version="3.0"
destdir="${build.resources}/jmx/eardeployment/a/META-INF"
mergedir="${source.resources}/jmx/eardeployment/a/"/>
- </xdoclet>
+ </ejbdoclet>
<!--eardeployment, SessionB-->
<mkdir dir="${build.resources}/jmx/eardeployment/b/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
- mergedir="${source.resources}/eardeployment/b">
+ mergedir="${source.resources}/eardeployment/b">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/eardeployment/b/ejb/*Bean.java"/>
</fileset>
@@ -526,15 +534,14 @@
version="3.0"
destdir="${build.resources}/jmx/eardeployment/b/META-INF"
mergedir="${source.resources}/jmx/eardeployment/b/"/>
- </xdoclet>
+ </ejbdoclet>
<!-- cmr written after post create -->
<mkdir dir="${build.resources}/cmp2/cmr/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
- mergedir="${source.resources}/cmp2/cmr">
+ mergedir="${source.resources}/cmp2/cmr">
<fileset dir="${source.java}">
<include name="org/jboss/test/cmp2/cmr/ejb/*Bean.java"/>
</fileset>
@@ -552,13 +559,12 @@
mergedir="${source.resources}/cmp2/cmr/"
Datasource="java:/DefaultDS"
Typemapping="Hypersonic SQL"/>
- </xdoclet>
+ </ejbdoclet>
<!--undeploy of broken packages-->
<mkdir dir="${build.resources}/jmx/undeploy/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jmx/ejb"-->
@@ -579,12 +585,11 @@
mergedir="${source.resources}/jmx/undeploy/"
Datasource="java:/DefaultDS"
Typemapping="Hypersonic SQL"/>
- </xdoclet>
+ </ejbdoclet>
<!--jca framework tests-->
<mkdir dir="${build.resources}/jca/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -603,11 +608,10 @@
version="3.0"
destdir="${build.resources}/jca/META-INF"
mergedir="${source.resources}/jca/"/>
- </xdoclet>
+ </ejbdoclet>
<mkdir dir="${build.resources}/jca/bank/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<!--mergedir="${source.resources}/jca/ejb"-->
@@ -624,14 +628,13 @@
destdir="${build.resources}/jca/bank/META-INF"/>
<jboss xmlencoding="UTF-8"
version="3.0"
- destdir="${build.resources}/jca/bank/META-INF"
+ destdir="${build.resources}/jca/bank/META-INF"
mergedir="${source.resources}/jca/bank/"/>
- </xdoclet>
+ </ejbdoclet>
<!-- cpmanifest test -->
<mkdir dir="${build.resources}/jmx/loading/cpmanifest/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author">
<fileset dir="${source.java}">
@@ -643,12 +646,11 @@
<!--session/-->
<deploymentdescriptor xmlencoding ="UTF-8"
destdir="${build.resources}/jmx/loading/cpmanifest/META-INF"/>
- </xdoclet>
+ </ejbdoclet>
<!-- entity test -->
<mkdir dir="${build.resources}/entity/entity/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
mergedir="${source.resources}/entity/entity">
@@ -670,18 +672,18 @@
datasource="java:/DefaultDS"
typemapping="Hypersonic SQL"
destdir="${build.resources}/entity/entity/META-INF"/>
- </xdoclet>
+ </ejbdoclet>
</target>
<target name="compile-mbean-sources" depends="init" unless="noxdoclet">
- <taskdef name="jmxdoclet" classname="xdoclet.jmx.JMXDocletTask"/>
-<echo message="xdoclet.mergedir: ${xdoclet.mergedir}"/>
+ <taskdef name="jmxdoclet"
+ classname="xdoclet.modules.jmx.JMXDocletTask"
+ classpathref="xdoclet.task.classpath"/>
<mkdir dir="${build.gen-src}"/>
<jmxdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
force="true"
- excludedtags="@version,@author">
+ excludedtags="@version,@author">
<fileset dir="${source.java}">
<include name="org/jboss/test/jmx/deployer/*.java"/>
<include name="org/jboss/test/jmx/mbean/*.java"/>
@@ -694,16 +696,17 @@
</target>
<target name="compile-proxycompiler-bean-sources" depends="init" unless="noxdoclet">
- <taskdef name="xdoclet" classname="xdoclet.ejb.EjbDocletTask"/>
+ <taskdef name="ejbdoclet"
+ classname="xdoclet.modules.ejb.EjbDocletTask"
+ classpathref="xdoclet.task.classpath"/>
<mkdir dir="${build.gen-src}"/>
<mkdir dir="${build.resources}/proxycompiler/META-INF"/>
- <xdoclet destdir="${build.gen-src}"
- classpath="${xdoclet.task.classpath}"
+ <ejbdoclet destdir="${build.gen-src}"
ejbspec="2.0"
excludedtags="@version,@author"
- mergedir="${source.resources}/proxycompiler">
+ mergedir="${source.resources}/proxycompiler">
<fileset dir="${source.java}">
<include name="org/jboss/test/proxycompiler/beans/**/*Bean.java"/>
</fileset>
@@ -717,9 +720,9 @@
destdir="${build.resources}/proxycompiler/META-INF"/>
<jboss xmlencoding="UTF-8"
version="3.0"
- destdir="${build.resources}/proxycompiler/META-INF"
+ destdir="${build.resources}/proxycompiler/META-INF"
mergedir="${source.resources}/proxycompiler"/>
- </xdoclet>
+ </ejbdoclet>
</target>
|
|
From: Igor F. <ig...@us...> - 2003-03-26 16:58:04
|
User: igorfie
Date: 03/03/26 08:58:03
Modified: . build.xml
Log:
Added interception of calls to EJB implementation test case (does not seem to work at the moment)
Revision Changes Path
1.228 +27 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- build.xml 18 Mar 2003 16:28:45 -0000 1.227
+++ build.xml 26 Mar 2003 16:58:01 -0000 1.228
@@ -10,7 +10,7 @@
<!ENTITY mqstress SYSTEM "./mqstress.xml">
]>
-<!-- $Id: build.xml,v 1.227 2003/03/18 16:28:45 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.228 2003/03/26 16:58:01 igorfie Exp $ -->
<!--+======================================================================+-->
<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
@@ -683,6 +683,22 @@
destdir="${build.resources}/exception/META-INF"/>
</ejbdoclet>
+ <!-- aop test -->
+ <mkdir dir="${build.resources}/aop/simpleejb/META-INF"/>
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/simpleejb/SimpleBean.java"/>
+ </fileset>
+ <remoteinterface/>
+ <homeinterface/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/aop/simpleejb/META-INF"/>
+ <jboss xmlencoding="UTF-8"
+ version="${default.test.jboss-version}"
+ destdir="${build.resources}/aop/simpleejb/META-INF"/>
+ </ejbdoclet>
</target>
<target name="compile-mbean-sources" depends="init" unless="noxdoclet">
@@ -2251,6 +2267,14 @@
</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}/aoptest.aop"
manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
@@ -2259,6 +2283,8 @@
<include name="org/jboss/test/aop/bean/TxPOJO.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"/>
</fileset>
<fileset dir="${build.resources}/aop">
<include name="META-INF/jboss-aop.xml"/>
|
Thanks for helping keep SourceForge clean.
X