Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Thomas D. <tdi...@us...> - 2004-07-24 23:46:12
|
User: tdiesler
Date: 04/07/24 16:45:59
Modified: . build.xml
Log:
Restore the ws4ee tests. marshalltest, ws4eecomplex still need some work.
Revision Changes Path
1.377 +18 -48 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- build.xml 23 Jul 2004 15:23:44 -0000 1.376
+++ build.xml 24 Jul 2004 23:45:58 -0000 1.377
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.376 2004/07/23 15:23:44 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.377 2004/07/24 23:45:58 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -85,23 +85,24 @@
&libraries;
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="sun.jce.classpath"/>
- <path refid="sun.jsse.classpath"/>
- <path refid="sun.javamail.classpath"/>
- <path refid="sun.servlet.classpath"/>
<path refid="apache.avalon.classpath"/>
<path refid="apache.crimson.classpath"/>
<path refid="apache.commons.classpath"/>
<path refid="apache.log4j.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
+ <path refid="ibm.wsdl4j.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
+ <path refid="jgroups.jgroups.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
<path refid="jdom.classpath"/>
<path refid="javassist.classpath"/>
+ <path refid="sun.jce.classpath"/>
+ <path refid="sun.jsse.classpath"/>
+ <path refid="sun.javamail.classpath"/>
+ <path refid="sun.servlet.classpath"/>
<path refid="trove.classpath"/>
- <path refid="jgroups.jgroups.classpath"/>
<!-- needed for JBossMQ selector tests -->
<path refid="gnu.regexp.classpath"/>
@@ -111,9 +112,11 @@
<!-- needed for security login module tests -->
<path refid="hsqldb.hsqldb.classpath"/>
- <!-- needed for webservice tests -->
+ <!-- needed for JBoss.NET tests -->
+ <!-- Note, enabeling this breaks the ws4ee tests
<path refid="apache.axis.classpath"/>
<path refid="ibm.uddi4j.classpath"/>
+ -->
</path>
<!-- ======= -->
@@ -1372,7 +1375,7 @@
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
<classpath refid="tests.classpath"/>
<classpath path="${build.classes}"/>
- <arg value="-lhttp://localhost:8080/ws4ee/services/HelloService"/>
+ <arg value="-lhttp://localhost:8080/ws4eehandlerflow/HelloService"/>
<arg value="-o${build.resources}/ws4ee/handlerflow/META-INF/wsdl/Hello.wsdl"/>
<arg value="-nhttp://test.jboss.org/ws4ee/handlerflow"/>
<arg value="-SHelloService"/>
@@ -5416,16 +5419,6 @@
<include name="wsdl/Hello.wsdl"/>
</metainf>
</jar>
- <ear destfile="${build.lib}/ws4eehandlerflow-ejb.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/ws4ee/handlerflow/META-INF/application.xml">
- <fileset dir="${build.lib}">
- <include name="ws4eehandlerflow.jar"/>
- </fileset>
- <metainf dir="${build.resources}/ws4ee/handlerflow/META-INF">
- <include name="jboss-app.xml"/>
- </metainf>
- </ear>
- <!-- delete file="${build.lib}/ws4eehandlerflow.jar"/-->
<!-- build ws4eehandlerflow.war -->
<war warfile="${build.lib}/ws4eehandlerflow.war"
@@ -5451,16 +5444,6 @@
<include name="jboss-web.xml"/>
</webinf>
</war>
- <ear destfile="${build.lib}/ws4eehandlerflow-jse.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/ws4ee/handlerflow/WEB-INF/application.xml">
- <fileset dir="${build.lib}">
- <include name="ws4eehandlerflow.war"/>
- </fileset>
- <metainf dir="${build.resources}/ws4ee/handlerflow/WEB-INF">
- <include name="jboss-app.xml"/>
- </metainf>
- </ear>
- <!-- delete file="${build.lib}/ws4eehandlerflow.war"/ -->
<!-- build ws4eecomplex.jar -->
<jar destfile="${build.lib}/ws4eecomplex.jar" manifest="${build.etc}/manifest.mf">
@@ -5495,19 +5478,6 @@
</webinf>
</war>
- <!-- build ws4eehandler.jar -->
- <jar destfile="${build.lib}/ws4eehandler.jar" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/util/**"/>
- <include name="org/jboss/test/ws4ee/ws4eehandler/*.class"/>
- </fileset>
- <metainf dir="${source.resources}/ws4ee/ws4eehandler/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="webservices.xml"/>
- <include name="HandlerMapping.xml"/>
- <include name="wsdl/Handler.wsdl"/>
- </metainf>
- </jar>
</target>
<!-- xa test -->
@@ -6486,10 +6456,8 @@
<sysproperty key="jbosstest.secure" value="true"/>
<jvmarg value="-Djava.security.manager"/>
- <sysproperty key="java.security.policy"
- value="${build.resources}/security/tst.policy"/>
- <sysproperty key="java.security.auth.login.config"
- value="${build.resources}/security/auth.conf"/>
+ <sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/>
+ <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -6509,8 +6477,9 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/ws4ee/ws4eesimple/*TestCase.class"/>
- <include name="org/jboss/test/ws4ee/marshalltest/*TestCase.class"/>
+ <include name="org/jboss/test/ws4ee/**/*TestCase.class"/>
+ <exclude name="org/jboss/test/ws4ee/marshalltest/**"/>
+ <exclude name="org/jboss/test/ws4ee/ws4eecomplex/**"/>
</fileset>
</batchtest>
</junit>
@@ -7131,6 +7100,7 @@
<path refid="tests.classpath"/>
</classpath>
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
<formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
|
