JBossWS SVN: r15018 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-09-23 07:20:49 -0400 (Fri, 23 Sep 2011)
New Revision: 15018
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java
Log:
enhance test case
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java 2011-09-23 10:40:18 UTC (rev 15017)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java 2011-09-23 11:20:49 UTC (rev 15018)
@@ -28,7 +28,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.RespectBinding;
import javax.xml.ws.WebServiceRef;
+import javax.xml.ws.soap.Addressing;
+import javax.xml.ws.soap.MTOM;
import javax.xml.ws.soap.SOAPBinding;
import org.jboss.logging.Logger;
@@ -38,6 +41,10 @@
*
* @author alessio.soldano(a)jboss.com
*/
+@MTOM
+@RespectBinding
+@Addressing
+@WebServiceRef(name="service/jbws2307service/asdf", type=HelloService.class)
public class ClientServlet extends HttpServlet
{
private Logger log = Logger.getLogger(ClientServlet.class);
12 years, 7 months
JBossWS SVN: r15017 - in stack/native/trunk/modules: resources/src/main/resources/resources and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-09-23 06:40:18 -0400 (Fri, 23 Sep 2011)
New Revision: 15017
Removed:
stack/native/trunk/modules/resources/src/main/resources/modules/javax/
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java
stack/native/trunk/modules/testsuite/pom.xml
Log:
Sorting jaxrpc excludes, enabling passing test, adding some missing Dependencies tags in deployments' manifests, removing installation of javax.xml.rpc.api module (already provided by AS7)
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 2011-09-21 13:44:46 UTC (rev 15016)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-09-23 10:40:18 UTC (rev 15017)
@@ -311,11 +311,6 @@
<include name="**/jbossws-api.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/javax/xml/rpc/api/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jaxrpc-api.jar"/>
- </fileset>
- </copy>
<copy todir="@{targetdir}/org/jboss/xb/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jbossxb.jar"/>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2011-09-21 13:44:46 UTC (rev 15016)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2011-09-23 10:40:18 UTC (rev 15017)
@@ -1945,6 +1945,9 @@
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.common"/>
+ </manifest>
</war>
<jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws812-client.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -2308,6 +2311,9 @@
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
+ </manifest>
</war>
<!-- jaxrpc-jbws1188 -->
@@ -2564,6 +2570,9 @@
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.common"/>
+ </manifest>
</war>
<war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1647-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -2579,6 +2588,9 @@
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.common"/>
+ </manifest>
</war>
<!-- jbossws-jbws1653 -->
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2011-09-21 13:44:46 UTC (rev 15016)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2011-09-23 10:40:18 UTC (rev 15017)
@@ -321,6 +321,9 @@
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.common"/>
+ </manifest>
</war>
<jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-message-client.jar">
<fileset dir="${tests.output.dir}/test-classes">
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2011-09-21 13:44:46 UTC (rev 15016)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2011-09-23 10:40:18 UTC (rev 15017)
@@ -22,7 +22,6 @@
package org.jboss.test.ws.jaxrpc.jbws1186;
import java.io.ByteArrayInputStream;
-import java.io.File;
import java.net.URL;
import javax.xml.namespace.QName;
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-09-21 13:44:46 UTC (rev 15016)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-09-23 10:40:18 UTC (rev 15017)
@@ -1027,12 +1027,141 @@
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
<!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
- <exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+
+ <!-- # appclient & jaxrpc client issues -->
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase*</exclude>
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude>
+
+ <!-- # webservices-description in jboss-web.xml / jboss.xml -->
+ <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude>
+
+ <!-- # unpackaged EAR deployment failure -->
+ <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude>
+
+ <!-- # javaType [javax.xml.transform.Source] is not assignable from attachment content: java.lang.String -->
+ <exclude>org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase*</exclude>
+
</excludes>
</configuration>
</plugin>
12 years, 7 months
JBossWS SVN: r15016 - common/trunk/src/main/java/org/jboss/ws/common/serviceref.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-09-21 09:44:46 -0400 (Wed, 21 Sep 2011)
New Revision: 15016
Modified:
common/trunk/src/main/java/org/jboss/ws/common/serviceref/ServiceRefSerializer.java
Log:
[JBWS-3360] fixing WS ref deserialization process - always consider TCCL
Modified: common/trunk/src/main/java/org/jboss/ws/common/serviceref/ServiceRefSerializer.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/serviceref/ServiceRefSerializer.java 2011-09-21 13:16:04 UTC (rev 15015)
+++ common/trunk/src/main/java/org/jboss/ws/common/serviceref/ServiceRefSerializer.java 2011-09-21 13:44:46 UTC (rev 15016)
@@ -24,8 +24,10 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
import java.util.ResourceBundle;
import javax.naming.NamingException;
@@ -73,7 +75,7 @@
try
{
final ByteArrayInputStream bais = new ByteArrayInputStream(data);
- final ObjectInputStream ois = new ObjectInputStream(bais);
+ final ObjectInputStream ois = new TCCLAwareObjectInputStream(bais);
sref = (UnifiedServiceRefMetaData) ois.readObject();
ois.close();
}
@@ -88,4 +90,32 @@
return sref;
}
+
+ private static final class TCCLAwareObjectInputStream extends ObjectInputStream
+ {
+ private TCCLAwareObjectInputStream(final InputStream in) throws IOException
+ {
+ super(in);
+ }
+
+ @Override
+ public Class<?> resolveClass(final ObjectStreamClass desc) throws IOException, ClassNotFoundException
+ {
+ try
+ {
+ final ClassLoader currentThreadLoader = Thread.currentThread().getContextClassLoader();
+ if (currentThreadLoader != null)
+ {
+ return currentThreadLoader.loadClass(desc.getName());
+ }
+ }
+ catch (Exception e)
+ {
+ // ignore
+ }
+
+ return super.resolveClass(desc);
+ }
+ }
+
}
12 years, 7 months
JBossWS SVN: r15015 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-09-21 09:16:04 -0400 (Wed, 21 Sep 2011)
New Revision: 15015
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java
Log:
fix test security setup
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2011-09-20 15:54:26 UTC (rev 15014)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2011-09-21 13:16:04 UTC (rev 15015)
@@ -42,7 +42,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(WebServiceRefSecTestCase.class, "jaxws-samples-webservicerefsec.jar");
+ return new JBossWSTestSetup(WebServiceRefSecTestCase.class, "jaxws-samples-webservicerefsec.jar", !isTargetJBoss6());
}
public void testServletClient() throws Exception
12 years, 7 months
JBossWS SVN: r15014 - common/trunk/src/main/java/org/jboss/ws/common/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-09-20 11:54:26 -0400 (Tue, 20 Sep 2011)
New Revision: 15014
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
Log:
[JBWS-3288] Prevent double slash in endpoint addresses when using "/" context-root
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2011-09-19 11:22:26 UTC (rev 15013)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2011-09-20 15:54:26 UTC (rev 15014)
@@ -99,7 +99,7 @@
urlPattern = urlPattern.substring(0, urlPattern.length() - 2);
protocol = confidential ? "https://" : "http://";
- String address = protocol + hostAndPort + contextRoot + urlPattern;
+ String address = protocol + hostAndPort + (contextRoot.equals("/") && urlPattern.startsWith("/") ? "" : contextRoot) + urlPattern;
httpEp.setAddress(address);
//JBWS-2957: EJB3 binds the same endpoint class to multiple beans at multiple JNDI locations;
//generally speaking we can't have multiple endpoints published at the same address and we
12 years, 7 months
JBossWS SVN: r15013 - hudson/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-09-19 07:22:26 -0400 (Mon, 19 Sep 2011)
New Revision: 15013
Modified:
hudson/trunk/ant.properties.example
Log:
AS 7.1.0 builds to Alpha2 snapshot
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2011-09-15 15:10:03 UTC (rev 15012)
+++ hudson/trunk/ant.properties.example 2011-09-19 11:22:26 UTC (rev 15013)
@@ -34,7 +34,7 @@
hudson.jboss700.rev=7.0.0.Final
hudson.jboss710.url=https://github.com/jbossas/jboss-as
-hudson.jboss710.build=jboss-as-7.1.0.Alpha1-SNAPSHOT
+hudson.jboss710.build=jboss-as-7.1.0.Alpha2-SNAPSHOT
hudson.jboss710.rev=master
hudson.mail.recipients=
12 years, 7 months
JBossWS SVN: r15012 - in stack/cxf/trunk/modules: resources/src/main/resources/resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-09-15 11:10:03 -0400 (Thu, 15 Sep 2011)
New Revision: 15012
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
Properly configure when to replace ASIL libraries during stack (un)deploy
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-09-15 14:34:58 UTC (rev 15011)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-09-15 15:10:03 UTC (rev 15012)
@@ -142,7 +142,7 @@
<target name="undeploy-jboss700" depends="target-jboss700,init" description="Remove jbossws from jboss700">
<fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss700.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss700.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
@@ -192,7 +192,7 @@
<target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710">
<fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
</target>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-09-15 14:34:58 UTC (rev 15011)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-09-15 15:10:03 UTC (rev 15012)
@@ -511,6 +511,7 @@
<macrodef name="macro-undeploy-jbossws-modules">
<attribute name="defaultmodulesconf"/>
<attribute name="targetdir"/>
+ <attribute name="modifyjbossintegration"/>
<sequential>
<loadfile property="jbossws.modules.conf" srcfile="@{targetdir}/modules/org/jboss/as/webservices/jbossws-modules.conf" failonerror="false"/>
@@ -521,9 +522,11 @@
<delete includeemptydirs="true" verbose="true">
<fileset dir="${jboss.modules}">
<include name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/>
- <include name="**/org/jboss/as/webservices/main/*7.0.0.Final*"/>
</fileset>
</delete>
+ <antcall target="remove-jboss-integration-module">
+ <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/>
+ </antcall>
<!-- delete content of last deployment -->
<delete includeemptydirs="true" verbose="true">
@@ -594,6 +597,14 @@
</delete>
</target>
+ <target name="remove-jboss-integration-module" depends="process-jboss-integration" if="fixintegration">
+ <delete verbose="true">
+ <fileset dir="${jboss.modules}">
+ <include name="**/org/jboss/as/webservices/main/jboss-as-webservices-server-integration*"/>
+ </fileset>
+ </delete>
+ </target>
+
<target name="remove-native-core-from-client-and-common" if="removenativecoreprop">
<delete verbose="true">
<fileset dir="${jboss.home}/client">
12 years, 7 months
JBossWS SVN: r15011 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-09-15 10:34:58 -0400 (Thu, 15 Sep 2011)
New Revision: 15011
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3352] Fixing and enabling tests
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2011-09-15 13:39:41 UTC (rev 15010)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2011-09-15 14:34:58 UTC (rev 15011)
@@ -33,7 +33,7 @@
public class MixedTypeTestCase extends JBossWSTest
{
- private final String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-mixtype";
+ private final String endpointURL = "http://" + getServerHost() + ":8080/mixtype/jaxws-cxf-mixtype";
private final String ejbEndpointURL = "http://" + getServerHost() + ":8080/mixtype/EJBServiceOne/EJBEndpointOne";
private String targetNS = "http://org.jboss.ws.jaxws.cxf/mixtype";
@@ -45,14 +45,12 @@
public void testEndpoint() throws Exception
{
-
URL wsdlOneURL = new URL(endpointURL + "?wsdl");
QName serviceOneName = new QName(targetNS, "ServiceOne");
Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
- EndpointOne endpoint = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+ EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EndpointOnePort"), EndpointOne.class);
assertEquals("mixedType", endpoint.echo("mixedType"));
-
-
+ assertEquals(1, endpoint.getCount());
}
public void testEJBEndpoint() throws Exception
@@ -60,8 +58,9 @@
URL wsdlOneURL = new URL(ejbEndpointURL + "?wsdl");
QName serviceOneName = new QName(targetNS, "EJBServiceOne");
Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
- EndpointOne endpoint = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+ EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EJBEndpointOnePort"), EndpointOne.class);
assertEquals("mixedType", endpoint.echo("mixedType"));
+ assertEquals(1, endpoint.getCount());
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml 2011-09-15 13:39:41 UTC (rev 15010)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml 2011-09-15 14:34:58 UTC (rev 15011)
@@ -4,8 +4,13 @@
http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'>
- <jaxws:endpoint id='EndpointService' address='http://@jboss.bind.address@:8080/jaxws-cxf-mixtype'
+ <!-- Please note the context-root / path needs to match the values specified in the web.xml / jboss-web.xml descriptors -->
+ <jaxws:endpoint id='EndpointService' address='http://@jboss.bind.address@:8080/mixtype/jaxws-cxf-mixtype'
implementor='org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl'>
</jaxws:endpoint>
+ <jaxws:endpoint id='EJBEndpointService' address='http://@jboss.bind.address@:8080/mixtype/EJBServiceOne/EJBEndpointOne'
+ implementor='org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneEJB3Impl'>
+ </jaxws:endpoint>
+
</beans>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml 2011-09-15 13:39:41 UTC (rev 15010)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml 2011-09-15 14:34:58 UTC (rev 15011)
@@ -9,6 +9,6 @@
</servlet>
<servlet-mapping>
<servlet-name>Ep1Servlet</servlet-name>
- <url-pattern>/ServiceOne/EndpointOne</url-pattern>
+ <url-pattern>/jaxws-cxf-mixtype</url-pattern>
</servlet-mapping>
</web-app>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2011-09-15 13:39:41 UTC (rev 15010)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2011-09-15 14:34:58 UTC (rev 15011)
@@ -22,6 +22,7 @@
package org.jboss.test.ws.jaxws.cxf.mixtype;
import java.net.URL;
+import java.util.Iterator;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -49,10 +50,9 @@
URL wsdlOneURL = new URL(endpointURL + "?wsdl");
QName serviceOneName = new QName(targetNS, "ServiceOne");
Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
- EndpointOne endpoint = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+ EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EndpointOnePort"), EndpointOne.class);
assertEquals("mixedType", endpoint.echo("mixedType"));
-
-
+ assertEquals(1, endpoint.getCount());
}
public void testEJBEndpoint() throws Exception
@@ -60,8 +60,9 @@
URL wsdlOneURL = new URL(ejbEndpointURL + "?wsdl");
QName serviceOneName = new QName(targetNS, "EJBServiceOne");
Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
- EndpointOne endpoint = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+ EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EJBEndpointOnePort"), EndpointOne.class);
assertEquals("mixedType", endpoint.echo("mixedType"));
+ assertEquals(1, endpoint.getCount());
}
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-09-15 13:39:41 UTC (rev 15010)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-09-15 14:34:58 UTC (rev 15011)
@@ -736,9 +736,6 @@
<!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
- <!-- # Mixed type deployment -->
- <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/**</exclude>
-
</excludes>
</configuration>
</plugin>
@@ -913,9 +910,6 @@
<!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
- <!-- # Mixed type deployment -->
- <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/**</exclude>
-
</excludes>
</configuration>
</plugin>
@@ -1104,9 +1098,6 @@
<!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
<exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
- <!-- # Mixed type deployment -->
- <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/**</exclude>
-
</excludes>
</configuration>
</plugin>
@@ -1294,8 +1285,6 @@
<!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude>
- <!-- # Mixed type deployment -->
- <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/**</exclude>
</excludes>
</configuration>
</plugin>
12 years, 7 months
JBossWS SVN: r15010 - container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-09-15 09:39:41 -0400 (Thu, 15 Sep 2011)
New Revision: 15010
Modified:
container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataCreator.java
Log:
Use merged jbossweb metadata, as on AS 7 master (this prevent messing up with jbossweb metadata when ejb3 endpoints are found in war archives)
Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataCreator.java 2011-09-13 13:49:24 UTC (rev 15009)
+++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataCreator.java 2011-09-15 13:39:41 UTC (rev 15010)
@@ -73,7 +73,7 @@
void create(final Deployment dep) {
final DeploymentUnit unit = WSHelper.getRequiredAttachment(dep, DeploymentUnit.class);
WarMetaData warMD = ASHelper.getOptionalAttachment(unit, WarMetaData.ATTACHMENT_KEY);
- JBossWebMetaData jbossWebMD = warMD != null ? warMD.getJbossWebMetaData() : null;
+ JBossWebMetaData jbossWebMD = warMD != null ? warMD.getMergedJBossWebMetaData() : null;
if (warMD == null) {
warMD = new WarMetaData();
12 years, 7 months
JBossWS SVN: r15009 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-09-13 09:49:24 -0400 (Tue, 13 Sep 2011)
New Revision: 15009
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBTM-882] workaround issue
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-09-13 13:49:04 UTC (rev 15008)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-09-13 13:49:24 UTC (rev 15009)
@@ -1129,6 +1129,12 @@
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-transactions</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
12 years, 7 months