Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: thomas d. <tdi...@us...> - 2003-11-19 22:01:46
|
User: tdiesler
Date: 03/11/19 14:01:45
Modified: . build.xml
Log:
- build the ws4eecomplex-ejb.ear, ws4eecomplex-web.ear
- fix a bug in ws4eesimple.war, where the SEI was not located in WEB-INF/classes
Revision Changes Path
1.311 +205 -206 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- build.xml 19 Nov 2003 17:02:50 -0000 1.310
+++ build.xml 19 Nov 2003 22:01:44 -0000 1.311
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.310 2003/11/19 17:02:50 cgjung Exp $ -->
+<!-- $Id: build.xml,v 1.311 2003/11/19 22:01:44 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3430,206 +3430,203 @@
<!-- webservice tests -->
<target name="_jars-webservice" depends="compile">
- <mkdir dir="${build.lib}"/>
+ <mkdir dir="${build.lib}"/>
- <!-- The wsr.wsr -->
- <mkdir dir="${build.resources}/webservice/wsr/wsr/META-INF"/>
- <copy toFile="${build.resources}/webservice/wsr/wsr/META-INF/web-service.xml"
- file="${build.gen-src}/org/jboss/test/webservice/wsr/deploy.wsdd"/>
+ <!-- The wsr.wsr -->
+ <mkdir dir="${build.resources}/webservice/wsr/wsr/META-INF"/>
+ <copy toFile="${build.resources}/webservice/wsr/wsr/META-INF/web-service.xml"
+ file="${build.gen-src}/org/jboss/test/webservice/wsr/deploy.wsdd"/>
- <jar destfile="${build.lib}/wsr.wsr" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/wsr/**/*.class"/>
- <exclude name="**/*Test*"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/wsr/wsr" />
- </jar>
+ <jar destfile="${build.lib}/wsr.wsr" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/webservice/wsr/**/*.class"/>
+ <exclude name="**/*Test*"/>
+ </fileset>
+ <fileset dir="${build.resources}/webservice/wsr/wsr"/>
+ </jar>
- <!-- The wsjmx.sar -->
- <jar destfile="${build.lib}/wsjmx.wsr" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.resources}/webservice/jmx/wsr">
- <include name="**/*"/>
- </fileset>
- </jar>
+ <!-- The wsjmx.sar -->
+ <jar destfile="${build.lib}/wsjmx.wsr" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.resources}/webservice/jmx/wsr">
+ <include name="**/*"/>
+ </fileset>
+ </jar>
- <jar destfile="${build.lib}/wsjmx.sar" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.lib}">
- <include name="wsjmx.wsr"/>
- </fileset>
- <fileset dir="${source.resources}/webservice/jmx/sar/">
- <include name="**/*"/>
- </fileset>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/jmx/server/*"/>
- </fileset>
- </jar>
+ <jar destfile="${build.lib}/wsjmx.sar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.lib}">
+ <include name="wsjmx.wsr"/>
+ </fileset>
+ <fileset dir="${source.resources}/webservice/jmx/sar/">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/webservice/jmx/server/*"/>
+ </fileset>
+ </jar>
- <!-- The wsejbsimple.ear -->
- <jar destfile="${build.lib}/wsejbsimple.wsr" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.resources}/webservice/ejbsimple/wsr">
- <include name="**/*"/>
- </fileset>
- </jar>
+ <!-- The wsejbsimple.ear -->
+ <jar destfile="${build.lib}/wsejbsimple.wsr" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.resources}/webservice/ejbsimple/wsr">
+ <include name="**/*"/>
+ </fileset>
+ </jar>
- <jar destfile="${build.lib}/wsejbsimple.jar" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/util/**"/>
- <include name="org/jboss/test/webservice/ejbsimple/**"/>
- <exclude name="org/jboss/test/webservice/ejbsimple/*Test*"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/ejbsimple/ejb/">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
+ <jar destfile="${build.lib}/wsejbsimple.jar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/util/**"/>
+ <include name="org/jboss/test/webservice/ejbsimple/**"/>
+ <exclude name="org/jboss/test/webservice/ejbsimple/*Test*"/>
+ </fileset>
+ <fileset dir="${build.resources}/webservice/ejbsimple/ejb/">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
- <jar destfile="${build.lib}/wsejbsimple.ear"
- manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.lib}">
- <include name="wsejbsimple.wsr"/>
- <include name="wsejbsimple.jar"/>
- </fileset>
- <fileset dir="${source.resources}/webservice/ejbsimple/ear/">
- <include name="**"/>
- </fileset>
- </jar>
+ <jar destfile="${build.lib}/wsejbsimple.ear" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.lib}">
+ <include name="wsejbsimple.wsr"/>
+ <include name="wsejbsimple.jar"/>
+ </fileset>
+ <fileset dir="${source.resources}/webservice/ejbsimple/ear/">
+ <include name="**"/>
+ </fileset>
+ </jar>
- <!-- The wsejbcomplex.ear -->
- <jar destfile="${build.lib}/wsejbcomplex.wsr" manifest="${build.etc}/manifest.mf">
- <fileset dir="${source.resources}/webservice/ejbcomplex/wsr">
- <include name="**/*"/>
- </fileset>
- </jar>
+ <!-- The wsejbcomplex.ear -->
+ <jar destfile="${build.lib}/wsejbcomplex.wsr" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${source.resources}/webservice/ejbcomplex/wsr">
+ <include name="**/*"/>
+ </fileset>
+ </jar>
- <jar destfile="${build.lib}/wsejbcomplex.jar" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/ejbcomplex/**"/>
- <exclude name="org/jboss/test/webservice/ejbcomplex/*Test*"/>
- </fileset>
- <fileset dir="${source.resources}/webservice/ejbcomplex/jar/">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
+ <jar destfile="${build.lib}/wsejbcomplex.jar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/webservice/ejbcomplex/**"/>
+ <exclude name="org/jboss/test/webservice/ejbcomplex/*Test*"/>
+ </fileset>
+ <fileset dir="${source.resources}/webservice/ejbcomplex/jar/">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
- <jar destfile="${build.lib}/wsejbcomplex.ear" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.lib}">
- <include name="wsejbcomplex.wsr"/>
- <include name="wsejbcomplex.jar"/>
- </fileset>
- <fileset dir="${source.resources}/webservice/ejbcomplex/ear/">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
+ <jar destfile="${build.lib}/wsejbcomplex.ear" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.lib}">
+ <include name="wsejbcomplex.wsr"/>
+ <include name="wsejbcomplex.jar"/>
+ </fileset>
+ <fileset dir="${source.resources}/webservice/ejbcomplex/ear/">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
- <!-- The wsexternal wsr and ear -->
- <jar destfile="${build.lib}/wsexternal.wsr" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/external/google/*.class"/>
- <include name="org/jboss/test/webservice/external/babelfish/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/external/wsr/">
- <include name="**/*"/>
- </fileset>
- </jar>
+ <!-- The wsexternal wsr and ear -->
+ <jar destfile="${build.lib}/wsexternal.wsr" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/webservice/external/google/*.class"/>
+ <include name="org/jboss/test/webservice/external/babelfish/*.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/webservice/external/wsr/">
+ <include name="**/*"/>
+ </fileset>
+ </jar>
- <jar destfile="${build.lib}/wsexternal.jar" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/util/**"/>
- <include name="org/jboss/test/webservice/external/**/*.class"/>
- <exclude name="org/jboss/test/webservice/external/google/**/*.class"/>
- <exclude name="org/jboss/test/webservice/external/babelfish/**/*.class"/>
- <exclude name="org/jboss/test/webservice/external/*Test*"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/external/ejb/">
- <include name="**/*"/>
- </fileset>
- </jar>
+ <jar destfile="${build.lib}/wsexternal.jar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/util/**"/>
+ <include name="org/jboss/test/webservice/external/**/*.class"/>
+ <exclude name="org/jboss/test/webservice/external/google/**/*.class"/>
+ <exclude name="org/jboss/test/webservice/external/babelfish/**/*.class"/>
+ <exclude name="org/jboss/test/webservice/external/*Test*"/>
+ </fileset>
+ <fileset dir="${build.resources}/webservice/external/ejb/">
+ <include name="**/*"/>
+ </fileset>
+ </jar>
- <jar
- destfile="${build.lib}/wsexternal.ear"
- manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.lib}">
- <include name="wsexternal.wsr"/>
- <include name="wsexternal.jar"/>
- </fileset>
- <fileset dir="${source.resources}/webservice/external/ear/">
- <include name="**/META-INF/application.xml"/>
- </fileset>
- </jar>
+ <jar destfile="${build.lib}/wsexternal.ear" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.lib}">
+ <include name="wsexternal.wsr"/>
+ <include name="wsexternal.jar"/>
+ </fileset>
+ <fileset dir="${source.resources}/webservice/external/ear/">
+ <include name="**/META-INF/application.xml"/>
+ </fileset>
+ </jar>
- <!-- build state.ear -->
- <jar jarFile="${build.lib}/wsstate.wsr" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.resources}/webservice/state/wsr">
- <include name="**/*"/>
- </fileset>
- </jar>
+ <!-- build state.ear -->
+ <jar jarFile="${build.lib}/wsstate.wsr" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.resources}/webservice/state/wsr">
+ <include name="**/*"/>
+ </fileset>
+ </jar>
- <jar jarfile="${build.lib}/wsstate.jar" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="**/test/util/**"/>
- <include name="**/test/webservice/state/**"/>
- <exclude name="**/*Test*.*"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/state/ejb/">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
+ <jar jarfile="${build.lib}/wsstate.jar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="**/test/util/**"/>
+ <include name="**/test/webservice/state/**"/>
+ <exclude name="**/*Test*.*"/>
+ </fileset>
+ <fileset dir="${build.resources}/webservice/state/ejb/">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
- <jar jarFile="${build.lib}/wsstate.ear" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.lib}">
- <include name="wsstate.wsr"/>
- <include name="wsstate.jar"/>
- </fileset>
- <fileset dir="${source.resources}/webservice/state/ear">
- <include name="**"/>
- </fileset>
- </jar>
+ <jar jarFile="${build.lib}/wsstate.ear" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.lib}">
+ <include name="wsstate.wsr"/>
+ <include name="wsstate.jar"/>
+ </fileset>
+ <fileset dir="${source.resources}/webservice/state/ear">
+ <include name="**"/>
+ </fileset>
+ </jar>
- <!-- build security.ear -->
- <jar jarFile="${build.lib}/wssecurity.wsr" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.resources}/webservice/security/wsr">
- <include name="**/*"/>
- </fileset>
- </jar>
+ <!-- build security.ear -->
+ <jar jarFile="${build.lib}/wssecurity.wsr" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.resources}/webservice/security/wsr">
+ <include name="**/*"/>
+ </fileset>
+ </jar>
- <jar jarfile="${build.lib}/wssecurity.jar" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="**/test/util/**"/>
- <include name="**/test/webservice/security/**"/>
- <include name="**/test/security/service/SecurityConfig*.*"/>
- <exclude name="**/*TestCase*.*"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/security/ejb/">
- <include name="**/*.xml"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/security/server/">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
+ <jar jarfile="${build.lib}/wssecurity.jar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="**/test/util/**"/>
+ <include name="**/test/webservice/security/**"/>
+ <include name="**/test/security/service/SecurityConfig*.*"/>
+ <exclude name="**/*TestCase*.*"/>
+ </fileset>
+ <fileset dir="${build.resources}/webservice/security/ejb/">
+ <include name="**/*.xml"/>
+ </fileset>
+ <fileset dir="${build.resources}/webservice/security/server/">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
- <jar jarFile="${build.lib}/wssecurity.ear" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.lib}">
- <include name="wssecurity.wsr"/>
- <include name="wssecurity.jar"/>
- </fileset>
- <fileset dir="${source.resources}/webservice/security/ear">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
+ <jar jarFile="${build.lib}/wssecurity.ear" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.lib}">
+ <include name="wssecurity.wsr"/>
+ <include name="wssecurity.jar"/>
+ </fileset>
+ <fileset dir="${source.resources}/webservice/security/ear">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
- <jar jarfile="${build.lib}/wsuddi.jar" manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="**/test/util/**"/>
- <include name="**/test/webservice/security/server/*Login*.*"/>
- <include name="**/test/security/service/SecurityConfig*.*"/>
- <exclude name="**/*TestCase*.*"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/uddi/ejb/">
- <include name="**/*.xml"/>
- </fileset>
- <fileset dir="${build.resources}/webservice/security/server/">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
+ <jar jarfile="${build.lib}/wsuddi.jar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="**/test/util/**"/>
+ <include name="**/test/webservice/security/server/*Login*.*"/>
+ <include name="**/test/security/service/SecurityConfig*.*"/>
+ <exclude name="**/*TestCase*.*"/>
+ </fileset>
+ <fileset dir="${build.resources}/webservice/uddi/ejb/">
+ <include name="**/*.xml"/>
+ </fileset>
+ <fileset dir="${build.resources}/webservice/security/server/">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
<!-- build ws4eesimple.ear -->
<jar destfile="${build.lib}/ws4eesimple.jar" manifest="${build.etc}/manifest.mf">
@@ -3649,18 +3646,18 @@
<war warfile="${build.lib}/ws4eesimple.war"
webxml="${source.resources}/webservice/ws4eesimple/WEB-INF/web.xml">
- <fileset dir="${build.classes}">
+ <classes dir="${build.classes}">
<include name="org/jboss/test/webservice/ws4eesimple/HelloJavaBean.class"/>
<include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/>
- </fileset>
+ </classes>
<webinf dir="${source.resources}/webservice/ws4eesimple/META-INF">
<include name="Hello.wsdl"/>
<include name="HelloMapping.xml"/>
</webinf>
- <fileset dir="${source.resources}/webservice/ws4eesimple">
- <include name="WEB-INF/webservices.xml"/>
- <include name="WEB-INF/web.xml"/>
- </fileset>
+ <webinf dir="${source.resources}/webservice/ws4eesimple/WEB-INF">
+ <include name="webservices.xml"/>
+ <exclude name="web.xml"/>
+ </webinf>
</war>
<!-- build ws4eesimpleclient.jar -->
@@ -3676,7 +3673,7 @@
<include name="META-INF/HelloMapping.xml"/>
</fileset>
</jar>
-
+
<ear destfile="${build.lib}/ws4eesimple.ear" manifest="${build.etc}/manifest.mf"
appxml="${source.resources}/webservice/ws4eesimple/META-INF/application.xml">
<fileset dir="${build.lib}">
@@ -3684,12 +3681,9 @@
<include name="ws4eesimple.war"/>
<include name="ws4eesimpleclient.jar"/>
</fileset>
- <fileset dir="${source.resources}/webservice/ws4eesimple">
- <include name="META-INF/application.xml"/>
- </fileset>
</ear>
- <!-- build ws4eecomplex.ear -->
+ <!-- build ws4eecomplex-ejb.ear -->
<jar destfile="${build.lib}/ws4eecomplex.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/test/webservice/ws4eecomplex/Complex1Bean.class"/>
@@ -3706,31 +3700,36 @@
</fileset>
</jar>
- <ear destfile="${build.lib}/ws4eecomplex.ear" manifest="${build.etc}/manifest.mf"
+ <ear destfile="${build.lib}/ws4eecomplex-ejb.ear" manifest="${build.etc}/manifest.mf"
appxml="${source.resources}/webservice/ws4eecomplex/META-INF/server-ejb-application.xml">
<fileset dir="${build.lib}">
<include name="ws4eecomplex.jar"/>
</fileset>
</ear>
- <!--
+ <!-- build ws4eecomplex-web.ear -->
<war warfile="${build.lib}/ws4eecomplex.war"
- webxml="${source.resources}/webservice/ws4eecomplex/war/WEB-INF/web.xml">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eecomplex/server/war/HelloJavaBean.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/HelloWs.class"/>
- </fileset>
+ webxml="${source.resources}/webservice/ws4eecomplex/WEB-INF/web.xml">
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/webservice/ws4eecomplex/Complex1Ws.class"/>
+ <include name="org/jboss/test/webservice/ws4eecomplex/Complex1WsClientServlet.class"/>
+ <include name="org/jboss/test/webservice/ws4eecomplex/ComplexSer1.class"/>
+ </classes>
<webinf dir="${source.resources}/webservice/ws4eecomplex/META-INF">
- <include name="Hello.wsdl"/>
- <include name="HelloMapping.xml"/>
+ <include name="Complex1.wsdl"/>
+ <include name="Complex1Mapping.xml"/>
+ </webinf>
+ <webinf dir="${source.resources}/webservice/ws4eecomplex/WEB-INF">
+ <include name="webservicesclient.xml"/>
</webinf>
- <fileset dir="${source.resources}/webservice/ws4eecomplex/war">
- <include name="WEB-INF/webservices.xml"/>
- </fileset>
</war>
- -->
-
+ <ear destfile="${build.lib}/ws4eecomplex-web.ear" manifest="${build.etc}/manifest.mf"
+ appxml="${source.resources}/webservice/ws4eecomplex/META-INF/server-web-application.xml">
+ <fileset dir="${build.lib}">
+ <include name="ws4eecomplex.war"/>
+ </fileset>
+ </ear>
</target>
|
