Menu
▾
▴
jboss-cvs-commits
|
From: Kabir K. <kk...@jb...> - 2006-04-25 11:36:05
|
User: kkhan
Date: 06/04/25 07:35:58
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
Add special test target for the scoped aop test
Revision Changes Path
No revision
No revision
1.406.2.174 +67 -39 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.173
retrieving revision 1.406.2.174
diff -u -b -r1.406.2.173 -r1.406.2.174
--- build.xml 25 Apr 2006 08:39:58 -0000 1.406.2.173
+++ build.xml 25 Apr 2006 11:35:58 -0000 1.406.2.174
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.173 2006/04/25 08:39:58 kkhan Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.174 2006/04/25 11:35:58 kkhan Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -735,6 +735,9 @@
<!-- Needs to be started either with the bootclasspath or -javaagent classloader hooks -->
<exclude name="org/jboss/test/aop/test/ScopedUnitTestCase.class"/>
</patternset>
+ <patternset id="aop-with-classloader.includes">
+ <include name="org/jboss/test/aop/test/ScopedUnitTestCase.class"/>
+ </patternset>
<!-- The union of the excludes -->
<patternset id="all.excludes">
@@ -785,6 +788,7 @@
<antcall target="tests-compatibility"/>
<antcall target="tests-webservice-ssl"/>
<antcall target="tests-unified"/>
+ <antcall target="tests-aop-scoped"/>
<antcall target="tests-report"/>
<record name="${basedir}/build.log" action="stop"/>
</target>
@@ -2504,6 +2508,30 @@
<server:stop name="webservice-ssl"/>
</target>
+
+ <target name="tests-aop-scoped"
+ description="AOP tests requiring a native classloader hook">
+
+ <!-- Generate the JDK 1.4 classloader hook -->
+ <java classname="org.jboss.aop.hook.GeneratePluggableInstrumentedClassLoader">
+ <classpath>
+ <path refid="javassist.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ </classpath>
+ <arg value="${jboss.dist}\bin\woven-classloader"/>
+ </java>
+ <!-- copy across the jdk 1.4 pluggable instrumentor -->
+ <copy todir="${jboss.dist}\bin" file="${jboss.aop.lib}/jdk14-pluggable-instrumentor.jar"/>
+ <server:start name="scoped-aop"/>
+
+ <run-junit junit.patternset="aop-with-classloader.includes"/>
+
+ <server:stop name="scoped-aop"/>
+ <delete dir="${jboss.dist}/bin/woven-classloader"/>
+ <delete file="${jboss.dist}/bin/jdk14-pluggable-instrumentor.jar"/>
+ </target>
+
+
<!--
| Standard jaxr tests that should run successfully against a
| JBoss server distribution build that contains jaxr.
|
|
From: Kabir K. <kk...@jb...> - 2006-04-25 12:23:54
|
User: kkhan Date: 06/04/25 08:23:49 Modified: jbosstest build.xml Log: Add special target for aop ScopedUntiTestCase requiring a special classloader hooks Revision Changes Path 1.560 +53 -3 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.559 retrieving revision 1.560 diff -u -b -r1.559 -r1.560 --- build.xml 23 Apr 2006 17:03:36 -0000 1.559 +++ build.xml 25 Apr 2006 12:23:49 -0000 1.560 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.559 2006/04/23 17:03:36 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.560 2006/04/25 12:23:49 kkhan Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -725,6 +725,9 @@ <!-- Needs to be started either with the bootclasspath or -javaagent classloader hooks --> <exclude name="org/jboss/test/aop/test/ScopedUnitTestCase.class"/> </patternset> + <patternset id="aop-with-classloader.includes"> + <include name="org/jboss/test/aop/test/ScopedUnitTestCase.class"/> + </patternset> <!-- The union of the excludes --> <patternset id="all.excludes"> @@ -775,6 +778,7 @@ <antcall target="tests-jacc-securitymgr"/> <antcall target="tests-compatibility"/> <antcall target="tests-webservice-ssl"/> + <antcall target="tests-aop-scoped"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> @@ -2871,6 +2875,52 @@ </target> + <!-- The scoped AOP tests need a classloader hook --> + <target name="tests-aop-scoped" + description="AOP tests requiring a native classloader hook" + depends="tests-aop-scoped-jdk14,tests-aop-scoped-jdk50"> + </target> + <target name="tests-aop-scoped-jdk14" + description="AOP tests requiring a native classloader hook for JDK 1.4" + unless="HAVE_JDK_1.5"> + + <!-- Generate the JDK 1.4 classloader hook --> + <java classname="org.jboss.aop.hook.GeneratePluggableInstrumentedClassLoader"> + <classpath> + <path refid="javassist.classpath"/> + <path refid="jboss.aop.classpath"/> + </classpath> + <arg value="${jboss.dist}\bin\woven-classloader"/> + </java> + <!-- copy across the jdk 1.4 pluggable instrumentor --> + <copy todir="${jboss.dist}\bin" file="${jboss.aop.lib}/jdk14-pluggable-instrumentor.jar"/> + <server:start name="scoped-aop-jdk14"/> + + <run-junit junit.patternset="aop-with-classloader.includes"/> + + <server:stop name="scoped-aop-jdk14"/> + + <delete dir="${jboss.dist}/bin/woven-classloader"/> + <delete file="${jboss.dist}/bin/jdk14-pluggable-instrumentor.jar"/> + </target> + <target name="tests-aop-scoped-jdk50" + description="AOP tests requiring a native classloader hook for JDK 5.0" + if="HAVE_JDK_1.5"> + + <!-- copy across the pluggable instrumentor --> + <copy todir="${jboss.dist}\bin" file="${jboss.aop.lib}/pluggable-instrumentor.jar"/> + <server:start name="scoped-aop-jdk50"/> + + <run-junit junit.patternset="aop-with-classloader.includes"/> + + <server:stop name="scoped-aop-jdk50"/> + + <delete file="${jboss.dist}/bin/jdk14-pluggable-instrumentor.jar"/> + </target> + + + + <!-- Test for JAXR under the Web Services Umbrella --> <target name="tests-jaxr"> <mkdir dir="${build.reports}"/> |
|
From: Kabir K. <kk...@jb...> - 2006-04-25 15:46:49
|
User: kkhan Date: 06/04/25 11:46:47 Modified: jbosstest build.xml Log: Use generated classloader when running with JDK 50 Revision Changes Path 1.561 +2 -2 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.560 retrieving revision 1.561 diff -u -b -r1.560 -r1.561 --- build.xml 25 Apr 2006 12:23:49 -0000 1.560 +++ build.xml 25 Apr 2006 15:46:47 -0000 1.561 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.560 2006/04/25 12:23:49 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.561 2006/04/25 15:46:47 kkhan Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -2915,7 +2915,7 @@ <server:stop name="scoped-aop-jdk50"/> - <delete file="${jboss.dist}/bin/jdk14-pluggable-instrumentor.jar"/> + <delete file="${jboss.dist}/bin/pluggable-instrumentor.jar"/> </target> |
|
From: Kabir K. <kk...@jb...> - 2006-04-26 14:39:39
|
User: kkhan
Date: 06/04/26 10:39:34
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
Replace the '\'s with '/'s to see if that fixes the scoped aop tests on linux
Revision Changes Path
No revision
No revision
1.406.2.175 +8 -4 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.174
retrieving revision 1.406.2.175
diff -u -b -r1.406.2.174 -r1.406.2.175
--- build.xml 25 Apr 2006 11:35:58 -0000 1.406.2.174
+++ build.xml 26 Apr 2006 14:39:34 -0000 1.406.2.175
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.174 2006/04/25 11:35:58 kkhan Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.175 2006/04/26 14:39:34 kkhan Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -2512,16 +2512,20 @@
<target name="tests-aop-scoped"
description="AOP tests requiring a native classloader hook">
- <!-- Generate the JDK 1.4 classloader hook -->
+ <!--
+ Generate the JDK 1.4 classloader hook (we use this both when running with JDK 1.4 and 5.0 since
+ the JDK 5.0 pluggable instrumentor depends on the jboss-aop-jdk50.deployer being deployed), and
+ the testsuite uses the config with the jboss-aop-jdk50.deployer.
+ -->
<java classname="org.jboss.aop.hook.GeneratePluggableInstrumentedClassLoader">
<classpath>
<path refid="javassist.classpath"/>
<path refid="jboss.aop.classpath"/>
</classpath>
- <arg value="${jboss.dist}\bin\woven-classloader"/>
+ <arg value="${jboss.dist}/bin/woven-classloader"/>
</java>
<!-- copy across the jdk 1.4 pluggable instrumentor -->
- <copy todir="${jboss.dist}\bin" file="${jboss.aop.lib}/jdk14-pluggable-instrumentor.jar"/>
+ <copy todir="${jboss.dist}/bin" file="${jboss.aop.lib}/jdk14-pluggable-instrumentor.jar"/>
<server:start name="scoped-aop"/>
<run-junit junit.patternset="aop-with-classloader.includes"/>
|
|
From: Kabir K. <kk...@jb...> - 2006-04-26 15:00:14
|
User: kkhan Date: 06/04/26 11:00:06 Modified: jbosstest build.xml Log: Replace \s with /s to get it running on linux Revision Changes Path 1.562 +4 -4 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.561 retrieving revision 1.562 diff -u -b -r1.561 -r1.562 --- build.xml 25 Apr 2006 15:46:47 -0000 1.561 +++ build.xml 26 Apr 2006 15:00:06 -0000 1.562 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.561 2006/04/25 15:46:47 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.562 2006/04/26 15:00:06 kkhan Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -2890,10 +2890,10 @@ <path refid="javassist.classpath"/> <path refid="jboss.aop.classpath"/> </classpath> - <arg value="${jboss.dist}\bin\woven-classloader"/> + <arg value="${jboss.dist}/bin/woven-classloader"/> </java> <!-- copy across the jdk 1.4 pluggable instrumentor --> - <copy todir="${jboss.dist}\bin" file="${jboss.aop.lib}/jdk14-pluggable-instrumentor.jar"/> + <copy todir="${jboss.dist}/bin" file="${jboss.aop.lib}/jdk14-pluggable-instrumentor.jar"/> <server:start name="scoped-aop-jdk14"/> <run-junit junit.patternset="aop-with-classloader.includes"/> @@ -2908,7 +2908,7 @@ if="HAVE_JDK_1.5"> <!-- copy across the pluggable instrumentor --> - <copy todir="${jboss.dist}\bin" file="${jboss.aop.lib}/pluggable-instrumentor.jar"/> + <copy todir="${jboss.dist}/bin" file="${jboss.aop.lib}/pluggable-instrumentor.jar"/> <server:start name="scoped-aop-jdk50"/> <run-junit junit.patternset="aop-with-classloader.includes"/> |
|
From: Thomas D. <tho...@jb...> - 2006-04-26 21:28:09
|
User: tdiesler
Date: 06/04/26 17:28:04
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
Set webservice.classpath depending on the client jar
Revision Changes Path
No revision
No revision
1.406.2.176 +8 -11 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.175
retrieving revision 1.406.2.176
diff -u -b -r1.406.2.175 -r1.406.2.176
--- build.xml 26 Apr 2006 14:39:34 -0000 1.406.2.175
+++ build.xml 26 Apr 2006 21:28:03 -0000 1.406.2.176
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.175 2006/04/26 14:39:34 kkhan Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.176 2006/04/26 21:28:03 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -213,24 +213,21 @@
<path refid="dependentmodule.classpath"/>
</path>
- <!-- Set classpath for the webservice stack depending on the marker file -->
+ <!-- Set webservice.classpath depending on the client jar -->
+ <property name="jboss.home" value="${module.root}/../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <available property="webservice.classpath" value="jboss-ws4ee.classpath" file="${jboss.home}/client/jboss-ws4ee-client.jar"/>
+ <available property="webservice.classpath" value="jbossws14.classpath" file="${jboss.home}/client/jbossws14-client.jar"/>
+ <available property="webservice.classpath" value="jbossws.classpath" file="${jboss.home}/client/jbossws-client.jar"/>
<path id="jboss-ws4ee.classpath">
- <pathelement path="${jboss.webservice.lib}/jboss-ws4ee.jar"/>
<pathelement path="${jboss.webservice.lib}/jboss-ws4ee-client.jar"/>
<pathelement path="${jboss.jaxrpc.lib}/axis-ws4ee.jar"/>
</path>
<path id="jbossws14.classpath">
- <pathelement path="${jboss.jbossws14.lib}/jbossws14.jar"/>
- <pathelement path="${jboss.jbossws14.lib}/jbossws14-client.jar"/>
+ <pathelement path="${jboss.home}/client/jbossws14-client.jar"/>
</path>
<path id="jbossws.classpath">
- <pathelement path="${jboss.jbossws.lib}/jbossws.jar"/>
- <pathelement path="${jboss.jbossws.lib}/jbossws-client.jar"/>
+ <pathelement path="${jboss.home}/client/jbossws-client.jar"/>
</path>
- <property name="jboss.home" value="${module.root}/../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
- <available property="webservice.classpath" value="jboss-ws4ee.classpath" file="${jboss.home}/client/jboss-ws4ee-client.jar"/>
- <available property="webservice.classpath" value="jbossws14.classpath" file="${jboss.home}/client/jbossws14-client.jar"/>
- <available property="webservice.classpath" value="jbossws.classpath" file="${jboss.home}/client/jbossws-client.jar"/>
<path id="webservice.classpath" refid="${webservice.classpath}"/>
<!-- classpath and local.classpath must have a value using with a path -->
|
|
From: Thomas D. <tho...@jb...> - 2006-04-26 21:28:38
|
User: tdiesler Date: 06/04/26 17:28:34 Modified: jbosstest build.xml Log: Set webservice.classpath depending on the client jar Revision Changes Path 1.563 +9 -13 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.562 retrieving revision 1.563 diff -u -b -r1.562 -r1.563 --- build.xml 26 Apr 2006 15:00:06 -0000 1.562 +++ build.xml 26 Apr 2006 21:28:34 -0000 1.563 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.562 2006/04/26 15:00:06 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.563 2006/04/26 21:28:34 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -213,21 +213,17 @@ <property name="release.id" value="${install.id}"/> <property name="install.root" value="${module.output}/${install.id}"/> + <!-- Set webservice.classpath depending on the client jar --> + <property name="jboss.home" value="${module.root}/../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/> + <available property="webservice.classpath" value="jbossws14.classpath" file="${jboss.home}/client/jbossws14-client.jar"/> + <available property="webservice.classpath" value="jbossws.classpath" file="${jboss.home}/client/jbossws-client.jar"/> <path id="jbossws14.classpath"> - <pathelement path="${jboss.jbossws14.lib}/jbossws14-client.jar"/> + <pathelement path="${jboss.home}/client/jbossws14-client.jar"/> </path> - <path id="jbossws15.classpath"> - <pathelement path="${jboss.jbossws.lib}/jbossws-client.jar"/> + <path id="jbossws.classpath"> + <pathelement path="${jboss.home}/client/jbossws-client.jar"/> </path> - <condition property="jboss.webservice.classpath" value="jbossws14.classpath"> - <not> - <isset property="HAVE_JDK_1.5"/> - </not> - </condition> - <condition property="jboss.webservice.classpath" value="jbossws15.classpath"> - <isset property="HAVE_JDK_1.5"/> - </condition> - <path id="jboss.webservice.classpath" refid="${jboss.webservice.classpath}"/> + <path id="webservice.classpath" refid="${webservice.classpath}"/> <!-- The combined thirdparty classpath --> <path id="thirdparty.classpath"> |
|
From: Thomas D. <tho...@jb...> - 2006-04-27 07:07:42
|
User: tdiesler
Date: 06/04/27 03:07:38
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
Add webservice.classpath to thirdparty.classpath
Revision Changes Path
No revision
No revision
1.406.2.177 +8 -8 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.176
retrieving revision 1.406.2.177
diff -u -b -r1.406.2.176 -r1.406.2.177
--- build.xml 26 Apr 2006 21:28:03 -0000 1.406.2.176
+++ build.xml 27 Apr 2006 07:07:38 -0000 1.406.2.177
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.176 2006/04/26 21:28:03 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.177 2006/04/27 07:07:38 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -207,12 +207,6 @@
<property name="release.id" value="${install.id}"/>
<property name="install.root" value="${module.output}/${install.id}"/>
- <!-- The combined thirdparty classpath -->
- <path id="thirdparty.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </path>
-
<!-- Set webservice.classpath depending on the client jar -->
<property name="jboss.home" value="${module.root}/../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
<available property="webservice.classpath" value="jboss-ws4ee.classpath" file="${jboss.home}/client/jboss-ws4ee-client.jar"/>
@@ -234,6 +228,13 @@
<property name="classpath" value=""/>
<property name="local.classpath" value=""/>
+ <!-- The combined thirdparty classpath -->
+ <path id="thirdparty.classpath">
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ <path refid="webservice.classpath"/>
+ </path>
+
<!-- Classpath to build and run the tests -->
<path id="tests.classpath">
<pathelement path="${classpath}"/>
@@ -242,7 +243,6 @@
<pathelement path="${project.tools}/lib/ant-junit.jar"/>
<path refid="jboss.jmx.classpath"/>
<path refid="thirdparty.classpath"/>
- <path refid="webservice.classpath"/>
</path>
<!-- Classpath to build the tests -->
|
|
From: Thomas D. <tho...@jb...> - 2006-04-27 07:08:40
|
User: tdiesler Date: 06/04/27 03:08:36 Modified: jbosstest build.xml Log: Add webservice.classpath to thirdparty.classpath Revision Changes Path 1.564 +2 -4 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.563 retrieving revision 1.564 diff -u -b -r1.563 -r1.564 --- build.xml 26 Apr 2006 21:28:34 -0000 1.563 +++ build.xml 27 Apr 2006 07:08:36 -0000 1.564 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.563 2006/04/26 21:28:34 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.564 2006/04/27 07:08:36 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -229,7 +229,7 @@ <path id="thirdparty.classpath"> <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> - <path refid="jboss.webservice.classpath"/> + <path refid="webservice.classpath"/> </path> <path id="javac.classpath"> @@ -3203,12 +3203,10 @@ <jvmarg value="${junit.jvm.options}"/> - <!-- <jvmarg value="-Xdebug"/> <jvmarg value="-Xnoagent"/> <jvmarg value="-Djava.compiler=NONE"/> <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/> - --> <!-- Used for JGroups --> <jvmarg value="-Dbind.address=${node0}"/> |
|
From: Thomas D. <tho...@jb...> - 2006-04-27 07:12:44
|
User: tdiesler Date: 06/04/27 03:12:38 Modified: jbosstest build.xml Log: disable one-test debugging Revision Changes Path 1.565 +3 -1 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.564 retrieving revision 1.565 diff -u -b -r1.564 -r1.565 --- build.xml 27 Apr 2006 07:08:36 -0000 1.564 +++ build.xml 27 Apr 2006 07:12:37 -0000 1.565 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.564 2006/04/27 07:08:36 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.565 2006/04/27 07:12:37 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -3203,10 +3203,12 @@ <jvmarg value="${junit.jvm.options}"/> + <!-- <jvmarg value="-Xdebug"/> <jvmarg value="-Xnoagent"/> <jvmarg value="-Djava.compiler=NONE"/> <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/> + --> <!-- Used for JGroups --> <jvmarg value="-Dbind.address=${node0}"/> |
|
From: Thomas D. <tho...@jb...> - 2006-04-27 14:29:22
|
User: tdiesler
Date: 06/04/27 10:29:21
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
swith to jbossws classpath based on jdk
Revision Changes Path
No revision
No revision
1.406.2.178 +12 -12 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.177
retrieving revision 1.406.2.178
diff -u -b -r1.406.2.177 -r1.406.2.178
--- build.xml 27 Apr 2006 07:07:38 -0000 1.406.2.177
+++ build.xml 27 Apr 2006 14:29:20 -0000 1.406.2.178
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.177 2006/04/27 07:07:38 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.178 2006/04/27 14:29:20 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -207,20 +207,20 @@
<property name="release.id" value="${install.id}"/>
<property name="install.root" value="${module.output}/${install.id}"/>
- <!-- Set webservice.classpath depending on the client jar -->
- <property name="jboss.home" value="${module.root}/../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
- <available property="webservice.classpath" value="jboss-ws4ee.classpath" file="${jboss.home}/client/jboss-ws4ee-client.jar"/>
- <available property="webservice.classpath" value="jbossws14.classpath" file="${jboss.home}/client/jbossws14-client.jar"/>
- <available property="webservice.classpath" value="jbossws.classpath" file="${jboss.home}/client/jbossws-client.jar"/>
- <path id="jboss-ws4ee.classpath">
- <pathelement path="${jboss.webservice.lib}/jboss-ws4ee-client.jar"/>
- <pathelement path="${jboss.jaxrpc.lib}/axis-ws4ee.jar"/>
- </path>
+ <!-- Set webservice.classpath depending on the jdk version -->
+ <condition property="webservice.classpath" value="jbossws14.classpath">
+ <not>
+ <isset property="HAVE_JDK_1.5"/>
+ </not>
+ </condition>
+ <condition property="webservice.classpath" value="jbossws.classpath">
+ <isset property="HAVE_JDK_1.5"/>
+ </condition>
<path id="jbossws14.classpath">
- <pathelement path="${jboss.home}/client/jbossws14-client.jar"/>
+ <pathelement path="${jboss.jbossws14.lib}/jbossws14-client.jar"/>
</path>
<path id="jbossws.classpath">
- <pathelement path="${jboss.home}/client/jbossws-client.jar"/>
+ <pathelement path="${jboss.jbossws.lib}/jbossws-client.jar"/>
</path>
<path id="webservice.classpath" refid="${webservice.classpath}"/>
|
|
From: Thomas D. <tho...@jb...> - 2006-04-27 14:30:05
|
User: tdiesler Date: 06/04/27 10:30:03 Modified: jbosstest build.xml Log: swith to jbossws classpath based on jdk Revision Changes Path 1.566 +12 -7 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.565 retrieving revision 1.566 diff -u -b -r1.565 -r1.566 --- build.xml 27 Apr 2006 07:12:37 -0000 1.565 +++ build.xml 27 Apr 2006 14:30:03 -0000 1.566 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.565 2006/04/27 07:12:37 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.566 2006/04/27 14:30:03 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -213,15 +213,20 @@ <property name="release.id" value="${install.id}"/> <property name="install.root" value="${module.output}/${install.id}"/> - <!-- Set webservice.classpath depending on the client jar --> - <property name="jboss.home" value="${module.root}/../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/> - <available property="webservice.classpath" value="jbossws14.classpath" file="${jboss.home}/client/jbossws14-client.jar"/> - <available property="webservice.classpath" value="jbossws.classpath" file="${jboss.home}/client/jbossws-client.jar"/> + <!-- Set webservice.classpath depending on the jdk version --> + <condition property="webservice.classpath" value="jbossws14.classpath"> + <not> + <isset property="HAVE_JDK_1.5"/> + </not> + </condition> + <condition property="webservice.classpath" value="jbossws.classpath"> + <isset property="HAVE_JDK_1.5"/> + </condition> <path id="jbossws14.classpath"> - <pathelement path="${jboss.home}/client/jbossws14-client.jar"/> + <pathelement path="${jboss.jbossws14.lib}/jbossws14-client.jar"/> </path> <path id="jbossws.classpath"> - <pathelement path="${jboss.home}/client/jbossws-client.jar"/> + <pathelement path="${jboss.jbossws.lib}/jbossws-client.jar"/> </path> <path id="webservice.classpath" refid="${webservice.classpath}"/> |
|
From: Rajesh R. <raj...@jb...> - 2006-04-27 21:43:21
|
User: rrajasekaran
Date: 06/04/27 17:43:18
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
Added naming URL to unified tests
Revision Changes Path
No revision
No revision
1.406.2.179 +3 -1 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.178
retrieving revision 1.406.2.179
diff -u -b -r1.406.2.178 -r1.406.2.179
--- build.xml 27 Apr 2006 14:29:20 -0000 1.406.2.178
+++ build.xml 27 Apr 2006 21:43:17 -0000 1.406.2.179
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.178 2006/04/27 14:29:20 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.179 2006/04/27 21:43:17 rrajasekaran Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -851,6 +851,8 @@
<sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
<!-- Pass along any jbosstest.* system properties -->
<syspropertyset>
<propertyref prefix="jbosstest."/>
|
|
From: Thomas D. <tho...@jb...> - 2006-04-29 08:28:11
|
User: tdiesler
Date: 06/04/29 04:28:09
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
always install jbossws14
Revision Changes Path
No revision
No revision
1.406.2.180 +11 -15 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.179
retrieving revision 1.406.2.180
diff -u -b -r1.406.2.179 -r1.406.2.180
--- build.xml 27 Apr 2006 21:43:17 -0000 1.406.2.179
+++ build.xml 29 Apr 2006 08:28:09 -0000 1.406.2.180
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.179 2006/04/27 21:43:17 rrajasekaran Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.180 2006/04/29 08:28:09 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -207,20 +207,16 @@
<property name="release.id" value="${install.id}"/>
<property name="install.root" value="${module.output}/${install.id}"/>
- <!-- Set webservice.classpath depending on the jdk version -->
- <condition property="webservice.classpath" value="jbossws14.classpath">
- <not>
- <isset property="HAVE_JDK_1.5"/>
- </not>
- </condition>
- <condition property="webservice.classpath" value="jbossws.classpath">
- <isset property="HAVE_JDK_1.5"/>
- </condition>
- <path id="jbossws14.classpath">
- <pathelement path="${jboss.jbossws14.lib}/jbossws14-client.jar"/>
+ <!-- Set classpath for the webservice stack depending client jar -->
+ <property name="jboss.home" value="${module.root}/../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <available property="webservice.classpath" value="jboss-ws4ee.classpath" file="${jboss.home}/client/jboss-ws4ee-client.jar"/>
+ <available property="webservice.classpath" value="jbossws14.classpath" file="${jboss.home}/client/jbossws14-client.jar"/>
+ <path id="jboss-ws4ee.classpath">
+ <pathelement path="${jboss.home}/client/jboss-ws4ee-client.jar"/>
+ <pathelement path="${jboss.jaxrpc.lib}/axis-ws4ee.jar"/>
</path>
- <path id="jbossws.classpath">
- <pathelement path="${jboss.jbossws.lib}/jbossws-client.jar"/>
+ <path id="jbossws14.classpath">
+ <pathelement path="${jboss.home}/client/jbossws14-client.jar"/>
</path>
<path id="webservice.classpath" refid="${webservice.classpath}"/>
|
|
From: Thomas D. <tho...@jb...> - 2006-04-29 14:38:30
|
User: tdiesler
Date: 06/04/29 10:38:27
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
Migrate ws4ee incompatible tests to branches/jbossws-1.0
Revision Changes Path
No revision
No revision
1.406.2.181 +11 -5 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.180
retrieving revision 1.406.2.181
diff -u -b -r1.406.2.180 -r1.406.2.181
--- build.xml 29 Apr 2006 08:28:09 -0000 1.406.2.180
+++ build.xml 29 Apr 2006 14:38:27 -0000 1.406.2.181
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.180 2006/04/29 08:28:09 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.181 2006/04/29 14:38:27 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -209,14 +209,20 @@
<!-- Set classpath for the webservice stack depending client jar -->
<property name="jboss.home" value="${module.root}/../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
- <available property="webservice.classpath" value="jboss-ws4ee.classpath" file="${jboss.home}/client/jboss-ws4ee-client.jar"/>
- <available property="webservice.classpath" value="jbossws14.classpath" file="${jboss.home}/client/jbossws14-client.jar"/>
+ <available property="jboss-ws4ee.available" file="${jboss.home}/client/jboss-ws4ee-client.jar"/>
+ <available property="jbossws14.available" file="${jboss.home}/client/jbossws14-client.jar"/>
+ <condition property="webservice.classpath" value="jboss-ws4ee.classpath">
+ <isset property="jboss-ws4ee.available"/>
+ </condition>
+ <condition property="webservice.classpath" value="jbossws14.classpath">
+ <isset property="jbossws14.available"/>
+ </condition>
<path id="jboss-ws4ee.classpath">
- <pathelement path="${jboss.home}/client/jboss-ws4ee-client.jar"/>
+ <pathelement path="${jboss.webservice.lib}/jboss-ws4ee-client.jar"/>
<pathelement path="${jboss.jaxrpc.lib}/axis-ws4ee.jar"/>
</path>
<path id="jbossws14.classpath">
- <pathelement path="${jboss.home}/client/jbossws14-client.jar"/>
+ <pathelement path="${jboss.jbossws14.lib}/jbossws14-client.jar"/>
</path>
<path id="webservice.classpath" refid="${webservice.classpath}"/>
|
|
From: Thomas D. <tho...@jb...> - 2006-04-29 15:06:15
|
User: tdiesler
Date: 06/04/29 11:06:11
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
Set classpath for the webservice stack depending on ${jboss.dist} and client jar
Revision Changes Path
No revision
No revision
1.406.2.182 +11 -3 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.181
retrieving revision 1.406.2.182
diff -u -b -r1.406.2.181 -r1.406.2.182
--- build.xml 29 Apr 2006 14:38:27 -0000 1.406.2.181
+++ build.xml 29 Apr 2006 15:06:10 -0000 1.406.2.182
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.181 2006/04/29 14:38:27 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.182 2006/04/29 15:06:10 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -207,16 +207,21 @@
<property name="release.id" value="${install.id}"/>
<property name="install.root" value="${module.output}/${install.id}"/>
- <!-- Set classpath for the webservice stack depending client jar -->
- <property name="jboss.home" value="${module.root}/../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <!-- Set classpath for the webservice stack depending on ${jboss.dist} and client jar -->
+ <property name="jboss.dist" value="jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <property name="jboss.home" value="${module.root}/../build/output/${jboss.dist}"/>
<available property="jboss-ws4ee.available" file="${jboss.home}/client/jboss-ws4ee-client.jar"/>
<available property="jbossws14.available" file="${jboss.home}/client/jbossws14-client.jar"/>
+ <available property="jbossws.available" file="${jboss.home}/client/jbossws-client.jar"/>
<condition property="webservice.classpath" value="jboss-ws4ee.classpath">
<isset property="jboss-ws4ee.available"/>
</condition>
<condition property="webservice.classpath" value="jbossws14.classpath">
<isset property="jbossws14.available"/>
</condition>
+ <condition property="webservice.classpath" value="jbossws.classpath">
+ <isset property="jbossws.available"/>
+ </condition>
<path id="jboss-ws4ee.classpath">
<pathelement path="${jboss.webservice.lib}/jboss-ws4ee-client.jar"/>
<pathelement path="${jboss.jaxrpc.lib}/axis-ws4ee.jar"/>
@@ -224,6 +229,9 @@
<path id="jbossws14.classpath">
<pathelement path="${jboss.jbossws14.lib}/jbossws14-client.jar"/>
</path>
+ <path id="jbossws.classpath">
+ <pathelement path="${jboss.jbossws.lib}/jbossws-client.jar"/>
+ </path>
<path id="webservice.classpath" refid="${webservice.classpath}"/>
<!-- classpath and local.classpath must have a value using with a path -->
|
|
From: Thomas D. <tho...@jb...> - 2006-04-29 16:05:58
|
User: tdiesler
Date: 06/04/29 12:05:53
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
Set classpath for the webservice stack depending on ${jboss.dist.name} and client jar
Revision Changes Path
No revision
No revision
1.406.2.183 +4 -4 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.182
retrieving revision 1.406.2.183
diff -u -b -r1.406.2.182 -r1.406.2.183
--- build.xml 29 Apr 2006 15:06:10 -0000 1.406.2.182
+++ build.xml 29 Apr 2006 16:05:53 -0000 1.406.2.183
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.182 2006/04/29 15:06:10 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.183 2006/04/29 16:05:53 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -207,9 +207,9 @@
<property name="release.id" value="${install.id}"/>
<property name="install.root" value="${module.output}/${install.id}"/>
- <!-- Set classpath for the webservice stack depending on ${jboss.dist} and client jar -->
- <property name="jboss.dist" value="jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
- <property name="jboss.home" value="${module.root}/../build/output/${jboss.dist}"/>
+ <!-- Set classpath for the webservice stack depending on ${jboss.dist.name} and client jar -->
+ <property name="jboss.dist.name" value="jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <property name="jboss.home" value="${module.root}/../build/output/${jboss.dist.name}"/>
<available property="jboss-ws4ee.available" file="${jboss.home}/client/jboss-ws4ee-client.jar"/>
<available property="jbossws14.available" file="${jboss.home}/client/jbossws14-client.jar"/>
<available property="jbossws.available" file="${jboss.home}/client/jbossws-client.jar"/>
|
|
From: Brian S. <bri...@jb...> - 2006-04-30 20:01:42
|
User: bstansberry
Date: 06/04/30 16:01:34
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
Include the aop deployer in the clustered sso configs
Revision Changes Path
No revision
No revision
1.406.2.184 +3 -1 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.183
retrieving revision 1.406.2.184
diff -u -b -r1.406.2.183 -r1.406.2.184
--- build.xml 29 Apr 2006 16:05:53 -0000 1.406.2.183
+++ build.xml 30 Apr 2006 20:01:34 -0000 1.406.2.184
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.183 2006/04/29 16:05:53 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.184 2006/04/30 20:01:34 bstansberry Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -1238,6 +1238,7 @@
<include name="deploy/jbossjca-service.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/jboss-jdbc-metadata.sar"/>
+ <include name="deploy/jboss-aop*.deployer/**"/>
<!--include name="deploy/tc5-cluster.sar/**"/-->
<include name="lib/**"/>
</patternset>
@@ -1254,6 +1255,7 @@
<include name="deploy/jbossjca-service.xml"/>
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/jboss-jdbc-metadata.sar"/>
+ <include name="deploy/jboss-aop*.deployer/**"/>
<!--include name="deploy/tc5-cluster.sar/**"/-->
<include name="lib/**"/>
</patternset>
|
|
From: Brian S. <bri...@jb...> - 2006-05-01 04:02:18
|
User: bstansberry
Date: 06/05/01 00:02:15
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
Use std JBossCache setup for clustered sso tests
Revision Changes Path
No revision
No revision
1.406.2.185 +3 -3 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.184
retrieving revision 1.406.2.185
diff -u -b -r1.406.2.184 -r1.406.2.185
--- build.xml 30 Apr 2006 20:01:34 -0000 1.406.2.184
+++ build.xml 1 May 2006 04:02:15 -0000 1.406.2.185
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.184 2006/04/30 20:01:34 bstansberry Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.185 2006/05/01 04:02:15 bstansberry Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -1239,7 +1239,7 @@
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/jboss-jdbc-metadata.sar"/>
<include name="deploy/jboss-aop*.deployer/**"/>
- <!--include name="deploy/tc5-cluster.sar/**"/-->
+ <include name="deploy/tc5-cluster.sar/**"/>
<include name="lib/**"/>
</patternset>
</create-config>
@@ -1256,7 +1256,7 @@
<include name="deploy/jboss-local-jdbc.rar"/>
<include name="deploy/jboss-jdbc-metadata.sar"/>
<include name="deploy/jboss-aop*.deployer/**"/>
- <!--include name="deploy/tc5-cluster.sar/**"/-->
+ <include name="deploy/tc5-cluster.sar/**"/>
<include name="lib/**"/>
</patternset>
</create-config>
|
|
From: Brian S. <bri...@jb...> - 2006-05-01 04:08:58
|
User: bstansberry Date: 06/05/01 00:08:53 Modified: jbosstest build.xml Log: Use std JBossCache setup for clustered sso tests Revision Changes Path 1.567 +5 -1 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.566 retrieving revision 1.567 diff -u -b -r1.566 -r1.567 --- build.xml 27 Apr 2006 14:30:03 -0000 1.566 +++ build.xml 1 May 2006 04:08:53 -0000 1.567 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.566 2006/04/27 14:30:03 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.567 2006/05/01 04:08:53 bstansberry Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -1041,6 +1041,8 @@ <include name="deploy/jboss-jdbc-metadata.sar"/> <!-- Whichever AOP Deployer they built --> <include name="deploy/jboss-aop*.deployer/**"/> + <include name="deploy/tc5-cluster.aop"/> + <include name="deploy/tc5-cluster-service.xml"/> <include name="lib/**"/> </patternset> </create-config> @@ -1058,6 +1060,8 @@ <include name="deploy/jboss-jdbc-metadata.sar"/> <!-- Whichever AOP Deployer they built --> <include name="deploy/jboss-aop*.deployer/**"/> + <include name="deploy/tc5-cluster.aop"/> + <include name="deploy/tc5-cluster-service.xml"/> <include name="lib/**"/> </patternset> </create-config> |
|
From: Anil S. <ani...@jb...> - 2006-05-01 22:09:21
|
User: asaldhana
Date: 06/05/01 18:09:19
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
JBAS-2519: Provide a seperate server configuration and tests "jacc-security-external"
Revision Changes Path
No revision
No revision
1.406.2.186 +86 -1 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.185
retrieving revision 1.406.2.186
diff -u -b -r1.406.2.185 -r1.406.2.186
--- build.xml 1 May 2006 04:02:15 -0000 1.406.2.185
+++ build.xml 1 May 2006 22:09:18 -0000 1.406.2.186
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.185 2006/05/01 04:02:15 bstansberry Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.186 2006/05/01 22:09:18 asaldhana Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -637,10 +637,14 @@
<include name="org/jboss/test/cmp2/relationship/*TestCase.class" />
<include name="org/jboss/test/cmp2/simple/SimpleUnitTestCase.class" />
<include name="org/jboss/test/webservice/jbws309/*TestCase.class"/>
+ <exclude name="org/jboss/test/jacc/test/external/*TestCase.class"/>
</patternset>
<patternset id="jacc.excludes">
<exclude name="**/test/jacc/test/*"/>
</patternset>
+ <patternset id="jacc.external.includes">
+ <include name="org/jboss/test/jacc/test/external/*TestCase.class"/>
+ </patternset>
<patternset id="custom-secmgr.includes">
<include name="**/test/**/CustomSecurityManagerTestCase.class"/>
</patternset>
@@ -1795,6 +1799,87 @@
<wait-on-shutdown conf="jacc-securitymgr"/>
</target>
+ <target name="tests-jacc-security-external"
+ description="Tests run against a jboss server with JACC configured with an
+ external policy provider">
+ <create-config baseconf="default" newconf="jacc-security-external" newconf-src="jacc">
+ <patternset>
+ <include name="conf/**"/>
+ <include name="deploy/hsqldb-ds.xml"/>
+ <include name="deploy/jbossweb*.sar/**"/>
+ <include name="deploy/jbossws.sar/**"/>
+ <include name="deploy/jbossws14.sar/**"/>
+ <include name="deploy/client-deployer-service.xml"/>
+ <include name="deploy/ear-deployer.xml"/>
+ <include name="deploy/ejb-deployer.xml"/>
+ <include name="deploy/jmx-invoker-service.xml"/>
+ <include name="deploy/jmx-console.war/**"/>
+ <include name="deploy/jbossjca-service.xml"/>
+ <include name="deploy/jboss-local-jdbc.rar"/>
+ <include name="deploy/mail-service.xml"/>
+ <include name="deploy/jms/**"/>
+ <include name="lib/**"/>
+ <include name="deploy/jboss-aop.deployer/**"/>
+ <include name="deploy/jboss-aop-jdk50.deployer/**"/>
+ <include name="deploy/ejb3-interceptors-aop.xml"/>
+ <include name="deploy/ejb3.deployer/**"/>
+ </patternset>
+ </create-config>
+ <!-- -->
+ <unzip dest="${jboss.dist}/server/jacc-security-external/deploy/jbossweb-tomcat55.sar">
+ <fileset dir="${jboss.dist}/server/jacc-security-external/deploy/jbossweb-tomcat55.sar">
+ <patternset>
+ <exclude name="META-INF/*"/>
+ </patternset>
+ <include name="jasper-compiler.jar" />
+ <include name="jasper-compiler-jdt.jar" />
+ </fileset>
+ </unzip>
+ <!-- Copy the jacc securityconstraint provider jar -->
+ <copy todir="${jboss.dist}/server/jacc-security-external/lib"
+ file="${build.lib}/jacc-securityconstraint.jar"/>
+ <!-- Append extra attributes to the JACCAuthorizationRealm -->
+ <replace file="${jboss.dist}/server/jacc-security-external/deploy/jbossweb-tomcat55.sar/server.xml">
+ <replacetoken><![CDATA[JaccAuthorizationRealm"]]></replacetoken>
+ <replacevalue><![CDATA[JaccAuthorizationRealm" unprotectedResourceDelegation="true" securityConstraintProviderClass="org.jboss.test.security.test.CustomSecurityConstraintProvider" ]]></replacevalue>
+ </replace>
+ <!-- Replace the policy provider with the test provider -->
+ <replace file="${jboss.dist}/server/jacc-security-external/deploy/jacc-service.xml">
+ <replacetoken><![CDATA[org.jboss.security.jacc.DelegatingPolicy]]></replacetoken>
+ <replacevalue><![CDATA[org.jboss.test.jacc.test.external.TestExternalPolicyProvider]]></replacevalue>
+ </replace>
+
+ <server:start name="jacc-security-external"/>
+
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <waitfor maxwait="60" maxwaitunit="second"
+ checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
+ <http url="http://${node0}:8080/"/>
+ </waitfor>
+ <fail message="Timeout waiting for server to start" if="startup.timeout"/>
+ <property name="jbosstest.secure" value="true"/>
+ <property name="jboss.security.jacc" value="true" />
+ <property name="java.security.auth.login.config"
+ value="${build.resources}/security/auth.conf"/>
+ <propertyset id="jacc-tests-props">
+ <propertyref prefix="java.security.auth"/>
+ </propertyset>
+
+ <propertyset id="jacc-tests-props">
+ <propertyref prefix="java.security.auth"/>
+ <propertyref prefix="jboss.security"/>
+ </propertyset>
+
+ <run-junit junit.patternset="jacc.external.includes"
+ junit.configuration="jacc-security-external"
+ junit.syspropertyset="jacc-tests-props" />
+
+ <stop-jboss/>
+ <wait-on-shutdown conf="jacc-security-external"/>
+ </target>
+
+
<!-- Tests of the custom security manager plugin -->
<target name="tests-custom-securitymgr"
description="Tests run against a jboss server with custom security manager configured">
|
|
From: Anil S. <ani...@jb...> - 2006-05-01 23:03:42
|
User: asaldhana
Date: 06/05/01 19:03:40
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
JBAS-2519: make tests-jacc-security-external part of the tests target.
Revision Changes Path
No revision
No revision
1.406.2.187 +2 -1 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.186
retrieving revision 1.406.2.187
diff -u -b -r1.406.2.186 -r1.406.2.187
--- build.xml 1 May 2006 22:09:18 -0000 1.406.2.186
+++ build.xml 1 May 2006 23:03:40 -0000 1.406.2.187
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.186 2006/05/01 22:09:18 asaldhana Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.187 2006/05/01 23:03:40 asaldhana Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -796,6 +796,7 @@
<antcall target="test-example-binding-manager"/>
<antcall target="tests-jacc-security"/>
<antcall target="tests-jacc-securitymgr"/>
+ <antcall target="tests-jacc-security-external"/>
<antcall target="tests-compatibility"/>
<antcall target="tests-webservice-ssl"/>
<antcall target="tests-unified"/>
|
|
From: Adrian B. <adr...@jb...> - 2006-05-02 14:58:02
|
User: adrian Date: 06/05/02 10:57:58 Modified: jbosstest .classpath Log: Fix the eclipse build Revision Changes Path 1.66 +1 -0 jbosstest/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jbosstest/.classpath,v retrieving revision 1.65 retrieving revision 1.66 diff -u -b -r1.65 -r1.66 --- .classpath 11 Apr 2006 13:22:13 -0000 1.65 +++ .classpath 2 May 2006 14:57:58 -0000 1.66 @@ -56,5 +56,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/kernel"/> <classpathentry combineaccessrules="false" kind="src" path="/dependency"/> <classpathentry kind="lib" path="/thirdparty/apache-logging/lib/commons-logging.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jbossws-client.jar"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
|
From: Clebert S. <csu...@jb...> - 2006-05-02 20:52:36
|
User: csuconic
Date: 06/05/02 16:52:35
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
JBAS-2915 - Adding testcases configuration to validate the configuration
Revision Changes Path
No revision
No revision
1.406.2.188 +6 -1 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.187
retrieving revision 1.406.2.188
diff -u -b -r1.406.2.187 -r1.406.2.188
--- build.xml 1 May 2006 23:03:40 -0000 1.406.2.187
+++ build.xml 2 May 2006 20:52:34 -0000 1.406.2.188
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.187 2006/05/01 23:03:40 asaldhana Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.188 2006/05/02 20:52:34 csuconic Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -807,6 +807,11 @@
<target name="tests-unified">
<create-unifiedInvoker-server conf="unified-jboss" serial="jboss"/>
+ <replace file="${jboss.dist}/server/unified-jboss/conf/standardjboss.xml">
+ <replacefilter token="<interceptor call-by-value="true">org.jboss.invocation.MarshallingInvokerInterceptor</interceptor>"
+ value="<interceptor call-by-value="true">org.jboss.invocation.DataContainerMarshallingInvokerInterceptor</interceptor>"/>
+ </replace>
+
<server:start name="unified-jboss"/>
<antcall target="test-unified-unit">
|
|
From: Adrian B. <adr...@jb...> - 2006-05-02 22:16:26
|
User: adrian Date: 06/05/02 18:16:23 Modified: jbosstest build.xml Log: The eclipse cvs stuff in 3.0.2 is very flakey. Revision Changes Path 1.568 +2 -4 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.567 retrieving revision 1.568 diff -u -b -r1.567 -r1.568 --- build.xml 1 May 2006 04:08:53 -0000 1.567 +++ build.xml 2 May 2006 22:16:23 -0000 1.568 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.567 2006/05/01 04:08:53 bstansberry Exp $ --> +<!-- $Id: build.xml,v 1.568 2006/05/02 22:16:23 adrian Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -121,6 +121,7 @@ <!-- xml binding --> <path refid="xmlunit.xmlunit.classpath"/> + <path refid="jboss.microcontainer.classpath"/> </path> <!-- ======= --> @@ -146,9 +147,7 @@ <path refid="jboss.cache.classpath"/> <path refid="jboss.cluster.classpath"/> <path refid="jboss.common.classpath"/> - <path refid="jboss.container.classpath"/> <path refid="jboss.deployment.classpath"/> - <path refid="jboss.dependency.classpath"/> <path refid="jboss.ejb3x.classpath"/> <path refid="jboss.hibernate.classpath"/> <path refid="jboss.iiop.classpath"/> @@ -158,7 +157,6 @@ <path refid="jboss.jca.classpath"/> <path refid="jboss.jmx.classpath"/> <path refid="jboss.jmx-remoting.classpath"/> - <path refid="jboss.kernel.classpath"/> <path refid="jboss.management.classpath"/> <path refid="jboss.mbeans.classpath"/> <path refid="jboss.messaging.classpath"/> |
Thanks for helping keep SourceForge clean.
X