[jbossws-commits] JBossWS SVN: r2934 - in trunk: jbossws-core/src/java/org/jboss/ws/core/jaxrpc and 10 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Apr 26 15:01:58 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-04-26 15:01:58 -0400 (Thu, 26 Apr 2007)
New Revision: 2934
Added:
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/application-client.xml
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/web.xml
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/wstools-config.xml
Removed:
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/application-client.xml
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/web.xml
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl
trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/wstools-config.xml
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/ServletEndpointContextImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java
Log:
[JBWS-1511] MessageFactory does not preserve comments. Fix test regression.
[JBWS-1619] ServletEndpointContext.getHttpSession always creates HTTPSession. Add Test
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-04-26 19:01:58 UTC (rev 2934)
@@ -226,10 +226,13 @@
xmlName = namespaceRegistry.registerQName(xmlName);
Name soapName = new NameImpl(xmlName.getLocalPart(), xmlName.getPrefix(), xmlName.getNamespaceURI());
- if (log.isDebugEnabled())
- log.debug("Add unboundHeader element: " + soapName);
+ log.debug("Add unboundHeader element: " + soapName);
SOAPContentElement contentElement = new SOAPHeaderElementImpl(soapName);
contentElement.setParamMetaData(unboundHeader.toParameterMetaData(opMetaData));
+
+ if (soapHeader == null)
+ soapHeader = soapEnvelope.addHeader();
+
soapHeader.addChildElement(contentElement);
contentElement.setObjectValue(value);
}
@@ -542,7 +545,7 @@
throwFaultException((SOAPFaultImpl)soapBodyElement);
// Extract unbound OUT headers
- if (unboundHeaders != null)
+ if (unboundHeaders != null && soapHeader != null)
{
Map<QName, UnboundHeader> outHeaders = new HashMap<QName, UnboundHeader>();
Iterator itHeaderElements = soapHeader.getChildElements();
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/ServletEndpointContextImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/ServletEndpointContextImpl.java 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/ServletEndpointContextImpl.java 2007-04-26 19:01:58 UTC (rev 2934)
@@ -53,9 +53,22 @@
this.response = context.getHttpServletResponse();
}
+ /**
+ * The getHttpSession method returns the current HTTP session (as a javax.servlet.http.HTTPSession).
+ * When invoked by the service endpoint within a remote method implementation, the getHttpSession returns the HTTP
+ * session associated currently with this method invocation. This method returns null if there is no HTTP session
+ * currently active and associated with this service endpoint. An endpoint class should not rely on an active HTTP
+ * session being always there; the underlying JAX-RPC runtime system is responsible for managing whether or not there
+ * is an active HTTP session.
+ *
+ * The getHttpSession method throws JAXRPCException if invoked by an non HTTP bound endpoint.
+ *
+ * @return The HTTP session associated with the current invocation or null if there is no active session.
+ */
public HttpSession getHttpSession()
{
- return request.getSession();
+ // [JBWS-1619] ServletEndpointContext.getHttpSession has an incorrect implementation
+ return request.getSession(false);
}
public MessageContext getMessageContext()
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-04-26 19:01:58 UTC (rev 2934)
@@ -31,6 +31,7 @@
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
@@ -63,6 +64,8 @@
private static Logger log = Logger.getLogger(EnvelopeBuilderDOM.class);
private SOAPFactoryImpl soapFactory;
+ private String envNamespace;
+ private boolean isSOAP11;
private Style style;
public EnvelopeBuilderDOM(Style style)
@@ -117,7 +120,10 @@
SOAPPartImpl soapPart = (SOAPPartImpl)soapMessage.getSOAPPart();
SOAPEnvelopeImpl soapEnv = new SOAPEnvelopeImpl(soapPart, soapFactory.createElement(domEnv, false), false);
- Document ownerDoc = soapEnv.getOwnerDocument();
+ // Get the envelope namespace
+ envNamespace = soapEnv.getNamespaceURI();
+ isSOAP11 = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE.equals(envNamespace);
+
DOMUtils.copyAttributes(soapEnv, domEnv);
NodeList envChildNodes = domEnv.getChildNodes();
@@ -143,14 +149,11 @@
}
else if (childType == Node.COMMENT_NODE)
{
- String nodeValue = child.getNodeValue();
- Comment comment = ownerDoc.createComment(nodeValue);
- soapEnv.appendChild(comment);
+ appendCommentNode(soapEnv, child);
}
else if (childType == Node.TEXT_NODE)
{
- String nodeValue = child.getNodeValue();
- soapEnv.addTextNode(nodeValue);
+ appendTextNode(soapEnv, child);
}
else
{
@@ -167,7 +170,6 @@
if (soapHeader == null)
soapHeader = soapEnv.addHeader();
- Document ownerDoc = soapEnv.getOwnerDocument();
DOMUtils.copyAttributes(soapHeader, domHeader);
NodeList headerChildNodes = domHeader.getChildNodes();
@@ -189,14 +191,11 @@
}
else if (childType == Node.COMMENT_NODE)
{
- String nodeValue = child.getNodeValue();
- Comment comment = ownerDoc.createComment(nodeValue);
- soapHeader.appendChild(comment);
+ appendCommentNode(soapHeader, child);
}
else if (childType == Node.TEXT_NODE)
{
- String nodeValue = child.getNodeValue();
- soapHeader.addTextNode(nodeValue);
+ appendTextNode(soapHeader, child);
}
else
{
@@ -215,7 +214,6 @@
if (soapBody == null)
soapBody = (SOAPBodyImpl)soapEnv.addBody();
- Document ownerDoc = soapBody.getOwnerDocument();
DOMUtils.copyAttributes(soapBody, domBody);
SOAPBodyElement soapBodyElement = null;
@@ -241,14 +239,11 @@
}
else if (childType == Node.COMMENT_NODE)
{
- String nodeValue = child.getNodeValue();
- Comment comment = ownerDoc.createComment(nodeValue);
- soapBody.appendChild(comment);
+ appendCommentNode(soapBody, child);
}
else if (childType == Node.TEXT_NODE)
{
- String nodeValue = child.getNodeValue();
- soapBody.addTextNode(nodeValue);
+ appendTextNode(soapBody, child);
}
else
{
@@ -314,18 +309,20 @@
return soapBodyElement;
}
- public void buildBodyElementDoc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException
+ public SOAPBodyElement buildBodyElementDoc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException
{
Element srcElement = (Element)domBodyElement;
QName beName = DOMUtils.getElementQName(domBodyElement);
- SOAPContentElement contentElement = new SOAPBodyElementDoc(beName);
- contentElement = (SOAPContentElement)soapBody.addChildElement(contentElement);
+ SOAPBodyElementDoc soapBodyElement = new SOAPBodyElementDoc(beName);
+ SOAPContentElement contentElement = (SOAPContentElement)soapBody.addChildElement(soapBodyElement);
DOMUtils.copyAttributes(contentElement, srcElement);
XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement));
contentElement.setXMLFragment(xmlFragment);
+
+ return soapBodyElement;
}
public SOAPBodyElement buildBodyElementRpc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException
@@ -334,7 +331,6 @@
SOAPBodyElementRpc soapBodyElement = new SOAPBodyElementRpc(beName);
soapBodyElement = (SOAPBodyElementRpc)soapBody.addChildElement(soapBodyElement);
- Document ownerDoc = soapBody.getOwnerDocument();
DOMUtils.copyAttributes(soapBodyElement, domBodyElement);
NodeList nlist = domBodyElement.getChildNodes();
@@ -356,14 +352,11 @@
}
else if (childType == Node.COMMENT_NODE)
{
- String nodeValue = child.getNodeValue();
- Comment comment = ownerDoc.createComment(nodeValue);
- soapBodyElement.appendChild(comment);
+ appendCommentNode(soapBodyElement, child);
}
else if (childType == Node.TEXT_NODE)
{
- String nodeValue = child.getNodeValue();
- soapBodyElement.addTextNode(nodeValue);
+ appendTextNode(soapBodyElement, child);
}
else
{
@@ -380,7 +373,6 @@
SOAPBodyElement soapBodyElement = new SOAPBodyElementMessage(beName);
soapBodyElement = (SOAPBodyElementMessage)soapBody.addChildElement(soapBodyElement);
- Document ownerDoc = soapBody.getOwnerDocument();
DOMUtils.copyAttributes(soapBodyElement, domBodyElement);
NodeList nlist = domBodyElement.getChildNodes();
@@ -395,14 +387,11 @@
}
else if (childType == Node.COMMENT_NODE)
{
- String nodeValue = child.getNodeValue();
- Comment comment = ownerDoc.createComment(nodeValue);
- soapBodyElement.appendChild(comment);
+ appendCommentNode(soapBodyElement, child);
}
else if (childType == Node.TEXT_NODE)
{
- String nodeValue = child.getNodeValue();
- soapBodyElement.addTextNode(nodeValue);
+ appendTextNode(soapBodyElement, child);
}
else if (childType == Node.CDATA_SECTION_NODE)
{
@@ -417,4 +406,24 @@
return soapBodyElement;
}
+
+ private void appendCommentNode(SOAPElement soapElement, Node child)
+ {
+ if (isSOAP11)
+ {
+ String nodeValue = child.getNodeValue();
+ Document ownerDoc = soapElement.getOwnerDocument();
+ Comment comment = ownerDoc.createComment(nodeValue);
+ soapElement.appendChild(comment);
+ }
+ }
+
+ private void appendTextNode(SOAPElement soapElement, Node child) throws SOAPException
+ {
+ if (isSOAP11)
+ {
+ String nodeValue = child.getNodeValue();
+ soapElement.addTextNode(nodeValue);
+ }
+ }
}
Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -2453,6 +2453,33 @@
</metainf>
</jar>
+ <!-- jbossws-jbws1619 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1619.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1619-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1619/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1619/ClientHandler.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jaxrpc-marshall-doclit.war -->
<war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-04-26 19:01:58 UTC (rev 2934)
@@ -184,7 +184,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
soapMessage.writeTo(baos);
- String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><ns1:hello xmlns:ns1='http://handlerservice1.org/wsdl'><String_1>world::SOAP header was added</String_1></ns1:hello></env:Body></env:Envelope>";
+ String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Body><ns1:hello xmlns:ns1='http://handlerservice1.org/wsdl'><String_1>world::SOAP header was added</String_1></ns1:hello></env:Body></env:Envelope>";
assertEquals(expEnv, baos.toString());
}
}
Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619 (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619)
Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java 2007-04-26 19:01:58 UTC (rev 2934)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.jaxrpc.jbws1619;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.GenericHandler;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.MimeHeaders;
-
-import org.jboss.logging.Logger;
-
-/**
- * A simple client side handler
- *
- * @author thomas.diesler at jboss.org
- */
-public class ClientHandler extends GenericHandler
-{
- // provide logging
- private static final Logger log = Logger.getLogger(ClientHandler.class);
-
- public static String message;
- public static String cookie;
-
- public QName[] getHeaders()
- {
- return new QName[0];
- }
-
- public boolean handleResponse(MessageContext msgContext)
- {
- log.info("handleResponse");
-
- try
- {
- if ("Use MessageContext".equals(message))
- {
- SOAPMessageContext soapContext = (SOAPMessageContext)msgContext;
- MimeHeaders mimeHeaders = soapContext.getMessage().getMimeHeaders();
-
- String[] cookies = mimeHeaders.getHeader("Set-Cookie");
- if (cookies == null || cookies.length != 1)
- throw new IllegalStateException("Unexpected cookie list: " + mimeHeaders);
-
- cookie = cookies[0];
- }
- }
- catch (Exception e)
- {
- log.error("Handler processing error", e);
- }
-
- return true;
- }
-}
Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java)
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java (rev 0)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java 2007-04-26 19:01:58 UTC (rev 2934)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.jaxrpc.jbws1619;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.MimeHeaders;
+
+import org.jboss.logging.Logger;
+
+/**
+ * A simple client side handler
+ *
+ * @author thomas.diesler at jboss.org
+ */
+public class ClientHandler extends GenericHandler
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ClientHandler.class);
+
+ public static String message;
+ public static String cookie;
+
+ public QName[] getHeaders()
+ {
+ return new QName[0];
+ }
+
+ public boolean handleResponse(MessageContext msgContext)
+ {
+ log.info("handleResponse");
+
+ try
+ {
+ if ("Use MessageContext".equals(message))
+ {
+ SOAPMessageContext soapContext = (SOAPMessageContext)msgContext;
+ MimeHeaders mimeHeaders = soapContext.getMessage().getMimeHeaders();
+
+ String[] cookies = mimeHeaders.getHeader("Set-Cookie");
+ if (cookies == null || cookies.length != 1)
+ throw new IllegalStateException("Unexpected cookie list: " + mimeHeaders);
+
+ cookie = cookies[0];
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Handler processing error", e);
+ }
+
+ return true;
+ }
+}
Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-04-26 19:01:58 UTC (rev 2934)
@@ -1,92 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1619;
-
-import java.io.File;
-import java.net.URL;
-
-import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
-
-/**
- * ServletEndpointContext.getHttpSession has an incorrect implementation
- *
- * http://jira.jboss.org/jira/browse/JBWS-1619
- *
- * @author Thomas.Diesler at jboss.com
- * @since 23-Apr-2007
- */
-public class JBWS1619TestCase extends JBossWSTest
-{
-
- private static TestEndpoint port;
-
- public static Test suite() throws Exception
- {
- return JBossWSTestSetup.newTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-client.jar");
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- if (isTargetJBoss())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new File("resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl").toURL();
- URL mappingURL = new File("resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml").toURL();
- QName qname = new QName("http://org.jboss.test.ws/jbws1619", "TestService");
- Service service = factory.createService(wsdlURL, qname, mappingURL);
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
- }
- }
-
- public void testServletEndpointContext() throws Exception
- {
- ClientHandler.message = "Use ServletEndpointContext";
- String retStr = port.echoString(ClientHandler.message);
- assertEquals("httpSession: null", retStr);
- }
-
- public void testMessageContext() throws Exception
- {
- ClientHandler.message = "Use MessageContext";
- String retStr = port.echoString(ClientHandler.message);
- assertTrue("Expect a session", retStr.startsWith("httpSession") && !retStr.endsWith("null"));
- assertTrue("Expect a cookie", ClientHandler.cookie.startsWith("JSESSIONID"));
- }
-}
Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java)
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java (rev 0)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-04-26 19:01:58 UTC (rev 2934)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1619;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+
+/**
+ * ServletEndpointContext.getHttpSession has an incorrect implementation
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1619
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 23-Apr-2007
+ */
+public class JBWS1619TestCase extends JBossWSTest
+{
+
+ private static TestEndpoint port;
+
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-client.jar");
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ if (isTargetJBoss())
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ }
+ else
+ {
+ ServiceFactoryImpl factory = new ServiceFactoryImpl();
+ URL wsdlURL = new File("resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml").toURL();
+ QName qname = new QName("http://org.jboss.test.ws/jbws1619", "TestService");
+ Service service = factory.createService(wsdlURL, qname, mappingURL);
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ }
+ }
+ }
+
+ public void testServletEndpointContext() throws Exception
+ {
+ ClientHandler.message = "Use ServletEndpointContext";
+ String retStr = port.echoString(ClientHandler.message);
+ assertEquals("httpSession: null", retStr);
+ }
+
+ public void testMessageContext() throws Exception
+ {
+ ClientHandler.message = "Use MessageContext";
+ String retStr = port.echoString(ClientHandler.message);
+ assertTrue("Expect a session", retStr.startsWith("httpSession") && !retStr.endsWith("null"));
+ assertTrue("Expect a cookie", ClientHandler.cookie.startsWith("JSESSIONID"));
+ }
+}
Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java 2007-04-26 19:01:58 UTC (rev 2934)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1619;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface TestEndpoint extends Remote
-{
-
- public String echoString(final String message) throws RemoteException;
-
-}
Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java)
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java (rev 0)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java 2007-04-26 19:01:58 UTC (rev 2934)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1619;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+public interface TestEndpoint extends Remote
+{
+
+ public String echoString(final String message) throws RemoteException;
+
+}
Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java 2007-04-26 19:01:58 UTC (rev 2934)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1619;
-
-import java.rmi.RemoteException;
-
-import javax.servlet.http.HttpSession;
-import javax.xml.rpc.ServiceException;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.server.ServiceLifecycle;
-import javax.xml.rpc.server.ServletEndpointContext;
-
-import org.jboss.logging.Logger;
-
-public class TestEndpointImpl implements TestEndpoint, ServiceLifecycle
-{
- private Logger log = Logger.getLogger(TestEndpointImpl.class);
-
- private ServletEndpointContext context;
-
- public String echoString(String message) throws RemoteException
- {
- HttpSession httpSession = null;
- if ("Use ServletEndpointContext".equals(message))
- {
- httpSession = context.getHttpSession();
- }
- else if ("Use MessageContext".equals(message))
- {
- MessageContext msgContext = context.getMessageContext();
- httpSession = (HttpSession)msgContext.getProperty("javax.xml.ws.servlet.session");
- }
-
- log.info("echoString: " + httpSession);
- return "httpSession: " + httpSession;
- }
-
- public void init(Object context) throws ServiceException
- {
- this.context = (ServletEndpointContext)context;
- }
-
- public void destroy()
- {
- }
-}
Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java)
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java (rev 0)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java 2007-04-26 19:01:58 UTC (rev 2934)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1619;
+
+import java.rmi.RemoteException;
+
+import javax.servlet.http.HttpSession;
+import javax.xml.rpc.ServiceException;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.server.ServiceLifecycle;
+import javax.xml.rpc.server.ServletEndpointContext;
+
+import org.jboss.logging.Logger;
+
+public class TestEndpointImpl implements TestEndpoint, ServiceLifecycle
+{
+ private Logger log = Logger.getLogger(TestEndpointImpl.class);
+
+ private ServletEndpointContext context;
+
+ public String echoString(String message) throws RemoteException
+ {
+ HttpSession httpSession = null;
+ if ("Use ServletEndpointContext".equals(message))
+ {
+ httpSession = context.getHttpSession();
+ }
+ else if ("Use MessageContext".equals(message))
+ {
+ MessageContext msgContext = context.getMessageContext();
+ httpSession = (HttpSession)msgContext.getProperty("javax.xml.ws.servlet.session");
+ }
+
+ log.info("echoString: " + httpSession);
+ return "httpSession: " + httpSession;
+ }
+
+ public void init(Object context) throws ServiceException
+ {
+ this.context = (ServletEndpointContext)context;
+ }
+
+ public void destroy()
+ {
+ }
+}
Copied: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619 (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619)
Copied: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF)
Deleted: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/application-client.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/application-client.xml 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/application-client.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client 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/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>TestService</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- <handler>
- <handler-name>ClientHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.jbws1619.ClientHandler</handler-class>
- </handler>
- </service-ref>
-
-</application-client>
-
Copied: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/application-client.xml (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/application-client.xml)
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/application-client.xml (rev 0)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/application-client.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client 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/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>TestService</display-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ <handler>
+ <handler-name>ClientHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.jbws1619.ClientHandler</handler-class>
+ </handler>
+ </service-ref>
+
+</application-client>
+
Deleted: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1619/TestEndpoint?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml)
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml (rev 0)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-client PUBLIC
+ "-//JBoss//DTD Application Client 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
+<jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1619/TestEndpoint?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Copied: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF)
Deleted: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.jbws1619</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1619/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1619'>serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>TestEndpointPort</port-name>
- <java-port-name>TestEndpointPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1619'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1619'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echoString</java-method-name>
- <wsdl-operation>echoString</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1619'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message>
- <wsdl-message-part-name>String_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1619'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml (rev 0)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1619</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1619/types</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1619'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1619'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1619'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echoString</java-method-name>
+ <wsdl-operation>echoString</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1619'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message>
+ <wsdl-message-part-name>String_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1619'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/web.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/web.xml 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/web.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -1,19 +0,0 @@
-<?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>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/TestEndpoint</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/web.xml (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/web.xml)
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/web.xml (rev 0)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/web.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -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>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/TestEndpoint</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Deleted: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1619' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
- <webservice-description>
- <webservice-description-name>TestService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>TestEndpointPort</port-component-name>
- <wsdl-port>impl:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml)
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml (rev 0)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -0,0 +1,15 @@
+<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1619' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port>impl:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl)
Deleted: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl 2007-04-26 19:01:58 UTC (rev 2934)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1619' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1619' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types/>
- <message name='TestEndpoint_echoString'>
- <part name='String_1' type='xsd:string'/>
- </message>
- <message name='TestEndpoint_echoStringResponse'>
- <part name='result' type='xsd:string'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echoString' parameterOrder='String_1'>
- <input message='tns:TestEndpoint_echoString'/>
- <output message='tns:TestEndpoint_echoStringResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echoString'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1619' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1619' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='http://localhost:8080//jaxrpc-jbws1619/TestEndpoint?wsdl'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl)
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl 2007-04-26 19:01:58 UTC (rev 2934)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1619' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1619' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types/>
+ <message name='TestEndpoint_echoString'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_echoStringResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echoString' parameterOrder='String_1'>
+ <input message='tns:TestEndpoint_echoString'/>
+ <output message='tns:TestEndpoint_echoStringResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoString'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1619' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1619' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='http://localhost:8080//jaxrpc-jbws1619/TestEndpoint?wsdl'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/wstools-config.xml 2007-04-26 18:42:38 UTC (rev 2933)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/wstools-config.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
--->
-
-<!-- Set the soap:address location to 'http://localhost:8080//jbossws-jbws1619/TestEndpoint?wsdl' to run with Tomcat -->
-
-<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
- <java-wsdl>
- <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1619" type-namespace="http://org.jboss.test.ws/jbws1619/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
Copied: trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/wstools-config.xml (from rev 2933, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/wstools-config.xml)
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/wstools-config.xml (rev 0)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1619/wstools-config.xml 2007-04-26 19:01:58 UTC (rev 2934)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
+-->
+
+<!-- Set the soap:address location to 'http://localhost:8080//jbossws-jbws1619/TestEndpoint?wsdl' to run with Tomcat -->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+ <java-wsdl>
+ <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint" style="rpc">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1619" type-namespace="http://org.jboss.test.ws/jbws1619/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+</configuration>
More information about the jbossws-commits
mailing list