3:57 a.m.
Author: ropalka
Date: 2012-04-10 04:57:22 -0400 (Tue, 10 Apr 2012)
New Revision: 16134
Removed:
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1857/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2285/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2319/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2651/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2949/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2964/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws871/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1857/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1909/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2285/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2319/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2949/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws871/
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2698/SOAPHandler.java
Log:
[JBPAPP-8668] Merged revisions 16065 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r16065 | ropalka | 2012-03-29 11:49:45 +0200 (Thu, 29 Mar 2012) | 1 line
[JBWS-3474] removing JAX-WS tests relying on Native impl. classes
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
-
https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
+
https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16064
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065
Modified:
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
---
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-04-10
08:53:26 UTC (rev 16133)
+++
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-04-10
08:57:22 UTC (rev 16134)
@@ -30,60 +30,17 @@
<mkdir dir="${tests.output.dir}/test-libs" />
- <!-- jaxws-jbws771 -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws771.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws771/*.class" />
- <exclude name="org/jboss/test/ws/jaxws/jbws771/*TestCase.class" />
- </fileset>
- <manifest>
- <attribute name="Dependencies"
value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </jar>
-
- <!-- jaxws-jbws871 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws871-rpc.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"
/>
- <include
name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class" />
- </classes>
- <manifest>
- <attribute name="Dependencies"
value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
- <jar
destfile="${tests.output.dir}/test-libs/jaxws-jbws871-rpc-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"
/>
- <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"
/>
- <include
name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class" />
- </fileset>
- <metainf
dir="${tests.output.dir}/test-resources/jaxws/jbws871/META-INF">
- <include name="application-client.xml" />
- <include name="jboss-client.xml" />
- <include name="jaxrpc-mapping.xml" />
- <include name="wsdl/**" />
- </metainf>
- </jar>
-
<!-- jaxws-jbws1909 -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1909.jar"
manifest="${tests.output.dir}/test-resources/jaxws/jbws1909/META-INF/MANIFEST.MF">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1909.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1909/*.class" />
<exclude name="org/jboss/test/ws/jaxws/jbws1909/*TestCase.class" />
</fileset>
+ <manifest>
+ <attribute name="Dependencies"
value="org.jboss.logging,org.jboss.ws.common"/>
+ </manifest>
</jar>
- <!-- jaxws-jbws2187 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2187.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2187/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2187/TestEndpoint.class"
/>
- <include name="org/jboss/test/ws/jaxws/jbws2187/TestEndpointImpl.class"
/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/jbws2187/WEB-INF">
- <include name="jboss-web.xml" />
- </webinf>
- </war>
-
<!-- jaxws-jbws2221 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2221.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -118,38 +75,6 @@
</webinf>
</war>
- <!-- jaxws-jbws2285 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2285.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2285/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2285/*.class" />
- <exclude name="org/jboss/test/ws/jaxws/jbws2285/JBWS2285TestCase.class"
/>
- <include name="org/jboss/test/ws/jaxws/jbws2285/server-handlers.xml"
/>
- <include name="org/jboss/test/helper/DOMWriter.class" />
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/jbws2285/WEB-INF">
- <include name="jboss-web.xml" />
- </webinf>
- <manifest>
- <attribute name="Dependencies"
value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
- <!-- jaxws-jbws2319 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2319.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2319/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2319/*.class" />
- <exclude name="org/jboss/test/ws/jaxws/jbws2319/JBWS2285TestCase.class"
/>
- <include name="org/jboss/test/ws/jaxws/jbws2319/server-handlers.xml"
/>
- <include name="org/jboss/test/helper/DOMWriter.class" />
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/jbws2319/WEB-INF">
- <include name="jboss-web.xml" />
- </webinf>
- <manifest>
- <attribute name="Dependencies"
value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
<!-- jaxws-jbws2437 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2437.jar"
manifest="${tests.output.dir}/test-resources/jaxws/jbws2437/META-INF/MANIFEST.MF">
<fileset dir="${tests.output.dir}/test-classes">
@@ -158,21 +83,6 @@
</fileset>
</jar>
- <!-- jaxws-jbws2526 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2526.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2526/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2526/*.class" />
- <exclude name="org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.class"
/>
- <include name="org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml"
/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/jbws2526/WEB-INF">
- <include name="wsdl/**" />
- </webinf>
- <manifest>
- <attribute name="Dependencies"
value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
<!-- jaxws-jbws2565 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2565.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -218,9 +128,6 @@
<webinf
dir="${tests.output.dir}/test-resources/jaxws/jbws2698/WEB-INF">
<include name="jboss-web.xml" />
</webinf>
- <manifest>
- <attribute name="Dependencies"
value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
</war>
<!-- jaxws-jbws2706 -->
@@ -257,21 +164,6 @@
</webinf>
</war>
- <!-- jaxws-jbws2949 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2949.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2949/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2949/*.class" />
- <include name="org/jboss/test/ws/jaxws/jbws2949/server-handlers.xml"
/>
- <exclude name="org/jboss/test/ws/jaxws/jbws2949/JBWS2949TestCase.class"
/>
- </classes>
- <webinf
dir="${tests.output.dir}/test-resources/jaxws/jbws2949/WEB-INF">
- <include name="jboss-web.xml" />
- </webinf>
- <manifest>
- <attribute name="Dependencies"
value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
<!-- jaxws-jbws2969 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2969.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2969/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Modified:
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java
===================================================================
---
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2012-04-10
08:53:26 UTC (rev 16133)
+++
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2012-04-10
08:57:22 UTC (rev 16134)
@@ -24,7 +24,6 @@
import java.io.ByteArrayInputStream;
import java.net.URL;
-import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -47,9 +46,9 @@
import junit.framework.Test;
+import org.jboss.ws.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
-import org.jboss.ws.api.util.DOMUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified:
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java
===================================================================
---
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java 2012-04-10
08:53:26 UTC (rev 16133)
+++
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java 2012-04-10
08:57:22 UTC (rev 16134)
@@ -34,6 +34,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.jboss.ws.common.DOMUtils;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
@@ -41,7 +42,6 @@
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.ws.api.util.DOMUtils;
import org.w3c.dom.Element;
@WebService(serviceName = "TestEndpointService", name =
"TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1909")
Modified:
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2698/SOAPHandler.java
===================================================================
---
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2698/SOAPHandler.java 2012-04-10
08:53:26 UTC (rev 16133)
+++
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2698/SOAPHandler.java 2012-04-10
08:57:22 UTC (rev 16134)
@@ -28,10 +28,10 @@
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.soap.SOAPMessageContext;
-import org.jboss.ws.WSException;
import org.jboss.ws.api.handler.GenericSOAPHandler;
/**
@@ -65,7 +65,7 @@
}
catch (SOAPException se)
{
- throw new WSException(se);
+ throw new WebServiceException(se);
}
return true;
}
@@ -85,7 +85,7 @@
}
catch (SOAPException se)
{
- throw new WSException(se);
+ throw new WebServiceException(se);
}
return true;
@@ -96,7 +96,7 @@
String prefix = element.getPrefix();
if (PREFIX.equals(prefix) == false)
{
- throw new WSException("Expected prefix '" + PREFIX + "'
found prefix '" + prefix + "' for element '" +
element.getElementName());
+ throw new WebServiceException("Expected prefix '" + PREFIX +
"' found prefix '" + prefix + "' for element '" +
element.getElementName());
}
}