JBossWS SVN: r7620 - stack/cxf/tags.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-18 02:53:31 -0400 (Wed, 18 Jun 2008)
New Revision: 7620
Added:
stack/cxf/tags/jbossws-cxf-3.0.0.GA/
Removed:
stack/cxf/tags/jbossws-3.0-cxf-1.0.0.GA/
Log:
Rename jbossws-3.0-cxf-1.0.0.GA to jbossws-cxf-3.0.0.GA
Copied: stack/cxf/tags/jbossws-cxf-3.0.0.GA (from rev 7619, stack/cxf/tags/jbossws-3.0-cxf-1.0.0.GA)
16 years, 7 months
JBossWS SVN: r7619 - stack/metro/tags.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-18 02:51:39 -0400 (Wed, 18 Jun 2008)
New Revision: 7619
Added:
stack/metro/tags/jbossws-metro-3.0.1.GA/
Removed:
stack/metro/tags/jbossws-3.0.1-metro-1.0.1.GA/
Log:
Rename jbossws-3.0.1-metro-1.0.1.GA to jbossws-metro-3.0.0.GA
Copied: stack/metro/tags/jbossws-metro-3.0.1.GA (from rev 7618, stack/metro/tags/jbossws-3.0.1-metro-1.0.1.GA)
16 years, 7 months
JBossWS SVN: r7618 - stack/metro/tags.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-18 02:51:15 -0400 (Wed, 18 Jun 2008)
New Revision: 7618
Added:
stack/metro/tags/jbossws-metro-3.0.0.GA/
Removed:
stack/metro/tags/jbossws-3.0-metro-1.0.0.GA/
Log:
Rename jbossws-3.0-metro-1.0.0.GA to jbossws-metro-3.0.0.GA
Copied: stack/metro/tags/jbossws-metro-3.0.0.GA (from rev 7617, stack/metro/tags/jbossws-3.0-metro-1.0.0.GA)
16 years, 7 months
JBossWS SVN: r7617 - stack/native/tags.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-18 02:48:54 -0400 (Wed, 18 Jun 2008)
New Revision: 7617
Added:
stack/native/tags/jbossws-native-3.0.1.GA/
Removed:
stack/native/tags/jbossws-3.0.1-native-2.0.4.GA/
Log:
Rename jbossws-3.0.1-native-2.0.4.GA to jbossws-native-3.0.1.GA
Copied: stack/native/tags/jbossws-native-3.0.1.GA (from rev 7616, stack/native/tags/jbossws-3.0.1-native-2.0.4.GA)
16 years, 7 months
JBossWS SVN: r7616 - in stack/native/trunk/modules/resources: src/main and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-06-17 16:00:51 -0400 (Tue, 17 Jun 2008)
New Revision: 7616
Added:
stack/native/trunk/modules/resources/src/main/scripts/
stack/native/trunk/modules/resources/src/main/scripts/zip-other-configs.xml
Modified:
stack/native/trunk/modules/resources/pom.xml
Log:
[JBWS-2228] include other modules artifacts
Modified: stack/native/trunk/modules/resources/pom.xml
===================================================================
--- stack/native/trunk/modules/resources/pom.xml 2008-06-17 20:00:00 UTC (rev 7615)
+++ stack/native/trunk/modules/resources/pom.xml 2008-06-17 20:00:51 UTC (rev 7616)
@@ -14,4 +14,28 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <!-- plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="src/main/scripts/zip-other-configs.xml">
+ <property name="project.build.finalName" value="${project.build.finalName}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added: stack/native/trunk/modules/resources/src/main/scripts/zip-other-configs.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/scripts/zip-other-configs.xml (rev 0)
+++ stack/native/trunk/modules/resources/src/main/scripts/zip-other-configs.xml 2008-06-17 20:00:51 UTC (rev 7616)
@@ -0,0 +1,29 @@
+<?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 default="main">
+
+ <property name="target.dir" value="${basedir}/target"/>
+ <property name="source.jar" value="${target.dir}/${project.build.finalName}-sources.jar"/>
+ <property name="binary.jar" value="${target.dir}/${project.build.finalName}.jar"/>
+
+ <target name="main">
+ <copy todir="${target.dir}/classes/resources">
+ <fileset dir="${basedir}/../core/target/resources"/>
+ <fileset dir="${basedir}/../client/src/main/resources/META-INF"/>
+ </copy>
+ <jar destfile="${source.jar}" basedir="${target.dir}/classes" update="true"/>
+ <jar destfile="${binary.jar}" basedir="${target.dir}/classes" update="true"/>
+ </target>
+
+</project>
Property changes on: stack/native/trunk/modules/resources/src/main/scripts/zip-other-configs.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 7 months
JBossWS SVN: r7615 - in stack/native/trunk: src/main/distro and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-06-17 16:00:00 -0400 (Tue, 17 Jun 2008)
New Revision: 7615
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/src/main/distro/build-deploy.xml
Log:
[JBWS-2228] fix deploy macros
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-17 18:22:11 UTC (rev 7614)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-17 20:00:00 UTC (rev 7615)
@@ -138,49 +138,6 @@
</macrodef>
<!-- ================================================================== -->
- <!-- Deploy Deployers -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deployers50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-(a){jbossid}.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-deployer-beans.xml"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Deploy -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deploy50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-(a){jbossid}-container.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
@@ -260,7 +217,7 @@
<mkdir dir="@{targetdir}"/>
<unzip dest="@{targetdir}">
<fileset dir="@{thirdpartydir}">
- <include name="juddi-service.sar"/>
+ <include name="**/juddi-service.sar"/>
</fileset>
</unzip>
</sequential>
@@ -271,13 +228,14 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-jbossws-sar42">
+ <attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true">
- <fileset dir="@{artifactsdir}/lib">
+ <fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.service.lib.patternset"/>
<include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
@@ -286,7 +244,7 @@
</fileset>
</copy>
<unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{artifactsdir}/lib">
+ <fileset dir="@{thirdpartydir}">
<include name="**/jbossws-native-management.war"/>
</fileset>
</unzip>
@@ -305,18 +263,19 @@
</macrodef>
<macrodef name="macro-deploy-jbossws-sar50">
+ <attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/lib">
+ <fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.service.lib.patternset"/>
</fileset>
</copy>
<unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{artifactsdir}/lib">
+ <fileset dir="@{thirdpartydir}">
<include name="**/jbossws-native-management.war"/>
</fileset>
</unzip>
@@ -338,13 +297,14 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-jbossws-deployers50">
+ <attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/lib">
+ <fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
<include name="**/jbossws-(a){jbossid}.jar"/>
@@ -368,12 +328,11 @@
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}/jbossws.sar" src="@{thirdpartydir}/jbossws-(a){jbossid}-container.jar">
- <patternset>
- <include name="META-INF/jbossws-container-beans.xml"/>
- </patternset>
- </unzip>
- <move file="@{targetdir}/jbossws.sar/META-INF/jbossws-container-beans.xml" todir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-(a){jbossid}-container.jar"/>
+ </fileset>
+ </copy>
</sequential>
</macrodef>
@@ -385,27 +344,33 @@
<available classname="java.io.Console" property="HAVE_JDK_1.6"/>
<target name="deploy-jbossws-native42" depends="deploy-jbossws-endorsed">
+ <fail message="artifactsdir must be specified" unless="artifactsdir"/>
+ <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
+ <fail message="installserver must be specified" unless="installserver"/>
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/>
- <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${artifactsdir}/lib"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
<target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed">
+ <fail message="artifactsdir must be specified" unless="artifactsdir"/>
+ <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
+ <fail message="installserver must be specified" unless="installserver"/>
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/>
- <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${artifactsdir}/lib"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
<target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${artifactsdir}/lib"/>
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
</target>
<!-- ================================================================== -->
Modified: stack/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml 2008-06-17 18:22:11 UTC (rev 7614)
+++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-06-17 20:00:00 UTC (rev 7615)
@@ -23,6 +23,7 @@
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
@@ -116,6 +117,7 @@
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
16 years, 7 months
JBossWS SVN: r7614 - in stack/native/branches/dlofthouse/JBPAPP-890: src/test/java/org/jboss/test/ws/jaxrpc/jbws1762 and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-17 14:22:11 -0400 (Tue, 17 Jun 2008)
New Revision: 7614
Modified:
stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxrpc.xml
stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java
stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java
stack/native/branches/dlofthouse/JBPAPP-890/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml
Log:
Modifications to tests to run against JBoss EAP and reproduce the correct failure.
Modified: stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxrpc.xml
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxrpc.xml 2008-06-17 16:49:48 UTC (rev 7613)
+++ stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxrpc.xml 2008-06-17 18:22:11 UTC (rev 7614)
@@ -2575,7 +2575,78 @@
<include name="wsdl/**"/>
</metainf>
</jar>
+
+ <!-- jaxrpc-jbws1762 -->
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Iface.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Bean.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="ejb-jar.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/packaged">
+ <include name="jboss.xml"/>
+ </metainf>
+ </jar>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/>
+ <unjar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/>
+ <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar/META-INF"
+ file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/exploded/jboss.xml" overwrite="true"/>
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOBean.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/>
+ <unwar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/>
+
+ <ear jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.ear"
+ appxml="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/packaged/application.xml">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxrpc-jbws1762-packaged.jar"/>
+ <include name="jaxrpc-jbws1762-packaged.war"/>
+ </fileset>
+ </ear>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear"/>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/META-INF"/>
+ <copy file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml"
+ todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/META-INF"/>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war"/>
+ <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war">
+ <fileset dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/>
+ </copy>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar"/>
+ <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar">
+ <fileset dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/>
+ </copy>
+
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.sar">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxrpc-jbws1762-packaged.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ </jar>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar"/>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/>
+ <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"
+ file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml"/>
+ <unwar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war"
+ dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/jaxrpc-jbws1762-exploded.war"/>
+
<!-- jaxrpc-jbws1792 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1792.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1792/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxws.xml 2008-06-17 16:49:48 UTC (rev 7613)
+++ stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxws.xml 2008-06-17 18:22:11 UTC (rev 7614)
@@ -366,7 +366,53 @@
<include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.class"/>
</classes>
- </war>
+ </war>
+
+ <!-- jaxws-jbws1762 -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.class"/>
+ </fileset>
+ </jar>
+ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/>
+ <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/>
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/>
+ <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.sar">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxws-jbws1762-packaged.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ </jar>
+ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/>
+ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/>
+ <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/>
+ <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.ear">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxws-jbws1762-packaged.jar"/>
+ <include name="jaxws-jbws1762-packaged.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/packaged">
+ <include name="application.xml"/>
+ </metainf>
+ </jar>
+ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/>
+ <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
+ <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
+ <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/>
+ <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/>
<!-- jaxws-jbws1798 -->
<war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF/web.xml">
Modified: stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java 2008-06-17 16:49:48 UTC (rev 7613)
+++ stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java 2008-06-17 18:22:11 UTC (rev 7614)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxrpc.jbws1762;
+import java.io.File;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -46,7 +47,7 @@
protected void setUp() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation());
- URL mappingURL = getResourceURL("jaxrpc/jbws1762/META-INF/jaxrpc-mapping.xml");
+ URL mappingURL = new File("resources/jaxrpc/jbws1762/META-INF/jaxrpc-mapping.xml").toURL();
QName serviceName = new QName("http://org.jboss.test.webservice/jbws1762", "EJB2Bean");
ServiceFactoryImpl factory = new ServiceFactoryImpl();
Modified: stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java 2008-06-17 16:49:48 UTC (rev 7613)
+++ stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java 2008-06-17 18:22:11 UTC (rev 7614)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxrpc.jbws1762;
+import java.io.File;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -48,7 +49,7 @@
{
ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance();
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation());
- URL mappingURL = getResourceURL("jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml");
+ URL mappingURL = new File("resources/jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml").toURL();
QName serviceName = new QName("http://org.jboss.test.ws/jbws1762", "POJOBean");
Service service = factory.createService(wsdlURL, serviceName, mappingURL);
Modified: stack/native/branches/dlofthouse/JBPAPP-890/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml
===================================================================
--- stack/native/branches/dlofthouse/JBPAPP-890/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2008-06-17 16:49:48 UTC (rev 7613)
+++ stack/native/branches/dlofthouse/JBPAPP-890/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2008-06-17 18:22:11 UTC (rev 7614)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
<servlet>
<servlet-name>POJOBean</servlet-name>
- <servlet-class>@endpoint.servlet@</servlet-class>
+ <servlet-class>org.jboss.wsf.stack.jbws.EndpointServlet</servlet-class>
<init-param>
<param-name>jboss.ws.endpoint</param-name>
<param-value>org.jboss.test.ws.jaxws.jbws1762.services.POJOBean</param-value>
16 years, 7 months
JBossWS SVN: r7613 - stack/native/branches/dlofthouse/JBPAPP-890/src/test/resources/jaxws.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-17 12:49:48 -0400 (Tue, 17 Jun 2008)
New Revision: 7613
Added:
stack/native/branches/dlofthouse/JBPAPP-890/src/test/resources/jaxws/jbws1762/
Log:
Branch existing test.
Copied: stack/native/branches/dlofthouse/JBPAPP-890/src/test/resources/jaxws/jbws1762 (from rev 7612, framework/trunk/testsuite/test/resources/jaxws/jbws1762)
16 years, 7 months
JBossWS SVN: r7612 - stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxws.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-17 12:48:35 -0400 (Tue, 17 Jun 2008)
New Revision: 7612
Added:
stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxws/jbws1762/
Log:
Branch existing test.
Copied: stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxws/jbws1762 (from rev 7611, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1762)
16 years, 7 months
JBossWS SVN: r7611 - stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-17 12:22:55 -0400 (Tue, 17 Jun 2008)
New Revision: 7611
Added:
stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/
Log:
Branch latest test.
Copied: stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762 (from rev 7610, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762)
16 years, 7 months