[jbossws-commits] JBossWS SVN: r3558 - in trunk/jbossws-core: src/test/resources/interop/root and 1 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Jun 13 04:04:57 EDT 2007
Author: heiko.braun at jboss.com
Date: 2007-06-13 04:04:57 -0400 (Wed, 13 Jun 2007)
New Revision: 3558
Added:
trunk/jbossws-core/src/test/resources/interop/root/META-INF/
trunk/jbossws-core/src/test/resources/interop/root/META-INF/application.xml
Removed:
trunk/jbossws-core/ant-import-tests/build-interop-jars.xml
Modified:
trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
trunk/jbossws-core/src/test/resources/interop/root/index.html
Log:
Create an EAR file from interop endpoints
Deleted: trunk/jbossws-core/ant-import-tests/build-interop-jars.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-interop-jars.xml 2007-06-12 18:22:50 UTC (rev 3557)
+++ trunk/jbossws-core/ant-import-tests/build-interop-jars.xml 2007-06-13 08:04:57 UTC (rev 3558)
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
-<!-- $Id$ -->
-
-<project name="JBossWS">
-
- <description>JBossWS test archive builder</description>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="build-interop-jars">
-
- <mkdir dir="${build.tests.dir}/libs/"/>
-
- <!-- Root.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-root.war"
- webxml="${test.resources.dir}/interop/microsoft/root/WEB-INF/web.xml">
- <webinf dir="${test.resources.dir}/interop/microsoft/root/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/root">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- BaseDataTypesDocLitB client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitB-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**.*"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- BaseDataTypesDocLitB_Service.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitB_Service.war"
- webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**.*"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- BaseDataTypesDocLitW client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitW-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- BaseDataTypesRpcLit client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesRpcLit-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- ComplexDataTypesDocLitB client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- ComplexDataTypesDocLitW client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- ComplexDataTypesRpcLit client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- BaseDataTypesDocLitW_Service.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitW_Service.war"
- webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- BaseDataTypesRpcLit_Service.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesRpcLit_Service.war"
- webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- ComplexDataTypesDocLitB_Service.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB_Service.war"
- webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- ComplexDataTypesDocLitW_Service.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW_Service.war"
- webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- ComplexDataTypesRpcLit_Service.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit_Service.war"
- webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- mtom-utf8.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8.war"
- webxml="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**.*"/>
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/mtom/utf8">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- mtom-utf8 client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
- <!-- mtom-utf8_wsse-sign.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-mtomUTF8_wsse.war"
- webxml="${test.resources.dir}/interop/microsoft/mtom/utf8/wsse/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
-
- <webinf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**.*"/>
- </webinf>
- <webinf dir="${test.resources.dir}/interop/microsoft/security/wsse10Shared/META-INF">
- <include name="alice.jks"/>
- <include name="wsse10.truststore"/>
- </webinf>
-
- <webinf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/wsse/WEB-INF">
- <include name="jboss-wsse-server.xml"/>
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/mtom/utf8">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- mtom-utf8_wsse-sign client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-mtomUTF8_wsse-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/security/wsse10Shared/META-INF">
- <include name="alice.jks"/>
- <include name="wsse10.truststore"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/wsse/META-INF">
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- <include name="application-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
- </target>
-
-</project>
\ No newline at end of file
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 18:22:50 UTC (rev 3557)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-13 08:04:57 UTC (rev 3558)
@@ -439,7 +439,7 @@
</target>
<target name="build-interop-jars">
-
+
<!-- Root.war -->
<war warfile="${tests.output.dir}/libs/jbossws-interop-root.war"
webxml="${tests.output.dir}/resources/interop/root/WEB-INF/web.xml">
@@ -573,6 +573,11 @@
<metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF"/>
</jar>
+ <!-- wrap up in an *.ear for easier deployment -->
+ <ear destfile="${tests.output.dir}/libs/jbossws-interop.ear" appxml="${tests.output.dir}/resources/interop/root/META-INF/application.xml">
+ <fileset dir="${tests.output.dir}/libs" includes="*interop*.war"/>
+ </ear>
+
</target>
</project>
Added: trunk/jbossws-core/src/test/resources/interop/root/META-INF/application.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/interop/root/META-INF/application.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/interop/root/META-INF/application.xml 2007-06-13 08:04:57 UTC (rev 3558)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
+ version="1.4">
+
+ <display-name>JBossWS Interop Endpoints</display-name>
+
+ <module>
+ <web>
+ <web-uri>jbossws-interop-root.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>jbossws-interop-BaseDataTypesDocLitB.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>jbossws-interop-BaseDataTypesDocLitW.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>jbossws-interop-BaseDataTypesRpcLit.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>jbossws-interop-wsa10.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>jbossws-interop-wsse10Encrypt.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>jbossws-interop-wsse10Sign.war</web-uri>
+ </web>
+ </module>
+</application>
Property changes on: trunk/jbossws-core/src/test/resources/interop/root/META-INF/application.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/src/test/resources/interop/root/index.html
===================================================================
--- trunk/jbossws-core/src/test/resources/interop/root/index.html 2007-06-12 18:22:50 UTC (rev 3557)
+++ trunk/jbossws-core/src/test/resources/interop/root/index.html 2007-06-13 08:04:57 UTC (rev 3558)
@@ -5,7 +5,7 @@
<body>
<table border=0>
<tr valign=bottom>
- <td><a href="http://jboss.org"><img src="logo.gif" border="0"></a></td>
+ <td><a href="/interop"><img src="logo.gif" border="0"></a></td>
<td><a href="/interop"><h2>JBossWS / WCF interop </h2></a></td>
</tr>
<tr valign=bottom>
More information about the jbossws-commits
mailing list