JBossWS SVN: r14356 - api/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-11 03:17:29 -0400 (Wed, 11 May 2011)
New Revision: 14356
Added:
api/tags/jbossws-api-1.0.0.Beta1/
Log:
Tagging jbossws-api-1.0.0.Beta1
13 years
JBossWS SVN: r14355 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-05-10 19:51:09 -0400 (Tue, 10 May 2011)
New Revision: 14355
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
Log:
[JBPAPP-6435][JBWS-3293] fixing dispatch impl to call registered handlers
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-05-10 23:49:15 UTC (rev 14354)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-05-10 23:51:09 UTC (rev 14355)
@@ -159,13 +159,9 @@
handlerResolver.initHandlerChain(ecmd, HandlerType.POST, true);
PortInfo portInfo = epMetaData.getPortInfo();
- List<Handler> preChain = handlerResolver.getHandlerChain(portInfo, HandlerType.PRE);
- List<Handler> epChain = handlerResolver.getHandlerChain(portInfo, HandlerType.ENDPOINT);
- List<Handler> postChain = handlerResolver.getHandlerChain(portInfo, HandlerType.POST);
-
- binding.setHandlerChain(preChain, HandlerType.PRE);
- binding.setHandlerChain(epChain, HandlerType.ENDPOINT);
- binding.setHandlerChain(postChain, HandlerType.POST);
+ this.appendHandlers(HandlerType.PRE, portInfo, binding);
+ this.appendHandlers(HandlerType.ENDPOINT, portInfo, binding);
+ this.appendHandlers(HandlerType.POST, portInfo, binding);
}
retObj = invokeInternalSOAP(obj);
@@ -177,6 +173,21 @@
return retObj;
}
+ private void appendHandlers(final HandlerType handlerType, final PortInfo portInfo, final BindingExt binding)
+ {
+ final List<Handler> resolverHandlerChain = this.handlerResolver.getHandlerChain(portInfo, handlerType);
+ final List<Handler> bindingHandlerChain = binding.getHandlerChain(handlerType);
+
+ if (bindingHandlerChain == null || bindingHandlerChain.size() == 0)
+ {
+ binding.setHandlerChain(resolverHandlerChain, handlerType);
+ }
+ else
+ {
+ bindingHandlerChain.addAll(resolverHandlerChain);
+ }
+ }
+
private Object invokeInternalSOAP(Object obj) throws Exception
{
Object retObj = null;
13 years
JBossWS SVN: r14354 - in framework/branches/jbossws-framework-3.1.2/testsuite/test: java/org/jboss/test/ws/jaxws and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-05-10 19:49:15 -0400 (Tue, 10 May 2011)
New Revision: 14354
Added:
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/Endpoint.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/EndpointBean.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws3293/
framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws3293/WEB-INF/
framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws3293/WEB-INF/web.xml
framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws3293/WEB-INF/wsdl/
framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws3293/WEB-INF/wsdl/TestService.wsdl
Modified:
framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBPAPP-6435][JBWS-3293] providing test case to reproduce the issue
Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml 2011-05-10 23:12:58 UTC (rev 14353)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml 2011-05-10 23:49:15 UTC (rev 14354)
@@ -823,6 +823,14 @@
<fileset file="${tests.output.dir}/test-libs/jaxws-jbws2634-pojo.war"/>
</ear>
+ <!-- jaxws-jbws3293 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3293.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3293/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3293/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws3293/EndpointBean.class"/>
+ </classes>
+ </war>
+
<!-- jaxws namespace -->
<war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/Endpoint.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/Endpoint.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/Endpoint.java 2011-05-10 23:49:15 UTC (rev 14354)
@@ -0,0 +1,48 @@
+/*
+ * 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.jbws3293;
+
+import java.util.concurrent.Future;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
+
+@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/jbws3293")
+@SOAPBinding(style = Style.RPC)
+public interface Endpoint
+{
+ @WebMethod(operationName = "echo")
+ public Response<String> echoAsync(@WebParam(name = "String_1") String string1);
+
+ @WebMethod(operationName = "echo")
+ public Future<?> echoAsync(@WebParam(name = "String_1") String string1, @WebParam(name = "asyncHandler") AsyncHandler<String> asyncHandler);
+
+ @WebMethod
+ @WebResult(name = "result")
+ public String echo(@WebParam(name = "String_1") String string1);
+}
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/EndpointBean.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/EndpointBean.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/EndpointBean.java 2011-05-10 23:49:15 UTC (rev 14354)
@@ -0,0 +1,42 @@
+/*
+ * 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.jbws3293;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+
+@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/jbws3293")
+@SOAPBinding(style = Style.RPC)
+public class EndpointBean
+{
+ @WebMethod
+ @WebResult(name = "result")
+ public String echo(@WebParam(name = "String_1") String msg)
+ {
+ System.out.println("echo: " + msg);
+ return msg;
+ }
+}
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java 2011-05-10 23:49:15 UTC (rev 14354)
@@ -0,0 +1,141 @@
+/*
+ * 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.jbws3293;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import javax.xml.ws.soap.SOAPBinding;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Response;
+import javax.xml.ws.Service;
+import javax.xml.ws.Service.Mode;
+import javax.xml.ws.handler.Handler;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.w3c.dom.Element;
+
+/**
+ * [JBWS-3293] tests dispatch objects created without specified WSDL.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class JBWS3293DispatchTestCase extends JBossWSTest
+{
+ private String targetNS = "http://org.jboss.ws/jaxws/jbws3293";
+ private String reqPayload = "<ns2:echo xmlns:ns2='" + targetNS + "'><String_1>Hello</String_1></ns2:echo>";
+ private Exception handlerException;
+ private boolean asyncHandlerCalled;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS3293DispatchTestCase.class, "jaxws-jbws3293.war");
+ }
+
+ public void testInvokeAsynch() throws Exception
+ {
+ Source reqObj = new StreamSource(new StringReader(reqPayload));
+ Dispatch dispatch = createDispatch();
+ Response response = dispatch.invokeAsync(reqObj);
+ verifyResponse((Source)response.get(3000, TimeUnit.MILLISECONDS));
+ }
+
+ public void testInvokeAsynchHandler() throws Exception
+ {
+ AsyncHandler handler = new AsyncHandler()
+ {
+ public void handleResponse(Response response)
+ {
+ try
+ {
+ verifyResponse((Source)response.get());
+ asyncHandlerCalled = true;
+ }
+ catch (Exception ex)
+ {
+ handlerException = ex;
+ }
+ }
+ };
+ StreamSource reqObj = new StreamSource(new StringReader(reqPayload));
+ Dispatch dispatch = createDispatch();
+ Future future = dispatch.invokeAsync(reqObj, handler);
+ future.get(1000, TimeUnit.MILLISECONDS);
+
+ if (handlerException != null)
+ throw handlerException;
+
+ assertTrue("Async handler called", asyncHandlerCalled);
+ }
+
+ private void installHandler(final Dispatch dispatch)
+ {
+ List<Handler> handlers = dispatch.getBinding().getHandlerChain();
+ handlers.add(new SOAPHandler());
+ dispatch.getBinding().setHandlerChain(handlers);
+ }
+
+ private Dispatch createDispatchWithWSDL() throws MalformedURLException
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3293?wsdl");
+ QName serviceName = new QName(targetNS, "EndpointBeanService");
+ QName portName = new QName(targetNS, "EndpointPort");
+ Service service = Service.create(wsdlURL, serviceName);
+ Dispatch dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD);
+ installHandler(dispatch);
+ return dispatch;
+ }
+
+ private Dispatch createDispatch() throws MalformedURLException
+ {
+ QName serviceName = new QName(targetNS, "EndpointBeanService");
+ QName portName = new QName(targetNS, "EndpointPort");
+ Service service = Service.create(serviceName);
+ service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, "http://" + getServerHost() + ":8080/jaxws-jbws3293");
+ Dispatch dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD);
+ installHandler(dispatch);
+ return dispatch;
+ }
+
+ private void verifyResponse(Source result) throws IOException
+ {
+ Element docElement = DOMUtils.sourceToElement(result);
+ Element retElement = DOMUtils.getFirstChildElement(docElement);
+ assertEquals("result", retElement.getNodeName());
+ assertEquals("Hello modified in handler", retElement.getTextContent());
+ }
+
+}
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java 2011-05-10 23:49:15 UTC (rev 14354)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., 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.jbws3293;
+
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.handler.LogicalMessageContext;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.common.DOMWriter;
+import org.jboss.wsf.common.handler.GenericSOAPHandler;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class SOAPHandler extends GenericSOAPHandler<LogicalMessageContext>
+{
+
+ private static final Logger log = Logger.getLogger(SOAPHandler.class);
+
+ @Override
+ protected boolean handleInbound(final MessageContext msgContext)
+ {
+ log.info("handleInbound()");
+
+ try
+ {
+ SOAPMessageContext smc = (SOAPMessageContext)msgContext;
+ SOAPMessage message = smc.getMessage();
+
+ SOAPBody body = message.getSOAPBody();
+ Document document = body.extractContentAsDocument();
+ Node node = document;
+
+ System.out.println(DOMWriter.printNode(node, true));
+
+ NodeList nodes = node.getChildNodes();
+ for (int i = 0; i < nodes.getLength(); i++)
+ {
+ Node current = nodes.item(i);
+
+ NodeList childNodes = current.getChildNodes();
+ for (int j = 0; j < childNodes.getLength(); j++)
+ {
+ Node currentChildNode = childNodes.item(j);
+ if ("result".equals(currentChildNode.getLocalName()))
+ {
+ currentChildNode.setTextContent(currentChildNode.getTextContent() + " modified in handler");
+ }
+ }
+ }
+
+ System.out.println(DOMWriter.printNode(node, true));
+
+ // Add document back as removed by call to 'extractContentAsDocument()'
+ body.addDocument(document);
+ message.saveChanges();
+ }
+ catch (SOAPException e)
+ {
+ throw new RuntimeException("Error in Handler", e);
+ }
+
+ log.info("Finished");
+ return true;
+ }
+
+}
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws3293/WEB-INF/web.xml
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws3293/WEB-INF/web.xml (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws3293/WEB-INF/web.xml 2011-05-10 23:49:15 UTC (rev 14354)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app 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"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>Endpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws3293.EndpointBean</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Endpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws3293/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws3293/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws3293/WEB-INF/wsdl/TestService.wsdl 2011-05-10 23:49:15 UTC (rev 14354)
@@ -0,0 +1,44 @@
+<!--
+ This wsdl is only used for client artifact generation
+
+ wsimport -keep -verbose -d ../../../java ./WEB-INF/wsdl/TestService.wsdl
+-->
+<definitions name='EndpointService' targetNamespace='http://org.jboss.ws/jaxws/jbws3293' xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/jaxws/jbws3293' xmlns:xsd='http://www.w3.org/2001/XMLSchema'
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb">
+
+ <jaxws:bindings>
+ <jaxws:package name="org.jboss.test.ws.jaxws.jbws3293"/>
+ <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
+ </jaxws:bindings>
+
+ <message name='Endpoint_echoResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+ <message name='Endpoint_echo'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <portType name='Endpoint'>
+ <operation name='echo' parameterOrder='String_1'>
+ <input message='tns:Endpoint_echo'/>
+ <output message='tns:Endpoint_echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='EndpointBinding' type='tns:Endpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/jaxws/jbws3293' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/jaxws/jbws3293' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='EndpointService'>
+ <port binding='tns:EndpointBinding' name='EndpointPort'>
+ <soap:address location='http://tdvaio:8080/jaxws-jbws3293/Endpoint'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
13 years
JBossWS SVN: r14353 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-05-10 19:12:58 -0400 (Tue, 10 May 2011)
New Revision: 14353
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java
Log:
[JBWS-3293] removing native stack dependency so the test is stack agnostic
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java 2011-05-10 22:51:53 UTC (rev 14352)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java 2011-05-10 23:12:58 UTC (rev 14353)
@@ -31,7 +31,6 @@
import org.jboss.logging.Logger;
import org.jboss.test.helper.DOMWriter;
-import org.jboss.ws.WSException;
import org.jboss.ws.api.handler.GenericSOAPHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -82,7 +81,7 @@
}
catch (SOAPException e)
{
- throw new WSException("Error in Handler", e);
+ throw new RuntimeException("Error in Handler", e);
}
log.info("Finished");
13 years
JBossWS SVN: r14352 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-05-10 18:51:53 -0400 (Tue, 10 May 2011)
New Revision: 14352
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/Endpoint.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/EndpointBean.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3293/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3293/WEB-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3293/WEB-INF/web.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3293/WEB-INF/wsdl/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3293/WEB-INF/wsdl/TestService.wsdl
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-3293] providing test case
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-05-10 21:12:50 UTC (rev 14351)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-05-10 22:51:53 UTC (rev 14352)
@@ -1067,6 +1067,14 @@
</webinf>
</war>
+ <!-- jaxws-jbws3293 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3293.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3293/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3293/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws3293/EndpointBean.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-endpoint-servlet -->
<war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-servlet.war" manifest="${tests.output.dir}/test-resources/jaxws/endpoint/META-INF/MANIFEST.MF"
webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web.xml">
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/Endpoint.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/Endpoint.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/Endpoint.java 2011-05-10 22:51:53 UTC (rev 14352)
@@ -0,0 +1,48 @@
+/*
+ * 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.jbws3293;
+
+import java.util.concurrent.Future;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
+
+@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/jbws3293")
+@SOAPBinding(style = Style.RPC)
+public interface Endpoint
+{
+ @WebMethod(operationName = "echo")
+ public Response<String> echoAsync(@WebParam(name = "String_1") String string1);
+
+ @WebMethod(operationName = "echo")
+ public Future<?> echoAsync(@WebParam(name = "String_1") String string1, @WebParam(name = "asyncHandler") AsyncHandler<String> asyncHandler);
+
+ @WebMethod
+ @WebResult(name = "result")
+ public String echo(@WebParam(name = "String_1") String string1);
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/EndpointBean.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/EndpointBean.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/EndpointBean.java 2011-05-10 22:51:53 UTC (rev 14352)
@@ -0,0 +1,42 @@
+/*
+ * 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.jbws3293;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+
+@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/jbws3293")
+@SOAPBinding(style = Style.RPC)
+public class EndpointBean
+{
+ @WebMethod
+ @WebResult(name = "result")
+ public String echo(@WebParam(name = "String_1") String msg)
+ {
+ System.out.println("echo: " + msg);
+ return msg;
+ }
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java 2011-05-10 22:51:53 UTC (rev 14352)
@@ -0,0 +1,130 @@
+/*
+ * 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.jbws3293;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import javax.xml.ws.soap.SOAPBinding;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Response;
+import javax.xml.ws.Service;
+import javax.xml.ws.Service.Mode;
+import javax.xml.ws.handler.Handler;
+
+import junit.framework.Test;
+
+import org.jboss.ws.common.DOMUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.w3c.dom.Element;
+
+/**
+ * [JBWS-3293] tests dispatch creation without WSDL.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class JBWS3293DispatchTestCase extends JBossWSTest
+{
+ private String targetNS = "http://org.jboss.ws/jaxws/jbws3293";
+ private String reqPayload = "<ns2:echo xmlns:ns2='" + targetNS + "'><String_1>Hello</String_1></ns2:echo>";
+ private Exception handlerException;
+ private boolean asyncHandlerCalled;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS3293DispatchTestCase.class, "jaxws-jbws3293.war");
+ }
+
+ public void testInvokeAsynch() throws Exception
+ {
+ Source reqObj = new StreamSource(new StringReader(reqPayload));
+ Dispatch dispatch = createDispatch();
+ Response response = dispatch.invokeAsync(reqObj);
+ verifyResponse((Source)response.get(3000, TimeUnit.MILLISECONDS));
+ }
+
+ public void testInvokeAsynchHandler() throws Exception
+ {
+ AsyncHandler handler = new AsyncHandler()
+ {
+ public void handleResponse(Response response)
+ {
+ try
+ {
+ verifyResponse((Source)response.get());
+ asyncHandlerCalled = true;
+ }
+ catch (Exception ex)
+ {
+ handlerException = ex;
+ }
+ }
+ };
+ StreamSource reqObj = new StreamSource(new StringReader(reqPayload));
+ Dispatch dispatch = createDispatch();
+ Future future = dispatch.invokeAsync(reqObj, handler);
+ future.get(1000, TimeUnit.MILLISECONDS);
+
+ if (handlerException != null)
+ throw handlerException;
+
+ assertTrue("Async handler called", asyncHandlerCalled);
+ }
+
+ private void installHandler(final Dispatch dispatch)
+ {
+ List<Handler> handlers = dispatch.getBinding().getHandlerChain();
+ handlers.add(new SOAPHandler());
+ dispatch.getBinding().setHandlerChain(handlers);
+ }
+
+ private Dispatch createDispatch() throws MalformedURLException
+ {
+ QName serviceName = new QName(targetNS, "EndpointBeanService");
+ QName portName = new QName(targetNS, "EndpointPort");
+ Service service = Service.create(serviceName);
+ service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, "http://" + getServerHost() + ":8080/jaxws-jbws3293");
+ Dispatch dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD);
+ installHandler(dispatch);
+ return dispatch;
+ }
+
+ private void verifyResponse(Source result) throws IOException
+ {
+ Element docElement = DOMUtils.sourceToElement(result);
+ Element retElement = DOMUtils.getFirstChildElement(docElement);
+ assertEquals("result", retElement.getNodeName());
+ assertEquals("Hello modified in handler", retElement.getTextContent());
+ }
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java 2011-05-10 22:51:53 UTC (rev 14352)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., 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.jbws3293;
+
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.handler.LogicalMessageContext;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.helper.DOMWriter;
+import org.jboss.ws.WSException;
+import org.jboss.ws.api.handler.GenericSOAPHandler;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class SOAPHandler extends GenericSOAPHandler<LogicalMessageContext>
+{
+
+ private static final Logger log = Logger.getLogger(SOAPHandler.class);
+
+ @Override
+ protected boolean handleInbound(final MessageContext msgContext)
+ {
+ log.info("handleInbound()");
+
+ try
+ {
+ SOAPMessageContext smc = (SOAPMessageContext)msgContext;
+ SOAPMessage message = smc.getMessage();
+
+ SOAPBody body = message.getSOAPBody();
+ Document document = body.extractContentAsDocument();
+ Node node = document;
+
+ System.out.println(DOMWriter.printNode(node, true));
+
+ NodeList nodes = node.getChildNodes();
+ for (int i = 0; i < nodes.getLength(); i++)
+ {
+ Node current = nodes.item(i);
+
+ NodeList childNodes = current.getChildNodes();
+ for (int j = 0; j < childNodes.getLength(); j++)
+ {
+ Node currentChildNode = childNodes.item(j);
+ if ("result".equals(currentChildNode.getLocalName()))
+ {
+ currentChildNode.setTextContent(currentChildNode.getTextContent() + " modified in handler");
+ }
+ }
+ }
+
+ System.out.println(DOMWriter.printNode(node, true));
+
+ // Add document back as removed by call to 'extractContentAsDocument()'
+ body.addDocument(document);
+ message.saveChanges();
+ }
+ catch (SOAPException e)
+ {
+ throw new WSException("Error in Handler", e);
+ }
+
+ log.info("Finished");
+ return true;
+ }
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3293/WEB-INF/web.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3293/WEB-INF/web.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3293/WEB-INF/web.xml 2011-05-10 22:51:53 UTC (rev 14352)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app 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"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>Endpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws3293.EndpointBean</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Endpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3293/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3293/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3293/WEB-INF/wsdl/TestService.wsdl 2011-05-10 22:51:53 UTC (rev 14352)
@@ -0,0 +1,44 @@
+<!--
+ This wsdl is only used for client artifact generation
+
+ wsimport -keep -verbose -d ../../../java ./WEB-INF/wsdl/TestService.wsdl
+-->
+<definitions name='EndpointService' targetNamespace='http://org.jboss.ws/jaxws/jbws3293' xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/jaxws/jbws3293' xmlns:xsd='http://www.w3.org/2001/XMLSchema'
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb">
+
+ <jaxws:bindings>
+ <jaxws:package name="org.jboss.test.ws.jaxws.jbws3293"/>
+ <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
+ </jaxws:bindings>
+
+ <message name='Endpoint_echoResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+ <message name='Endpoint_echo'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <portType name='Endpoint'>
+ <operation name='echo' parameterOrder='String_1'>
+ <input message='tns:Endpoint_echo'/>
+ <output message='tns:Endpoint_echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='EndpointBinding' type='tns:Endpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/jaxws/jbws3293' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/jaxws/jbws3293' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='EndpointService'>
+ <port binding='tns:EndpointBinding' name='EndpointPort'>
+ <soap:address location='http://tdvaio:8080/jaxws-jbws3293/Endpoint'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
13 years
JBossWS SVN: r14351 - in stack/cxf/trunk: modules/addons/transports/http/httpserver and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-10 17:12:50 -0400 (Tue, 10 May 2011)
New Revision: 14351
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/pom.xml
Log:
Deploy org.jboss.com.sun.httpserver on AS6
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2011-05-10 21:01:43 UTC (rev 14350)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2011-05-10 21:12:50 UTC (rev 14351)
@@ -29,6 +29,10 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.com.sun.httpserver</groupId>
+ <artifactId>httpserver</artifactId>
+ </dependency>
<!-- Spring -->
<dependency>
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-05-10 21:01:43 UTC (rev 14350)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-05-10 21:12:50 UTC (rev 14351)
@@ -52,6 +52,7 @@
<includes>
<include>org.jboss.ws.cxf:*</include>
<include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include>
+ <include>org.jboss.com.sun.httpserver:httpserver:jar</include>
<include>org.apache.cxf:cxf-*</include>
<include>org.apache.cxf.xjcplugins:cxf-*</include>
<include>com.sun.xml.bind:jaxb-impl:jar</include>
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-05-10 21:01:43 UTC (rev 14350)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-05-10 21:12:50 UTC (rev 14351)
@@ -35,6 +35,7 @@
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
<include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
+ <include name="**/httpserver.jar"/>
<include name="**/jsr181-api.jar"/>
<include name="**/jbossws-api.jar"/>
<include name="**/jbossws-common.jar"/>
@@ -74,6 +75,7 @@
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
<include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
+ <include name="**/httpserver.jar"/>
<include name="**/jsr181-api.jar"/>
<include name="**/jboss-jaxb-intros.jar"/>
<include name="**/jbossws-api.jar"/>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-05-10 21:01:43 UTC (rev 14350)
+++ stack/cxf/trunk/pom.xml 2011-05-10 21:12:50 UTC (rev 14351)
@@ -68,6 +68,7 @@
<jboss.xb.version>2.0.2.Beta7</jboss.xb.version>
<picketbox.version>3.0.0.Beta5</picketbox.version>
<jaxws-jboss-httpserver-httpspi.version>1.0.0.GA</jaxws-jboss-httpserver-httpspi.version>
+ <httpserver.version>1.0.0.Beta1</httpserver.version>
<jaxb.api.version>1.0.0.Final</jaxb.api.version>
<jaxb.impl.version>2.2</jaxb.impl.version>
<jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
@@ -983,6 +984,11 @@
<artifactId>asm</artifactId>
<version>${cxf.asm.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.com.sun.httpserver</groupId>
+ <artifactId>httpserver</artifactId>
+ <version>${httpserver.version}</version>
+ </dependency>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
13 years
JBossWS SVN: r14350 - stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-05-10 17:01:43 -0400 (Tue, 10 May 2011)
New Revision: 14350
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java
Log:
fixing compilation issue
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java 2011-05-10 16:17:01 UTC (rev 14349)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/JBWS3277TestCase.java 2011-05-10 21:01:43 UTC (rev 14350)
@@ -61,7 +61,7 @@
Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
SOAPBinding binding = (SOAPBinding) ((BindingProvider) port).getBinding();
binding.setMTOMEnabled(true);
- File file = JBossWSTestHelper.getResourceFile("jaxws/jbws3277/test-message.xml");
+ File file = getResourceFile("jaxws/jbws3277/test-message.xml");
DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
13 years
JBossWS SVN: r14349 - in stack/cxf/trunk: modules/addons/transports/http/httpserver and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-10 12:17:01 -0400 (Tue, 10 May 2011)
New Revision: 14349
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-jboss-httpserver-httpspi/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-httpserver-httpspi/
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/pom.xml
Log:
- com.sun.net.httpserver -> org.jboss.com.sun.httpserver
- removal of duplicated dependencies in main pom.xml
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2011-05-10 15:43:51 UTC (rev 14348)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2011-05-10 16:17:01 UTC (rev 14349)
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.jboss.ws.projects</groupId>
- <artifactId>jaxws-httpserver-httpspi</artifactId>
+ <artifactId>jaxws-jboss-httpserver-httpspi</artifactId>
</dependency>
<!-- CXF dependencies -->
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2011-05-10 15:43:51 UTC (rev 14348)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2011-05-10 16:17:01 UTC (rev 14349)
@@ -35,8 +35,8 @@
import org.apache.cxf.transport.http_jaxws_spi.JAXWSHttpSpiDestination;
import org.jboss.ws.httpserver_httpspi.HttpExchangeDelegate;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
+import org.jboss.com.sun.net.httpserver.HttpExchange;
+import org.jboss.com.sun.net.httpserver.HttpHandler;
/**
* HTTP destination to be used with the JDK6 httpserver; this extends the
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java 2011-05-10 15:43:51 UTC (rev 14348)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java 2011-05-10 16:17:01 UTC (rev 14349)
@@ -30,8 +30,8 @@
import org.apache.cxf.common.logging.LogUtils;
import org.jboss.ws.httpserver_httpspi.PathUtils;
-import com.sun.net.httpserver.HttpHandler;
-import com.sun.net.httpserver.HttpServer;
+import org.jboss.com.sun.net.httpserver.HttpHandler;
+import org.jboss.com.sun.net.httpserver.HttpServer;
/**
* A server engine that internally uses the JDK6 httpserver
@@ -40,7 +40,6 @@
* @since 19-Aug-2010
*
*/
-@SuppressWarnings("restriction")
public class HttpServerEngine
{
private static final Logger LOG = LogUtils.getL7dLogger(HttpServerEngine.class);
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java 2011-05-10 15:43:51 UTC (rev 14348)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java 2011-05-10 16:17:01 UTC (rev 14349)
@@ -119,8 +119,7 @@
}
}
- @SuppressWarnings("restriction")
- private class MyTestHandler implements com.sun.net.httpserver.HttpHandler
+ private class MyTestHandler implements org.jboss.com.sun.net.httpserver.HttpHandler
{
volatile int count;
@@ -130,7 +129,7 @@
}
@Override
- public void handle(com.sun.net.httpserver.HttpExchange exchange) throws IOException {
+ public void handle(org.jboss.com.sun.net.httpserver.HttpExchange exchange) throws IOException {
count++;
exchange.sendResponseHeaders(200, 0);
OutputStream os = exchange.getResponseBody();
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-05-10 15:43:51 UTC (rev 14348)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-05-10 16:17:01 UTC (rev 14349)
@@ -51,7 +51,7 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws.cxf:*</include>
- <include>org.jboss.ws.projects:jaxws-httpserver-httpspi:jar</include>
+ <include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include>
<include>org.apache.cxf:cxf-*</include>
<include>org.apache.cxf.xjcplugins:cxf-*</include>
<include>com.sun.xml.bind:jaxb-impl:jar</include>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2011-05-10 15:43:51 UTC (rev 14348)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2011-05-10 16:17:01 UTC (rev 14349)
@@ -33,7 +33,7 @@
<module name="org.jboss.ws.common" />
<module name="javax.annotation.api" />
<module name="javax.xml.ws.api" />
- <module name="org.jboss.ws.jaxws-httpserver-httpspi" />
+ <module name="org.jboss.ws.jaxws-jboss-httpserver-httpspi" />
<module name="org.apache.cxf" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml 2011-05-10 16:17:01 UTC (rev 14349)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.ws.jaxws-jboss-httpserver-httpspi">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.xml.ws.api" />
+ <module name="org.jboss.com.sun.httpserver"/>
+ </dependencies>
+</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2011-05-10 15:43:51 UTC (rev 14348)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2011-05-10 16:17:01 UTC (rev 14349)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar client/cxf-*.jar client/geronimo-*.jar client/jaxws-httpserver-httpspi.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client!
/jbossws-common-tools.jar client/jbossws-framework.jar client/jbossws-api.jar client/jbossws-spi.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/cxf-*.jar common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-api.jar common/lib/jbossws-spi.jar common/lib/com!
mons-beanutils.jar lib/endorsed/*jbossws* lib/endorsed/*jaxb*.!
jar lib/
endorsed/*jaxws*.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar client/cxf-*.jar client/geronimo-*.jar client/jaxws-*httpserver-httpspi.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar clien!
t/jbossws-common-tools.jar client/jbossws-framework.jar client/jbossws-api.jar client/jbossws-spi.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/cxf-*.jar common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-api.jar common/lib/jbossws-spi.jar common/lib/co!
mmons-beanutils.jar lib/endorsed/*jbossws* lib/endorsed/*jaxb*!
.jar lib
/endorsed/*jaxws*.jar
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-05-10 15:43:51 UTC (rev 14348)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-05-10 16:17:01 UTC (rev 14349)
@@ -34,7 +34,7 @@
<include name="**/jaxb-xjc.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
- <include name="**/jaxws-httpserver-httpspi.jar"/>
+ <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
<include name="**/jsr181-api.jar"/>
<include name="**/jbossws-api.jar"/>
<include name="**/jbossws-common.jar"/>
@@ -73,7 +73,7 @@
<include name="**/FastInfoset.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
- <include name="**/jaxws-httpserver-httpspi.jar"/>
+ <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
<include name="**/jsr181-api.jar"/>
<include name="**/jboss-jaxb-intros.jar"/>
<include name="**/jbossws-api.jar"/>
@@ -332,9 +332,9 @@
<include name="**/jbossws-cxf-client.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/org/jboss/ws/jaxws-httpserver-httpspi/main" flatten="false" overwrite="true">
+ <copy todir="@{targetdir}/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
- <include name="**/jaxws-httpserver-httpspi.jar"/>
+ <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
</fileset>
</copy>
<copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-server/main" flatten="false" overwrite="true">
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-05-10 15:43:51 UTC (rev 14348)
+++ stack/cxf/trunk/pom.xml 2011-05-10 16:17:01 UTC (rev 14349)
@@ -67,7 +67,7 @@
<jboss.security.sx.version>2.0.4</jboss.security.sx.version>
<jboss.xb.version>2.0.2.Beta7</jboss.xb.version>
<picketbox.version>3.0.0.Beta5</picketbox.version>
- <jaxws-httpserver-httpspi.version>1.0.0.GA</jaxws-httpserver-httpspi.version>
+ <jaxws-jboss-httpserver-httpspi.version>1.0.0.GA</jaxws-jboss-httpserver-httpspi.version>
<jaxb.api.version>1.0.0.Final</jaxb.api.version>
<jaxb.impl.version>2.2</jaxb.impl.version>
<jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
@@ -162,8 +162,8 @@
<!-- END -->
<dependency>
<groupId>org.jboss.ws.projects</groupId>
- <artifactId>jaxws-httpserver-httpspi</artifactId>
- <version>${jaxws-httpserver-httpspi.version}</version>
+ <artifactId>jaxws-jboss-httpserver-httpspi</artifactId>
+ <version>${jaxws-jboss-httpserver-httpspi.version}</version>
</dependency>
<!-- provided apis -->
@@ -1181,19 +1181,6 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-shared-testsuite</artifactId>
- <version>${jbossws.shared.testsuite.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-shared-testsuite</artifactId>
- <version>${jbossws.shared.testsuite.version}</version>
- <type>zip</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
13 years