JBossWS SVN: r14014 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-04-06 05:10:53 -0400 (Wed, 06 Apr 2011)
New Revision: 14014
Added:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6228/
Log:
[JBPAPP-6228]:Create branch to apply the fix
13 years
- 1
- 0
JBossWS SVN: r14013 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-04-06 04:36:00 -0400 (Wed, 06 Apr 2011)
New Revision: 14013
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/wsf.png
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBWS-3250]:Add test case
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-06 07:57:02 UTC (rev 14012)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-06 08:36:00 UTC (rev 14013)
@@ -658,6 +658,14 @@
<include name="wsse.keystore" />
</metainf>
</jar>
+
+ <!-- jaxws-jbws3250 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3250/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3250/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws3250/*TestCase*.class" />
+ </classes>
+ </war>
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java 2011-04-06 08:36:00 UTC (rev 14013)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3250;
+
+import javax.jws.WebService;
+
+@WebService(name = "TestEndpoint", targetNamespace = "http://ws.jboss.org/jbws3250")
+public interface Endpoint
+{
+ public MTOMResponse echo(MTOMRequest message);
+
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java 2011-04-06 08:36:00 UTC (rev 14013)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3250;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.BindingType;
+
+
+@WebService(
+ name = "TestEndpoint",
+ targetNamespace = "http://ws.jboss.org/jbws3250",
+ serviceName = "TestEndpointService",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3250.Endpoint")
+@SOAPBinding(style = SOAPBinding.Style.RPC,
+ use = SOAPBinding.Use.LITERAL)
+@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
+
+public class EndpointImpl implements Endpoint
+{
+ public MTOMResponse echo(MTOMRequest message) {
+ MTOMResponse response = new MTOMResponse();
+ response.setContent(message.getContent());
+ response.setResponse("Response for requestID:" + message.getId());
+ return response;
+ }
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java 2011-04-06 08:36:00 UTC (rev 14013)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3250;
+
+import java.net.URL;
+
+import javax.activation.DataHandler;
+import javax.activation.URLDataSource;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPBinding;
+
+import junit.framework.Assert;
+import junit.framework.Test;
+
+import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+public class JBWS3250TestCase extends JBossWSTest
+{
+ private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3250";
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS3250TestCase.class, "jaxws-jbws3250.war");
+ }
+
+ public void testMtomSawpFile() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://ws.jboss.org/jbws3250", "TestEndpointService");
+ Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
+ SOAPBinding binding =(SOAPBinding)((BindingProvider)port).getBinding();
+ binding.setMTOMEnabled(true);
+ URL url = JBossWSTestHelper.getResourceURL("jaxws/jbws3250/wsf.png");
+ URLDataSource urlDatasource = new URLDataSource(url);
+ javax.activation.DataHandler dh = new DataHandler(urlDatasource);
+ MTOMRequest request = new MTOMRequest();
+ request.setContent(dh);
+ request.setId("largeSize_mtom_request");
+ MTOMResponse mtomResponse = port.echo(request);
+ Assert.assertEquals("Response for requestID:largeSize_mtom_request", mtomResponse.getResponse());
+ byte[] responseBytes = IOUtils.convertToBytes(mtomResponse.getContent());
+ Assert.assertTrue(responseBytes.length > 65536);
+ }
+
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java 2011-04-06 08:36:00 UTC (rev 14013)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3250;
+
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlMimeType;
+
+public class MTOMRequest
+{
+ private DataHandler content;
+
+ private String id;
+
+ @XmlMimeType("*/*")
+ public DataHandler getContent()
+ {
+ return content;
+ }
+
+ public void setContent(DataHandler content)
+ {
+ this.content = content;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+}
\ No newline at end of file
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java 2011-04-06 08:36:00 UTC (rev 14013)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws3250;
+
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlMimeType;
+
+public class MTOMResponse
+{
+ private DataHandler content;
+
+ private String response;
+
+ @XmlMimeType("*/*")
+ public DataHandler getContent()
+ {
+ return content;
+ }
+
+ public void setContent(DataHandler content)
+ {
+ this.content = content;
+ }
+
+ public String getResponse()
+ {
+ return response;
+ }
+
+ public void setResponse(String res)
+ {
+ this.response = res;
+ }
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml 2011-04-06 08:36:00 UTC (rev 14013)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" 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/web-app_2_4.xsd">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws3250.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/wsf.png
===================================================================
(Binary files differ)
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/wsf.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years
- 1
- 0
JBossWS SVN: r14012 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-06 03:57:02 -0400 (Wed, 06 Apr 2011)
New Revision: 14012
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Excluding jbws1815 test case failing due to incomplete ejb3 integration
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-06 04:37:35 UTC (rev 14011)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-06 07:57:02 UTC (rev 14012)
@@ -937,6 +937,7 @@
<exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
13 years
- 1
- 0
JBossWS SVN: r14011 - in stack/native/trunk/modules/core/src/main/java/org/jboss: ws/core/jaxws/client and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-04-06 00:37:35 -0400 (Wed, 06 Apr 2011)
New Revision: 14011
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
Log:
[JBWS-3250]:Clean up swap file after response message is created
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2011-04-05 20:36:31 UTC (rev 14010)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2011-04-06 04:37:35 UTC (rev 14011)
@@ -85,7 +85,6 @@
public static CommonMessageContext processPivot(CommonMessageContext requestContext)
{
log.debug("Begin response processing");
- cleanupAttachments(requestContext);
return requestContext;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-04-05 20:36:31 UTC (rev 14010)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-04-06 04:37:35 UTC (rev 14011)
@@ -231,8 +231,10 @@
HandlerType[] handlerType = new HandlerType[] { HandlerType.PRE, HandlerType.ENDPOINT, HandlerType.POST };
HandlerType[] faultType = new HandlerType[] { HandlerType.PRE, HandlerType.ENDPOINT, HandlerType.POST };
+
// Associate a message context with the current thread
CommonMessageContext msgContext = new SOAPMessageContextJAXWS();
+ CommonMessageContext reqMsgContext = msgContext;
MessageContextAssociation.pushMessageContext(msgContext);
try
{
@@ -302,6 +304,8 @@
}
finally
{
+ //cleanup attachment if there is any
+ CommonMessageContext.cleanupAttachments(reqMsgContext);
closeHandlerChain(portName, handlerType[2]);
closeHandlerChain(portName, handlerType[1]);
closeHandlerChain(portName, handlerType[0]);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2011-04-05 20:36:31 UTC (rev 14010)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2011-04-06 04:37:35 UTC (rev 14011)
@@ -118,7 +118,6 @@
resContext.put(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.valueOf(!outbound));
MessageContextAssociation.pushMessageContext(resContext);
- cleanupAttachments(reqContext);
return resContext;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-04-05 20:36:31 UTC (rev 14010)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-04-06 04:37:35 UTC (rev 14011)
@@ -314,7 +314,7 @@
{
msgContext.setEndpointMetaData(sepMetaData);
MessageAbstraction resMessage = processRequest(endpoint, nettyMessage == null ? headerSource : nettyMessage, invContext, inStream);
-
+ CommonMessageContext reqMsgContext = msgContext;
// Replace the message context with the response context
msgContext = MessageContextAssociation.peekMessageContext();
@@ -372,6 +372,7 @@
boolean isWsrmOneWay = isWsrmMessage && (Boolean)rmResCtx.get(RMConstant.ONE_WAY_OPERATION);
if ((outStream != null) && (isWsrmOneWay == false)) // RM hack
sendResponse(endpoint, outStream, isFault);
+ CommonMessageContext.cleanupAttachments(reqMsgContext);
}
catch (Exception ex)
{
13 years
- 1
- 0
JBossWS SVN: r14010 - shared-testsuite/trunk/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-05 16:36:31 -0400 (Tue, 05 Apr 2011)
New Revision: 14010
Modified:
shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml
Log:
Synch with AS7 (add jboss-threads to client classpath in bin distro teststuite)
Modified: shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml 2011-04-05 15:17:32 UTC (rev 14009)
+++ shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml 2011-04-05 20:36:31 UTC (rev 14010)
@@ -434,6 +434,9 @@
<fileset dir="${jboss.home}/modules/javax/servlet/api/main/">
<include name="jboss-servlet-api_3.0_spec-*.jar"/>
</fileset>
+ <fileset dir="${jboss.home}/modules/org/jboss/threads/main/">
+ <include name="jboss-threads-*.jar"/>
+ </fileset>
</path>
</target>
13 years
- 1
- 0
JBossWS SVN: r14009 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-05 11:17:32 -0400 (Tue, 05 Apr 2011)
New Revision: 14009
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestException.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientRemoteInterface.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/Endpoint.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EndpointImpl.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EndpointService.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClient.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/MANIFEST.MF
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/web.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/web.xml
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBPAPP-6249] Adding some bus related testscase from upstream, including check on default bus usage on client side when no thread bus is available
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-04-05 13:23:53 UTC (rev 14008)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-04-05 15:17:32 UTC (rev 14009)
@@ -21,6 +21,43 @@
<target name="build-jars-jaxws" description="Build the deployments.">
<mkdir dir="${tests.output.dir}/test-libs"/>
+
+ <!-- jaxws-cxf-bus -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-bus.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/bus/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/EndpointImpl.class"/>
+ </classes>
+ </war>
+ <!-- jaxws-cxf-bus-ejb3-client -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-bus-ejb3-client.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/EndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientRemoteInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/BusTestException.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/bus/META-INF">
+ <include name="wsdl/**/*" />
+ </metainf>
+ </jar>
+ <!-- jaxws-cxf-bus-servlet-client -->
+ <war destfile="${tests.output.dir}/test-libs/jaxws-cxf-bus-servlet-client.war"
+ manifest="${tests.output.dir}/test-resources/jaxws/cxf/bus/META-INF/MANIFEST.MF"
+ webxml="${tests.output.dir}/test-resources/jaxws/cxf/bus/WEB-INF-client/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/EndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/ServletClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/bus/BusTestException.class"/>
+ </classes>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/cxf/bus/WEB-INF-client/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
<!-- jaxws-cxf-descriptor -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml">
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,175 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.bus;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.Service;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 05-Oct-2010
+ *
+ */
+public class AbstractClient
+{
+ public static void testBusCreation() throws BusTestException
+ {
+ Bus initialDefaultBus = BusFactory.getDefaultBus(false);
+ Bus initialThreadBus = BusFactory.getThreadDefaultBus(false);
+ BusFactory factory = BusFactory.newInstance();
+ Bus bus = factory.createBus();
+ assert (bus != null);
+ if (initialThreadBus == null) //if the thread bus was not set before, it should now be
+ {
+ checkThreadBus(bus);
+ }
+ checkDefaultBus(initialDefaultBus);
+ BusFactory.setThreadDefaultBus(initialThreadBus);
+ checkThreadBus(initialThreadBus);
+ checkDefaultBus(initialDefaultBus);
+ }
+
+ public static void testSOAPConnection(String host) throws BusTestException, Exception
+ {
+ Bus initialDefaultBus = BusFactory.getDefaultBus(false);
+ Bus initialThreadBus = BusFactory.getThreadDefaultBus(false);
+ //first call... the thread bus is reused if not null, otherwise a new one is created
+ performSOAPCall(getEndpointURL(host));
+ checkDefaultBus(initialDefaultBus);
+ if (initialThreadBus != null)
+ {
+ checkThreadBus(initialThreadBus);
+ }
+ else
+ {
+ initialThreadBus = BusFactory.getThreadDefaultBus(false);
+ }
+ //second call...
+ performSOAPCall(getEndpointURL(host));
+ checkThreadBus(initialThreadBus);
+ checkDefaultBus(initialDefaultBus);
+ }
+
+ public static void testWebServiceRef(Endpoint port) throws BusTestException
+ {
+ Bus initialDefaultBus = BusFactory.getDefaultBus(false);
+ Bus initialThreadBus = BusFactory.getThreadDefaultBus(false);
+ checkThreadBus(initialThreadBus); //this can probably be relaxed as below
+ checkDefaultBus(initialDefaultBus);
+ }
+
+ public static void testWebServiceClient(String host) throws BusTestException, Exception
+ {
+ Bus initialDefaultBus = BusFactory.getDefaultBus(false);
+ performInvocation(getEndpointURL(host));
+ checkDefaultBus(initialDefaultBus);
+ //check client usage does not rely on default bus when no thread bus is set
+ Bus threadBus = BusFactory.getThreadDefaultBus(false);
+ try
+ {
+ BusFactory.setThreadDefaultBus(null);
+ performInvocation(getEndpointURL(host));
+ Bus newThreadBus = BusFactory.getThreadDefaultBus(false);
+ if (newThreadBus == initialDefaultBus)
+ {
+ throw new BusTestException("Thread bus set to former default bus " + initialDefaultBus + " instead of a new bus!");
+ }
+ else if (newThreadBus == threadBus)
+ {
+ throw new BusTestException("Thread bus set to former thread bus " + threadBus + " (which is also default) instead of a new bus!");
+ }
+ }
+ finally
+ {
+ BusFactory.setThreadDefaultBus(threadBus);
+ }
+ }
+
+ protected static String getEndpointURL(String host)
+ {
+ return "http://" + host + ":8080/jaxws-cxf-bus/EndpointService/Endpoint";
+ }
+
+ protected static void performSOAPCall(String endpointAddress) throws SOAPException, MalformedURLException
+ {
+ SOAPFactory soapFac = SOAPFactory.newInstance();
+ MessageFactory msgFac = MessageFactory.newInstance();
+ SOAPConnectionFactory conFac = SOAPConnectionFactory.newInstance();
+ SOAPMessage msg = msgFac.createMessage();
+ SOAPConnection con = conFac.createConnection();
+ QName echo = new QName("http://org.jboss.ws/bus", "echo");
+ SOAPElement element = soapFac.createElement(echo);
+ element.addTextNode("John");
+ msg.getSOAPBody().addChildElement(element);
+ SOAPMessage response = con.call(msg, new URL(endpointAddress));
+ assert (response != null);
+ }
+
+ protected static void performInvocation(Endpoint endpoint)
+ {
+ String result = endpoint.echo("Alessio");
+ assert ("Alessio".equals(result));
+ }
+
+ protected static void performInvocation(String endpointUrl) throws MalformedURLException
+ {
+ URL wsdlURL = new URL(endpointUrl + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/bus", "EndpointService");
+ Service service = Service.create(wsdlURL, serviceName);
+ QName portQName = new QName("http://org.jboss.ws/bus", "EndpointPort");
+ Endpoint endpoint = (Endpoint) service.getPort(portQName, Endpoint.class);
+ performInvocation(endpoint);
+ }
+
+ protected static void checkDefaultBus(Bus expectedDefaultBus) throws BusTestException
+ {
+ Bus bus = BusFactory.getDefaultBus(false);
+ if (bus != expectedDefaultBus)
+ {
+ throw new BusTestException("Default bus set to " + bus + " instead of expected " + expectedDefaultBus);
+ }
+ }
+
+ protected static void checkThreadBus(Bus expectedThreadBus) throws BusTestException
+ {
+ Bus bus = BusFactory.getThreadDefaultBus(false);
+ if (bus != expectedThreadBus)
+ {
+ throw new BusTestException("Thread " + Thread.currentThread() + " associated with bus " + bus
+ + " instead of expected bus " + expectedThreadBus);
+ }
+ }
+}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestException.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestException.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestException.java 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.bus;
+
+public class BusTestException extends Exception
+{
+ private static final long serialVersionUID = 1L;
+
+ public BusTestException(String message)
+ {
+ super(message);
+ }
+}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.java 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.bus;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.xml.ws.WebServiceRef;
+
+/**
+ * This class verifies the default bus is not changed by
+ * basic client use (creation of bus through BusFactory.newInstance().createBus(),
+ * SAAJ invocation, endpoint invocation, endpoint invocation using webserviceref).
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 05-Oct-2010
+ *
+ */
+@Stateless
+(a)Remote(EJB3ClientRemoteInterface.class)
+public class EJB3Client
+{
+ @WebServiceRef(value = EndpointService.class, type = Endpoint.class, wsdlLocation = "META-INF/wsdl/Endpoint.wsdl")
+ public Endpoint port;
+
+ public void testBusCreation() throws BusTestException
+ {
+ AbstractClient.testBusCreation();
+ }
+
+ public void testSOAPConnection(String host) throws BusTestException, Exception
+ {
+ AbstractClient.testSOAPConnection(host);
+ }
+
+ public void testWebServiceRef() throws BusTestException
+ {
+ AbstractClient.testWebServiceRef(port);
+ }
+
+ public void testWebServiceClient(String host) throws BusTestException, Exception
+ {
+ AbstractClient.testWebServiceClient(host);
+ }
+}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.bus;
+
+import javax.naming.InitialContext;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * A test case that verifies Bus references do not leak into EJB3 clients
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 05-Oct-2010
+ *
+ */
+public class EJB3ClientBusTestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(EJB3ClientBusTestCase.class, "jaxws-cxf-bus.war");
+ }
+
+ public void testSingleDeploy() throws Exception
+ {
+ deploy("jaxws-cxf-bus-ejb3-client.jar");
+ try
+ {
+ String host = getServerHost();
+ InitialContext iniCtx = getInitialContext();
+ EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)iniCtx.lookup("/EJB3Client/remote");
+ ejb3Remote.testBusCreation();
+ ejb3Remote.testSOAPConnection(host);
+ ejb3Remote.testWebServiceClient(host);
+ ejb3Remote.testWebServiceRef();
+ }
+ finally
+ {
+ undeploy("jaxws-cxf-bus-ejb3-client.jar");
+ }
+ }
+}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientRemoteInterface.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientRemoteInterface.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientRemoteInterface.java 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.bus;
+
+public interface EJB3ClientRemoteInterface
+{
+ public void testBusCreation() throws BusTestException;
+
+ public void testSOAPConnection(String host) throws BusTestException, Exception;
+
+ public void testWebServiceRef() throws BusTestException;
+
+ public void testWebServiceClient(String host) throws BusTestException, Exception;
+}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/Endpoint.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/Endpoint.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/Endpoint.java 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.bus;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+
+@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/bus", wsdlLocation = "http://localhost.localdomain:8080/jaxws-cxf-bus?wsdl")
+public interface Endpoint {
+
+
+ /**
+ *
+ * @param arg0
+ * @return
+ * returns java.lang.String
+ */
+ @WebMethod
+ public String echo(String arg0);
+
+}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EndpointImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EndpointImpl.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EndpointImpl.java 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.bus;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+import org.jboss.logging.Logger;
+
+@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/bus")
+public class EndpointImpl
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(EndpointImpl.class);
+
+ @WebMethod
+ public String echo(String input)
+ {
+ log.info(input);
+ return input;
+ }
+}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EndpointService.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EndpointService.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EndpointService.java 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.bus;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+
+@WebServiceClient(name = "EndpointService", targetNamespace = "http://org.jboss.ws/bus", wsdlLocation = "file://bogus-location/jaxws-cxf-busf?wsdl")
+public class EndpointService
+ extends Service
+{
+
+ private final static URL WSDL_LOCATION;
+ private final static QName TESTENDPOINTSERVICE = new QName("http://org.jboss.ws/bus", "EndpointService");
+ private final static QName TESTENDPOINTPORT = new QName("http://org.jboss.ws/bus", "EndpointPort");
+
+ static {
+ URL url = null;
+ try {
+ url = new URL("file://bogus-location/jaxws-cxf-bus?wsdl");
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ WSDL_LOCATION = url;
+ }
+
+ public EndpointService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public EndpointService() {
+ super(WSDL_LOCATION, TESTENDPOINTSERVICE);
+ }
+
+ /**
+ *
+ * @return
+ * returns Endpoint
+ */
+ @WebEndpoint(name = "EndpointPort")
+ public Endpoint getEndpointPort() {
+ return (Endpoint)super.getPort(TESTENDPOINTPORT, Endpoint.class);
+ }
+
+ /**
+ *
+ * @return
+ * returns Endpoint
+ */
+ @WebEndpoint(name = "EndpointPort")
+ public Endpoint getEndpointPort(WebServiceFeature... features) {
+ return (Endpoint)super.getPort(TESTENDPOINTPORT, Endpoint.class, features);
+ }
+
+}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClient.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClient.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClient.java 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.bus;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.WebServiceRef;
+
+/**
+ * This class verifies the default bus is not changed by
+ * basic client use (creation of bus through BusFactory.newInstance().createBus(),
+ * SAAJ invocation, endpoint invocation, endpoint invocation using webserviceref).
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 01-Mar-2011
+ *
+ */
+public class ServletClient extends HttpServlet
+{
+ private static final long serialVersionUID = 1L;
+
+// @WebServiceRef(value = EndpointService.class, type = Endpoint.class, wsdlLocation = "WEB-INF/wsdl/Endpoint.wsdl")
+// public Endpoint port;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ String inStr = req.getParameter("method");
+ try
+ {
+ if (inStr.equalsIgnoreCase("testBusCreation"))
+ {
+ testBusCreation();
+ }
+ else if (inStr.equalsIgnoreCase("testSOAPConnection"))
+ {
+ testSOAPConnection(req.getParameter("host"));
+ }
+ else if (inStr.equalsIgnoreCase("testWebServiceRef"))
+ {
+ testWebServiceRef();
+ }
+ else if (inStr.equalsIgnoreCase("testWebServiceClient"))
+ {
+ testWebServiceClient(req.getParameter("host"));
+ }
+ else
+ {
+ throw new IllegalArgumentException("Unsupported test method: " + inStr);
+ }
+ res.getWriter().print("OK " + inStr);
+ }
+ catch (BusTestException bte)
+ {
+ res.getWriter().print(bte.getMessage());
+ }
+ catch (Exception e)
+ {
+ throw new IOException(e);
+ }
+ }
+
+ public void testBusCreation() throws BusTestException
+ {
+ AbstractClient.testBusCreation();
+ }
+
+ public void testSOAPConnection(String host) throws BusTestException, Exception
+ {
+ AbstractClient.testSOAPConnection(host);
+ }
+
+ public void testWebServiceRef() throws BusTestException
+ {
+ System.out.println("FIXME: @WebServiceRef not working yet on AS7");
+// AbstractClient.testWebServiceRef(port);
+ }
+
+ public void testWebServiceClient(String host) throws BusTestException, Exception
+ {
+ AbstractClient.testWebServiceClient(host);
+ }
+}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.bus;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * A test case that verifies Bus references do not leak into servlet clients
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 01-Mar-2011
+ *
+ */
+public class ServletClientBusTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-cxf-bus-servlet-client";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(ServletClientBusTestCase.class, "jaxws-cxf-bus.war");
+ }
+
+ public void testSingleDeploy() throws Exception
+ {
+ deploy("jaxws-cxf-bus-servlet-client.war");
+ try
+ {
+ URL url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testBusCreation");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ String retStr = br.readLine();
+ assertEquals("OK testBusCreation", retStr);
+
+ url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testSOAPConnection&host=" + getServerHost());
+ br = new BufferedReader(new InputStreamReader(url.openStream()));
+ retStr = br.readLine();
+ assertEquals("OK testSOAPConnection", retStr);
+
+ url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testWebServiceRef");
+ br = new BufferedReader(new InputStreamReader(url.openStream()));
+ retStr = br.readLine();
+ assertEquals("OK testWebServiceRef", retStr);
+
+ url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testWebServiceClient&host=" + getServerHost());
+ br = new BufferedReader(new InputStreamReader(url.openStream()));
+ retStr = br.readLine();
+ assertEquals("OK testWebServiceClient", retStr);
+ }
+ finally
+ {
+ undeploy("jaxws-cxf-bus-servlet-client.war");
+ }
+ }
+}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/MANIFEST.MF
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/MANIFEST.MF (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/MANIFEST.MF 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services export,com.sun.xml.messaging.saaj services
\ No newline at end of file
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,56 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<wsdl:definitions name="EndpointService" targetNamespace="http://org.jboss.ws/bus" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://org.jboss.ws/bus" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+<xs:schema elementFormDefault="unqualified" targetNamespace="http://org.jboss.ws/bus" version="1.0" xmlns:tns="http://org.jboss.ws/bus" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:element name="echo" type="tns:echo" />
+<xs:element name="echoResponse" type="tns:echoResponse" />
+<xs:complexType name="echo">
+<xs:sequence>
+<xs:element minOccurs="0" name="arg0" type="xs:string" />
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="echoResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="xs:string" />
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
+
+ </wsdl:types>
+ <wsdl:message name="echoResponse">
+ <wsdl:part element="tns:echoResponse" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echo">
+ <wsdl:part element="tns:echo" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+
+ <wsdl:portType name="Endpoint">
+ <wsdl:operation name="echo">
+ <wsdl:input message="tns:echo" name="echo">
+ </wsdl:input>
+ <wsdl:output message="tns:echoResponse" name="echoResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="EndpointServiceSoapBinding" type="tns:Endpoint">
+
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="echo">
+ <soap:operation soapAction="" style="document" />
+ <wsdl:input name="echo">
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output name="echoResponse">
+ <soap:body use="literal" />
+ </wsdl:output>
+
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="EndpointService">
+ <wsdl:port binding="tns:EndpointServiceSoapBinding" name="EndpointPort">
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-bus/EndpointService/Endpoint" />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/web.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF/web.xml 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>EpServlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.bus.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>EpServlet</servlet-name>
+ <url-pattern>/EndpointService/Endpoint</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/web.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/web.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/web.xml 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>ServletClient</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.bus.ServletClient</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ServletClient</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl 2011-04-05 15:17:32 UTC (rev 14009)
@@ -0,0 +1,56 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<wsdl:definitions name="EndpointService" targetNamespace="http://org.jboss.ws/bus" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://org.jboss.ws/bus" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+<xs:schema elementFormDefault="unqualified" targetNamespace="http://org.jboss.ws/bus" version="1.0" xmlns:tns="http://org.jboss.ws/bus" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:element name="echo" type="tns:echo" />
+<xs:element name="echoResponse" type="tns:echoResponse" />
+<xs:complexType name="echo">
+<xs:sequence>
+<xs:element minOccurs="0" name="arg0" type="xs:string" />
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="echoResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="xs:string" />
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
+
+ </wsdl:types>
+ <wsdl:message name="echoResponse">
+ <wsdl:part element="tns:echoResponse" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echo">
+ <wsdl:part element="tns:echo" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+
+ <wsdl:portType name="Endpoint">
+ <wsdl:operation name="echo">
+ <wsdl:input message="tns:echo" name="echo">
+ </wsdl:input>
+ <wsdl:output message="tns:echoResponse" name="echoResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="EndpointServiceSoapBinding" type="tns:Endpoint">
+
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="echo">
+ <soap:operation soapAction="" style="document" />
+ <wsdl:input name="echo">
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output name="echoResponse">
+ <soap:body use="literal" />
+ </wsdl:output>
+
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="EndpointService">
+ <wsdl:port binding="tns:EndpointServiceSoapBinding" name="EndpointPort">
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-bus/EndpointService/Endpoint" />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
13 years
- 1
- 0
JBossWS SVN: r14008 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-05 09:23:53 -0400 (Tue, 05 Apr 2011)
New Revision: 14008
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java
Log:
[JBWS-3260] Adding testcase for checking the default bus is not used when doing jaxws client usage in-container with the current thread not being associated with a bus yet
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2011-04-05 13:18:00 UTC (rev 14007)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2011-04-05 13:23:53 UTC (rev 14008)
@@ -96,6 +96,26 @@
Bus initialDefaultBus = BusFactory.getDefaultBus(false);
performInvocation(getEndpointURL(host));
checkDefaultBus(initialDefaultBus);
+ //check client usage does not rely on default bus when no thread bus is set
+ Bus threadBus = BusFactory.getThreadDefaultBus(false);
+ try
+ {
+ BusFactory.setThreadDefaultBus(null);
+ performInvocation(getEndpointURL(host));
+ Bus newThreadBus = BusFactory.getThreadDefaultBus(false);
+ if (newThreadBus == initialDefaultBus)
+ {
+ throw new BusTestException("Thread bus set to former default bus " + initialDefaultBus + " instead of a new bus!");
+ }
+ else if (newThreadBus == threadBus)
+ {
+ throw new BusTestException("Thread bus set to former thread bus " + threadBus + " (which is also default) instead of a new bus!");
+ }
+ }
+ finally
+ {
+ BusFactory.setThreadDefaultBus(threadBus);
+ }
}
protected static String getEndpointURL(String host)
@@ -110,7 +130,7 @@
SOAPConnectionFactory conFac = SOAPConnectionFactory.newInstance();
SOAPMessage msg = msgFac.createMessage();
SOAPConnection con = conFac.createConnection();
- QName echo = new QName("http://org.jboss.ws.jaxws.cxf/bus", "echo");
+ QName echo = new QName("http://org.jboss.ws/bus", "echo");
SOAPElement element = soapFac.createElement(echo);
element.addTextNode("John");
msg.getSOAPBody().addChildElement(element);
13 years
- 1
- 0
JBossWS SVN: r14007 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules: endorsed/src/main/resources/META-INF/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-05 09:18:00 -0400 (Tue, 05 Apr 2011)
New Revision: 14007
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
Log:
[JBPAPP-6249] Adding custom JAXWS Provider Impl for controlling bus creation on client side
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-04-05 13:18:00 UTC (rev 14007)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.client;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.spi.ServiceDelegate;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 04-Apr-2011
+ *
+ */
+public class ProviderImpl extends org.apache.cxf.jaxws.spi.ProviderImpl {
+ public ServiceDelegate createServiceDelegate(URL url, QName qname, Class cls) {
+ setValidThreadDefaultBus();
+ return super.createServiceDelegate(url, qname, cls);
+ }
+
+ public ServiceDelegate createServiceDelegate(URL wsdlDocumentLocation,
+ QName serviceName,
+ Class serviceClass,
+ WebServiceFeature... features) {
+ setValidThreadDefaultBus();
+ return super.createServiceDelegate(wsdlDocumentLocation, serviceName, serviceClass, features);
+ }
+
+ static Bus setValidThreadDefaultBus() {
+ // we need to prevent using the default bus when the current
+ // thread is not already associated to a bus. In those situations we
+ // create
+ // a new bus from scratch instead and link that to the thread.
+ Bus bus = BusFactory.getThreadDefaultBus(false);
+ if (bus == null) {
+ bus = BusFactory.newInstance().createBus(); // this also set thread
+ // local bus internally
+ // as it's not set yet
+ }
+ return bus;
+ }
+}
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2011-04-05 13:15:05 UTC (rev 14006)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2011-04-05 13:18:00 UTC (rev 14007)
@@ -1 +1 @@
-org.apache.cxf.jaxws.spi.ProviderImpl
+org.jboss.wsf.stack.cxf.client.ProviderImpl
13 years
- 1
- 0
JBossWS SVN: r14006 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules and 12 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-05 09:15:05 -0400 (Tue, 05 Apr 2011)
New Revision: 14006
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
Removed:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml
Log:
[JBPAPP-6249] Adding endorsed module for building jbossws-cxf-factories.jar which is to be installed in lib/endorsed for overwriting the jaxws provider setup
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/cxf/trunk:12339
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2011-04-05 07:05:48 UTC (rev 14005)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2011-04-05 13:15:05 UTC (rev 14006)
@@ -24,6 +24,11 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${version}</version>
+ </dependency>
<!-- CXF dependencies -->
<dependency>
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2011-04-05 07:05:48 UTC (rev 14005)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2011-04-05 13:15:05 UTC (rev 14006)
@@ -1,4 +0,0 @@
-com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin
-com.sun.tools.xjc.addon.apache_cxf.bug671.Bug671Plugin
-com.sun.tools.xjc.addon.apache_cxf.bg.BooleanGetterPlugin
-com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2011-04-05 07:05:48 UTC (rev 14005)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2011-04-05 13:15:05 UTC (rev 14006)
@@ -1 +0,0 @@
-org.apache.cxf.jaxws.spi.ProviderImpl
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed
___________________________________________________________________
Added: svn:ignore
+ target
.project
.classpath
.settings
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/trunk/modules/endorsed/pom.xml 2010-05-26 11:32:04 UTC (rev 12339)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml 2011-04-05 13:15:05 UTC (rev 14006)
@@ -1,16 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Endorsed JAX-WS factories</name>
- <artifactId>jbossws-cxf-factories</artifactId>
- <packaging>jar</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
-</project>
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml (from rev 12339, stack/cxf/trunk/modules/endorsed/pom.xml)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml 2011-04-05 13:15:05 UTC (rev 14006)
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Endorsed JAX-WS factories</name>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf</artifactId>
+ <version>3.1.2-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+</project>
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
===================================================================
--- stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2010-05-26 11:32:04 UTC (rev 12339)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2011-04-05 13:15:05 UTC (rev 14006)
@@ -1,4 +0,0 @@
-com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin
-com.sun.tools.xjc.addon.apache_cxf.bug671.Bug671Plugin
-com.sun.tools.xjc.addon.apache_cxf.bg.BooleanGetterPlugin
-com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin (from rev 12339, stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2011-04-05 13:15:05 UTC (rev 14006)
@@ -0,0 +1,4 @@
+com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin
+com.sun.tools.xjc.addon.apache_cxf.bug671.Bug671Plugin
+com.sun.tools.xjc.addon.apache_cxf.bg.BooleanGetterPlugin
+com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
===================================================================
--- stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2010-05-26 11:32:04 UTC (rev 12339)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2011-04-05 13:15:05 UTC (rev 14006)
@@ -1 +0,0 @@
-org.apache.cxf.jaxws.spi.ProviderImpl
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider (from rev 12339, stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2011-04-05 13:15:05 UTC (rev 14006)
@@ -0,0 +1 @@
+org.apache.cxf.jaxws.spi.ProviderImpl
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-05 07:05:48 UTC (rev 14005)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-05 13:15:05 UTC (rev 14006)
@@ -62,6 +62,7 @@
<patternset id="jbossws.lib.endorsed.patternset">
<include name="**/jaxb-api.jar"/>
+ <include name="**/jbossws-cxf-factories.jar"/>
</patternset>
<patternset id="jbossws.server.lib.patternset">
@@ -78,6 +79,7 @@
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
<include name="**/jbossws-cxf-client*.jar"/>
+ <include name="**/jbossws-cxf-factories.jar"/>
<include name="**/jbossws-cxf-server*.jar"/>
<include name="**/jdom.jar"/>
<include name="**/neethi.jar"/>
@@ -93,7 +95,7 @@
<include name="**/XmlSchema.jar"/>
<include name="**/FastInfoset.jar"/>
</patternset>
-
+
<!-- ================================================================== -->
<!-- Deploy Bin -->
<!-- ================================================================== -->
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2011-04-05 07:05:48 UTC (rev 14005)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2011-04-05 13:15:05 UTC (rev 14006)
@@ -25,6 +25,11 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${version}</version>
+ </dependency>
<!-- CXF dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2011-04-05 07:05:48 UTC (rev 14005)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2011-04-05 13:15:05 UTC (rev 14006)
@@ -37,6 +37,7 @@
<modules>
<module>modules/server</module>
<module>modules/client</module>
+ <module>modules/endorsed</module>
<module>modules/management</module>
<module>modules/resources</module>
</modules>
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-05 07:05:48 UTC (rev 14005)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-05 13:15:05 UTC (rev 14006)
@@ -22,6 +22,7 @@
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
+ <include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include>
<include>org.apache.cxf:cxf-*</include>
<include>org.apache.cxf.xjcplugins:cxf-*</include>
<include>javax.jws:jsr181-api:jar</include>
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
13 years
- 1
- 0
JBossWS SVN: r14005 - in common/branches/jbossws-common-1.0.0.GA_CP05_JBPAPP-6242: src/main/java/org/jboss/wsf/common and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-04-05 03:05:48 -0400 (Tue, 05 Apr 2011)
New Revision: 14005
Modified:
common/branches/jbossws-common-1.0.0.GA_CP05_JBPAPP-6242/
common/branches/jbossws-common-1.0.0.GA_CP05_JBPAPP-6242/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
[JBPAPP-6242] Disable external-general-entities and external-parameter-entities.
Property changes on: common/branches/jbossws-common-1.0.0.GA_CP05_JBPAPP-6242
___________________________________________________________________
Modified: svn:mergeinfo
- /common/branches/jbossws-common-1.0.0.GA_CP:12643
+ /common/branches/jbossws-common-1.0.0.GA_CP:12643
/common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647:12887
Modified: common/branches/jbossws-common-1.0.0.GA_CP05_JBPAPP-6242/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/branches/jbossws-common-1.0.0.GA_CP05_JBPAPP-6242/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-04-05 07:05:05 UTC (rev 14004)
+++ common/branches/jbossws-common-1.0.0.GA_CP05_JBPAPP-6242/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-04-05 07:05:48 UTC (rev 14005)
@@ -94,6 +94,8 @@
{
factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, false);
}
+ factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+ factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
}
catch (ParserConfigurationException pce)
{
13 years
- 1
- 0