JBossWS SVN: r13058 - in stack/cxf/trunk/modules: testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: sergeyb
Date: 2010-10-04 13:58:22 -0400 (Mon, 04 Oct 2010)
New Revision: 13058
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/SOAPConnectionTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/ServiceIface.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/ServiceImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/saaj/cxf/WEB-INF/wsdl/SaajService.wsdl
Log:
[JBWS-3084] Implementing SOAPConnection.get
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2010-10-04 17:01:43 UTC (rev 13057)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2010-10-04 17:58:22 UTC (rev 13058)
@@ -58,13 +58,10 @@
{
private boolean closed = false;
- @SuppressWarnings("unchecked")
@Override
public SOAPMessage call(SOAPMessage msgOut, Object addressObject) throws SOAPException
{
- if (closed) {
- throw new SOAPException("Cannot send messages using a previously closed connection!");
- }
+ checkClosed();
String address = getAddress(addressObject);
ConduitInitiator ci = getConduitInitiator(address);
@@ -84,7 +81,7 @@
Map<String, List<String>> outHeaders = new HashMap<String, List<String>>();
- for (Iterator it = msgOut.getMimeHeaders().getAllHeaders(); it.hasNext();)
+ for (Iterator<?> it = msgOut.getMimeHeaders().getAllHeaders(); it.hasNext();)
{
MimeHeader mimeHeader = (MimeHeader)it.next();
if ("Content-Type".equals(mimeHeader.getName()))
@@ -116,27 +113,7 @@
OutputStream outs = outMessage.getContent(OutputStream.class);
msgOut.writeTo(outs);
- c.setMessageObserver(new MessageObserver() {
- public void onMessage(Message inMessage)
- {
- LoadingByteArrayOutputStream bout = new LoadingByteArrayOutputStream();
- try
- {
- IOUtils.copy(inMessage.getContent(InputStream.class), bout);
- inMessage.getExchange().put(InputStream.class, bout.createInputStream());
-
- Map<String, List<String>> inHeaders =
- (Map<String, List<String>>)inMessage.get(Message.PROTOCOL_HEADERS);
-
- inMessage.getExchange().put(Message.PROTOCOL_HEADERS, inHeaders);
- c.close(inMessage);
- }
- catch (IOException e)
- {
- //ignore
- }
- }
- });
+ c.setMessageObserver(createMessageObserver(c));
c.close(outMessage);
}
@@ -146,52 +123,44 @@
}
// read SOAPMessage
+ return readSoapMessage(exch);
+ }
+
+ @Override
+ public SOAPMessage get(Object addressObject) throws SOAPException
+ {
+ checkClosed();
+
+ String address = getAddress(addressObject);
+ ConduitInitiator ci = getConduitInitiator(address);
+
+
+ // create a new Message and Exchange
+ EndpointInfo info = new EndpointInfo();
+ info.setAddress(address);
+ Message outMessage = new MessageImpl();
+ Exchange exch = new ExchangeImpl();
+ outMessage.setExchange(exch);
+
+ // sent GET request
try
{
- InputStream ins = exch.get(InputStream.class);
- Map<String, List<String>> inHeaders =
- (Map<String, List<String>>)exch.get(Message.PROTOCOL_HEADERS);
+ final Conduit c = ci.getConduit(info);
- MimeHeaders mimeHeaders = new MimeHeaders();
- if (inHeaders != null)
- {
- for (Map.Entry<String, List<String>> entry : inHeaders.entrySet())
- {
- if (entry.getValue() != null)
- {
- for (String value : entry.getValue())
- {
- mimeHeaders.addHeader(entry.getKey(), value);
- }
- }
- }
- }
+ outMessage.put(Message.HTTP_REQUEST_METHOD, "GET");
+ c.prepare(outMessage);
- //if inputstream is empty, no need to build
- if (ins.markSupported())
- {
- ins.mark(1);
- final int bytesRead = ins.read(new byte[1]);
- ins.reset();
- if (bytesRead == -1)
- {
- return null;
- }
- }
- else if (ins.available() == 0)
- {
- return null;
- }
-
- MessageFactory msgFac = MessageFactory.newInstance(SOAPConstants.DYNAMIC_SOAP_PROTOCOL);
- return msgFac.createMessage(mimeHeaders, ins);
+ c.setMessageObserver(createMessageObserver(c));
+
+ c.close(outMessage);
}
catch (Exception ex)
- {
- throw new SOAPException("SOAPMessage can not be read", ex);
- }
-
-
+ {
+ throw new SOAPException("GET request can not be sent", ex);
+ }
+
+ // read SOAPMessage
+ return readSoapMessage(exch);
}
@Override
@@ -214,27 +183,119 @@
+ " is not supported");
}
- private ConduitInitiator getConduitInitiator(String address) throws SOAPException {
-
- ConduitInitiator ci = null;
- try {
- Bus bus = BusFactory.getThreadDefaultBus(true);
- ConduitInitiatorManager mgr = bus.getExtension(ConduitInitiatorManager.class);
+ private ConduitInitiator getConduitInitiator(String address) throws SOAPException
+ {
+ ConduitInitiator ci = null;
+ try
+ {
+ Bus bus = BusFactory.getThreadDefaultBus(true);
+ ConduitInitiatorManager mgr = bus.getExtension(ConduitInitiatorManager.class);
- if (address.startsWith("http")) {
- ci = mgr.getConduitInitiator("http://cxf.apache.org/transports/http");
- }
- if (ci == null) {
- ci = mgr.getConduitInitiatorForUri(address);
- }
+ if (address.startsWith("http"))
+ {
+ ci = mgr.getConduitInitiator("http://cxf.apache.org/transports/http");
+ }
+ if (ci == null)
+ {
+ ci = mgr.getConduitInitiatorForUri(address);
+ }
- } catch (Exception ex) {
- throw new SOAPException("No ConduitInitiator is available for " + address, ex);
- }
+ }
+ catch (Exception ex)
+ {
+ throw new SOAPException("No ConduitInitiator is available for " + address, ex);
+ }
- if (ci == null) {
- throw new SOAPException("No ConduitInitiator is available for " + address);
- }
- return ci;
+ if (ci == null)
+ {
+ throw new SOAPException("No ConduitInitiator is available for " + address);
+ }
+ return ci;
}
+
+ @SuppressWarnings("unchecked")
+ private MessageObserver createMessageObserver(final Conduit c)
+ {
+ return new MessageObserver()
+ {
+ public void onMessage(Message inMessage)
+ {
+ LoadingByteArrayOutputStream bout = new LoadingByteArrayOutputStream();
+ try
+ {
+ IOUtils.copy(inMessage.getContent(InputStream.class), bout);
+ inMessage.getExchange().put(InputStream.class, bout.createInputStream());
+
+ Map<String, List<String>> inHeaders =
+ (Map<String, List<String>>)inMessage.get(Message.PROTOCOL_HEADERS);
+
+ inMessage.getExchange().put(Message.PROTOCOL_HEADERS, inHeaders);
+ c.close(inMessage);
+ }
+ catch (IOException e)
+ {
+ //ignore
+ }
+ }
+ };
+ }
+
+ @SuppressWarnings("unchecked")
+ private SOAPMessage readSoapMessage(Exchange exch) throws SOAPException
+ {
+ // read SOAPMessage
+ try
+ {
+ InputStream ins = exch.get(InputStream.class);
+
+ Map<String, List<String>> inHeaders =
+ (Map<String, List<String>>)exch.get(Message.PROTOCOL_HEADERS);
+
+ MimeHeaders mimeHeaders = new MimeHeaders();
+ if (inHeaders != null)
+ {
+ for (Map.Entry<String, List<String>> entry : inHeaders.entrySet())
+ {
+ if (entry.getValue() != null)
+ {
+ for (String value : entry.getValue())
+ {
+ mimeHeaders.addHeader(entry.getKey(), value);
+ }
+ }
+ }
+ }
+
+ //if inputstream is empty, no need to build
+ if (ins.markSupported())
+ {
+ ins.mark(1);
+ final int bytesRead = ins.read(new byte[1]);
+ ins.reset();
+ if (bytesRead == -1)
+ {
+ return null;
+ }
+ }
+ else if (ins.available() == 0)
+ {
+ return null;
+ }
+
+ MessageFactory msgFac = MessageFactory.newInstance(SOAPConstants.DYNAMIC_SOAP_PROTOCOL);
+ return msgFac.createMessage(mimeHeaders, ins);
+ }
+ catch (Exception ex)
+ {
+ throw new SOAPException("SOAPMessage can not be read", ex);
+ }
+ }
+
+ private void checkClosed() throws SOAPException
+ {
+ if (closed) {
+ throw new SOAPException("Cannot send messages using a previously closed connection!");
+ }
+ }
+
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/SOAPConnectionTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/SOAPConnectionTestCase.java 2010-10-04 17:01:43 UTC (rev 13057)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/SOAPConnectionTestCase.java 2010-10-04 17:58:22 UTC (rev 13058)
@@ -46,23 +46,39 @@
*/
public class SOAPConnectionTestCase extends JBossWSTest
{
- private final String serviceURL = "http://" + getServerHost() + ":8080/saaj-soap-connection/SaajService";
-
public static Test suite()
{
return new JBossWSTestSetup(SOAPConnectionTestCase.class, "saaj-soap-connection.war");
}
- public void testSoapConnectionWithoutChunkedEncoding() throws Exception
+ public void testSoapConnectionPostWithoutChunkedEncoding() throws Exception
{
doTestSoapConnection(true);
}
- public void testSoapConnectionWithChunkedEncoding() throws Exception
+ public void testSoapConnectionPostWithChunkedEncoding() throws Exception
{
- doTestSoapConnection(false);
+ doTestSoapConnection(false);
}
+ // TODO: ignore until CXF 2.3 update to AbstractHttpDestination makes it into JBoss repos
+ public void ignoreTestSoapConnectionGet() throws Exception
+ {
+ final String serviceURL = "http://" + getServerHost() + ":8080/saaj-soap-connection/greetMe";
+ SOAPConnectionFactory conFac = SOAPConnectionFactory.newInstance();
+
+ SOAPConnection con = conFac.createConnection();
+ URL endpoint = new URL(serviceURL);
+ SOAPMessage response = con.get(endpoint);
+ QName greetMeResp = new QName("http://www.jboss.org/jbossws/saaj", "greetMeResponse");
+
+ Iterator<?> sayHiRespIterator = response.getSOAPBody().getChildElements(greetMeResp);
+ SOAPElement soapElement = (SOAPElement)sayHiRespIterator.next();
+ assertNotNull(soapElement);
+
+ assertEquals(1, response.countAttachments());
+ }
+
private void doTestSoapConnection(boolean disableChunking) throws Exception
{
SOAPFactory soapFac = SOAPFactory.newInstance();
@@ -94,6 +110,9 @@
msg.saveChanges();
SOAPConnection con = conFac.createConnection();
+
+ final String serviceURL = "http://" + getServerHost() + ":8080/saaj-soap-connection";
+
URL endpoint = new URL(serviceURL);
SOAPMessage response = con.call(msg, endpoint);
QName sayHiResp = new QName("http://www.jboss.org/jbossws/saaj", "sayHelloResponse");
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/ServiceIface.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/ServiceIface.java 2010-10-04 17:01:43 UTC (rev 13057)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/ServiceIface.java 2010-10-04 17:58:22 UTC (rev 13058)
@@ -32,4 +32,7 @@
{
@WebMethod
String sayHello();
+
+ @WebMethod
+ String greetMe();
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/ServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/ServiceImpl.java 2010-10-04 17:01:43 UTC (rev 13057)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/ServiceImpl.java 2010-10-04 17:58:22 UTC (rev 13058)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.saaj;
+import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Arrays;
import java.util.HashMap;
@@ -113,4 +114,28 @@
return "Hello World!";
}
+ public String greetMe()
+ {
+ try
+ {
+ Map<String, DataHandler> outDataHandlers = CastUtils.cast(
+ (Map<?, ?>)context.getMessageContext().get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS));
+
+ final char[] content = new char[16 * 1024];
+ Arrays.fill(content, 'A');
+
+ DataHandler handler = new DataHandler(
+ new InputStreamDataSource(new ByteArrayInputStream(new String(content).getBytes()),
+ "text/plain", "1"));
+ outDataHandlers.put("1", handler);
+
+ }
+ catch (Exception ex)
+ {
+ throw new RuntimeException(ex);
+ }
+
+ return "Greetings";
+ }
+
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/saaj/cxf/WEB-INF/wsdl/SaajService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/saaj/cxf/WEB-INF/wsdl/SaajService.wsdl 2010-10-04 17:01:43 UTC (rev 13057)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/saaj/cxf/WEB-INF/wsdl/SaajService.wsdl 2010-10-04 17:58:22 UTC (rev 13058)
@@ -12,6 +12,18 @@
<xsd:element minOccurs="0" name="return" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
+
+<xsd:element name="greetMe" type="tns:greetMe"/>
+<xsd:complexType name="greetMe">
+<xsd:sequence/>
+</xsd:complexType>
+<xsd:element name="greetMeResponse" type="tns:greetMeResponse"/>
+<xsd:complexType name="greetMeResponse">
+<xsd:sequence>
+<xsd:element minOccurs="0" name="return" type="xsd:string"/>
+</xsd:sequence>
+</xsd:complexType>
+
</xsd:schema>
</wsdl:types>
<wsdl:message name="sayHelloResponse">
@@ -22,6 +34,16 @@
<wsdl:part name="parameters" element="tns:sayHello">
</wsdl:part>
</wsdl:message>
+
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part name="parameters" element="tns:greetMeResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="greetMe">
+ <wsdl:part name="parameters" element="tns:greetMe">
+ </wsdl:part>
+ </wsdl:message>
+
<wsdl:portType name="ServiceIface">
<wsdl:operation name="sayHello">
<wsdl:input name="sayHello" message="tns:sayHello">
@@ -29,9 +51,17 @@
<wsdl:output name="sayHelloResponse" message="tns:sayHelloResponse">
</wsdl:output>
</wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <wsdl:input name="greetMe" message="tns:greetMe">
+ </wsdl:input>
+ <wsdl:output name="greetMeResponse" message="tns:greetMeResponse">
+ </wsdl:output>
+ </wsdl:operation>
+
</wsdl:portType>
<wsdl:binding name="SaajServiceSoapBinding" type="tns:ServiceIface">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/wsdl/http/"/>
<wsdl:operation name="sayHello">
<soap:operation soapAction="" style="document"/>
<wsdl:input name="sayHello">
@@ -41,6 +71,15 @@
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="greetMe">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="greetMe">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="greetMeResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="SaajService">
<wsdl:port name="SaajServicePort" binding="tns:SaajServiceSoapBinding">
14 years, 2 months
- 1
- 0
JBossWS SVN: r13057 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187: ant-import-tests and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-10-04 13:01:43 -0400 (Mon, 04 Oct 2010)
New Revision: 13057
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/version.properties
Log:
[JBPAPP-5187] NullPointerException deploying JAX-WS endpoint with types in target namespace ending with '#'
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/ant-import-tests/build-jars-jaxws.xml 2010-10-04 15:20:30 UTC (rev 13056)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/ant-import-tests/build-jars-jaxws.xml 2010-10-04 17:01:43 UTC (rev 13057)
@@ -689,6 +689,17 @@
</webinf>
</war>
+ <!-- jaxws-jbws2845 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws2845.war" webxml="${tests.output.dir}/resources/jaxws/jbws2845/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2845/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws2845/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
<!-- jaxws namespace -->
<war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2010-10-04 15:20:30 UTC (rev 13056)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2010-10-04 17:01:43 UTC (rev 13057)
@@ -534,6 +534,9 @@
fname = fname.replace('/', '_');
fname = fname.replace(':', '_');
+ fname = fname.replace('?', '_');
+ fname = fname.replace('#', '_');
+
File file = File.createTempFile("JBossWS_" + fname, ".xsd", tmpdir);
return file;
}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845 (from rev 12414, stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java 2010-06-02 18:10:30 UTC (rev 12414)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java 2010-10-04 17:01:43 UTC (rev 13057)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws2845;
-
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-
-/**
- * Test Endpoint.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 13th January 2010
- */
-@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2845")
-public interface Endpoint
-{
-
- @WebResult(targetNamespace = "http://ws.jboss.org/jbws2845/types#")
- public TheType echo(@WebParam(targetNamespace = "http://ws.jboss.org/jbws2845/types#") final TheType message);
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java (from rev 12414, stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java 2010-10-04 17:01:43 UTC (rev 13057)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2845;
+
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+/**
+ * Test Endpoint.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 13th January 2010
+ */
+@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2845")
+public interface Endpoint
+{
+
+ @WebResult(targetNamespace = "http://ws.jboss.org/jbws2845/types#")
+ public TheType echo(@WebParam(targetNamespace = "http://ws.jboss.org/jbws2845/types#") final TheType message);
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java 2010-06-02 18:10:30 UTC (rev 12414)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java 2010-10-04 17:01:43 UTC (rev 13057)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws2845;
-
-import javax.jws.WebService;
-
-/**
- * Test Endpoint implementation.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 13th January 2010
- */
-@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2845", endpointInterface = "org.jboss.test.ws.jaxws.jbws2845.Endpoint")
-public class EndpointImpl implements Endpoint
-{
-
- public TheType echo(final TheType message)
- {
- return message;
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java (from rev 12414, stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java 2010-10-04 17:01:43 UTC (rev 13057)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2845;
+
+import javax.jws.WebService;
+
+/**
+ * Test Endpoint implementation.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 13th January 2010
+ */
+@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2845", endpointInterface = "org.jboss.test.ws.jaxws.jbws2845.Endpoint")
+public class EndpointImpl implements Endpoint
+{
+
+ public TheType echo(final TheType message)
+ {
+ return message;
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java 2010-06-02 18:10:30 UTC (rev 12414)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java 2010-10-04 17:01:43 UTC (rev 13057)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws2845;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * [JBWS-2845] NullPointerException deploying JAX-WS endpoint with types in
- * target namespace ending with '#'
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 13th January 2010
- * @see https://jira.jboss.org/jira/browse/JBWS-2845
- */
-public class JBWS2845TestCase extends JBossWSTest
-{
-
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2845/";
-
- private static Endpoint port;
-
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS2845TestCase.class, "jaxws-jbws2845.war");
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- QName serviceName = new QName("http://ws.jboss.org/jbws2845", "EndpointImplService");
-
- Service service = Service.create(wsdlURL, serviceName);
- port = service.getPort(Endpoint.class);
- }
-
- public void testCall() throws Exception
- {
- TheType in = new TheType();
- in.setMessage("Happy New Year");
-
- TheType response = port.echo(in);
- assertEquals("Happy New Year", in.getMessage(), response.getMessage());
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java (from rev 12414, stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java 2010-10-04 17:01:43 UTC (rev 13057)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2845;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2845] NullPointerException deploying JAX-WS endpoint with types in
+ * target namespace ending with '#'
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 13th January 2010
+ * @see https://jira.jboss.org/jira/browse/JBWS-2845
+ */
+public class JBWS2845TestCase extends JBossWSTest
+{
+
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2845/";
+
+ private static Endpoint port;
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS2845TestCase.class, "jaxws-jbws2845.war");
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://ws.jboss.org/jbws2845", "EndpointImplService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ port = service.getPort(Endpoint.class);
+ }
+
+ public void testCall() throws Exception
+ {
+ TheType in = new TheType();
+ in.setMessage("Happy New Year");
+
+ TheType response = port.echo(in);
+ assertEquals("Happy New Year", in.getMessage(), response.getMessage());
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java 2010-06-02 18:10:30 UTC (rev 12414)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java 2010-10-04 17:01:43 UTC (rev 13057)
@@ -1,18 +0,0 @@
-package org.jboss.test.ws.jaxws.jbws2845;
-
-public class TheType
-{
-
- private String message;
-
- public String getMessage()
- {
- return message;
- }
-
- public void setMessage(String message)
- {
- this.message = message;
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java (from rev 12414, stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java 2010-10-04 17:01:43 UTC (rev 13057)
@@ -0,0 +1,18 @@
+package org.jboss.test.ws.jaxws.jbws2845;
+
+public class TheType
+{
+
+ private String message;
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ public void setMessage(String message)
+ {
+ this.message = message;
+ }
+
+}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845 (from rev 12414, stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF (from rev 12414, stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml 2010-06-02 18:10:30 UTC (rev 12414)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml 2010-10-04 17:01:43 UTC (rev 13057)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
- <context-root>/jaxws-jbws2845</context-root>
-</jboss-web>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml (from rev 12414, stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml 2010-10-04 17:01:43 UTC (rev 13057)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <context-root>/jaxws-jbws2845</context-root>
+</jboss-web>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml 2010-06-02 18:10:30 UTC (rev 12414)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml 2010-10-04 17:01:43 UTC (rev 13057)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <servlet>
- <servlet-name>Endpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws2845.EndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Endpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml (from rev 12414, stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml 2010-10-04 17:01:43 UTC (rev 13057)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <servlet>
+ <servlet-name>Endpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2845.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Endpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/version.properties 2010-10-04 15:20:30 UTC (rev 13056)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/version.properties 2010-10-04 17:01:43 UTC (rev 13057)
@@ -6,8 +6,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.SP2_CP08
-repository.id=2.0.1.SP2_CP08
+version.id=2.0.1.SP2_CP08_JBPAPP-5187
+repository.id=2.0.1.SP2_CP08_JBPAPP-5187
implementation.title=JBoss Web Services - Native
implementation.url=http://www.jboss.org/products/jbossws
14 years, 2 months
- 1
- 0
JBossWS SVN: r13056 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-10-04 11:20:30 -0400 (Mon, 04 Oct 2010)
New Revision: 13056
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187/
Log:
[JBPAPP-5187] Branch for patch.
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-5187 (from rev 13055, stack/native/tags/jbossws-native-2.0.1.SP2_CP08)
14 years, 2 months
- 1
- 0
JBossWS SVN: r13055 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-10-04 09:49:26 -0400 (Mon, 04 Oct 2010)
New Revision: 13055
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java
Log:
[JBWS-3084] Skip build of response message for empty streams (prevent failure with one-way requests)
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2010-10-04 13:48:22 UTC (rev 13054)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2010-10-04 13:49:26 UTC (rev 13055)
@@ -167,6 +167,22 @@
}
}
+ //if inputstream is empty, no need to build
+ if (ins.markSupported())
+ {
+ ins.mark(1);
+ final int bytesRead = ins.read(new byte[1]);
+ ins.reset();
+ if (bytesRead == -1)
+ {
+ return null;
+ }
+ }
+ else if (ins.available() == 0)
+ {
+ return null;
+ }
+
MessageFactory msgFac = MessageFactory.newInstance(SOAPConstants.DYNAMIC_SOAP_PROTOCOL);
return msgFac.createMessage(mimeHeaders, ins);
}
14 years, 2 months
- 1
- 0
JBossWS SVN: r13054 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata: wsdl and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-10-04 09:48:22 -0400 (Mon, 04 Oct 2010)
New Revision: 13054
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java
Log:
removing FIXME plus minor optimization
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2010-10-04 12:35:41 UTC (rev 13053)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2010-10-04 13:48:22 UTC (rev 13054)
@@ -1066,7 +1066,7 @@
boolean webMethodFound = false;
for (Method method : wsClass.getMethods())
{
- if (WSDLUtils.isWebMethod(method))
+ if (WSDLUtils.isWebMethod(method, wsClass.isInterface()))
{
processWebMethod(epMetaData, method);
webMethodFound = true;
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2010-10-04 12:35:41 UTC (rev 13053)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2010-10-04 13:48:22 UTC (rev 13054)
@@ -261,7 +261,7 @@
if (ignoredMethods == null)
{
ignoredMethods = new ArrayList<String>();
- //Add the SessionBean Methods to the ignore list
+ //Add the SessionBean methods to the ignore list
Method[] sbMethods = SessionBean.class.getMethods();
for (int i = 0; i < sbMethods.length; i++)
{
@@ -269,13 +269,7 @@
}
}
- boolean ignoreMethod = ignoredMethods.contains(method.getName());
-
- // FIXME: This code is a duplicate, it should read from the UMDM
- if (!isWebMethod(method))
- ignoreMethod = true;
-
- return ignoreMethod;
+ return ignoredMethods.contains(method.getName());
}
/**
@@ -287,7 +281,7 @@
* @param method to process
* @return true if webmethod, false otherwise
*/
- public static boolean isWebMethod(final Method method)
+ public static boolean isWebMethod(final Method method, final boolean definedInInterface)
{
if (!isWebMethodCandidate(method))
return false;
@@ -298,6 +292,10 @@
{
return !webMethodAnnotation.exclude();
}
+ if (definedInInterface)
+ {
+ return true;
+ }
else
{
return method.getDeclaringClass().getAnnotation(WebService.class) != null;
14 years, 2 months
- 1
- 0
JBossWS SVN: r13053 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-10-04 08:35:41 -0400 (Mon, 04 Oct 2010)
New Revision: 13053
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java
Log:
[JBWS-3084] Use DYNAMIC_SOAP_PROTOCOL when building up a message in the new soap connection impl
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2010-10-04 10:24:07 UTC (rev 13052)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2010-10-04 12:35:41 UTC (rev 13053)
@@ -35,6 +35,7 @@
import javax.xml.soap.MimeHeader;
import javax.xml.soap.MimeHeaders;
import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
@@ -166,7 +167,7 @@
}
}
- MessageFactory msgFac = MessageFactory.newInstance();
+ MessageFactory msgFac = MessageFactory.newInstance(SOAPConstants.DYNAMIC_SOAP_PROTOCOL);
return msgFac.createMessage(mimeHeaders, ins);
}
catch (Exception ex)
14 years, 2 months
- 1
- 0
JBossWS SVN: r13052 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-10-04 06:24:07 -0400 (Mon, 04 Oct 2010)
New Revision: 13052
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java
Log:
[JBWS-3084] Fixing implementation of close() method on added SOAPConnection impl
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2010-10-01 14:07:20 UTC (rev 13051)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2010-10-04 10:24:07 UTC (rev 13052)
@@ -55,11 +55,16 @@
public class SOAPConnectionImpl extends SOAPConnection
{
+ private boolean closed = false;
@SuppressWarnings("unchecked")
@Override
public SOAPMessage call(SOAPMessage msgOut, Object addressObject) throws SOAPException
{
+ if (closed) {
+ throw new SOAPException("Cannot send messages using a previously closed connection!");
+ }
+
String address = getAddress(addressObject);
ConduitInitiator ci = getConduitInitiator(address);
@@ -175,7 +180,11 @@
@Override
public void close() throws SOAPException
{
- // complete
+ if (this.closed)
+ {
+ throw new SOAPException("Connection already closed!");
+ }
+ this.closed = true;
}
private String getAddress(Object addressObject) throws SOAPException
14 years, 2 months
- 1
- 0
JBossWS SVN: r13051 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-10-01 10:07:20 -0400 (Fri, 01 Oct 2010)
New Revision: 13051
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
Log:
[JBWS-3142] ServiceObjectFactory have to always cleanup threads
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2010-09-30 17:34:20 UTC (rev 13050)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2010-10-01 14:07:20 UTC (rev 13051)
@@ -107,24 +107,32 @@
final Class<?> serviceClass = this.getClass(serviceImplClass);
final Class<?> targetClass = this.getClass(targetClassName);
// construct service
- final Bus bus = this.getBus(serviceRef);
- final Service serviceInstance = this.instantiateService(serviceRef, serviceClass);
- if (serviceRef.getHandlerChain() != null)
+ BusFactory.setDefaultBus(null);
+ try
{
- serviceInstance.setHandlerResolver(new HandlerResolverImpl(bus, serviceRef.getHandlerChain(),
- serviceInstance.getClass()));
+ final Bus bus = this.createNewBus(serviceRef);
+ final Service serviceInstance = this.instantiateService(serviceRef, serviceClass);
+ if (serviceRef.getHandlerChain() != null)
+ {
+ serviceInstance.setHandlerResolver(new HandlerResolverImpl(bus, serviceRef.getHandlerChain(),
+ serviceInstance.getClass()));
+ }
+ // construct port
+ final boolean instantiatePort = targetClassName != null && !targetClassName.equals(serviceImplClass);
+ if (instantiatePort)
+ {
+ final QName portQName = this.getPortQName(targetClassName, serviceImplClass, serviceRef);
+ final WebServiceFeature[] portFeatures = this.getFeatures(targetClassName, serviceImplClass, serviceRef);
+
+ return instantiatePort(serviceClass, targetClass, serviceInstance, portQName, portFeatures);
+ }
+
+ return serviceInstance;
}
- // construct port
- final boolean instantiatePort = targetClassName != null && !targetClassName.equals(serviceImplClass);
- if (instantiatePort)
+ finally
{
- final QName portQName = this.getPortQName(targetClassName, serviceImplClass, serviceRef);
- final WebServiceFeature[] portFeatures = this.getFeatures(targetClassName, serviceImplClass, serviceRef);
-
- return instantiatePort(serviceClass, targetClass, serviceInstance, portQName, portFeatures);
+ BusFactory.setDefaultBus(null);
}
-
- return serviceInstance;
}
catch (Exception ex)
{
@@ -144,11 +152,10 @@
return null;
}
- private Bus getBus(final UnifiedServiceRefMetaData serviceRefMD)
+ private Bus createNewBus(final UnifiedServiceRefMetaData serviceRefMD)
{
final Bus bus;
// Always reset bus before constructing Service
- BusFactory.setDefaultBus(null);
final URL cxfConfig = this.getCXFConfiguration(serviceRefMD.getVfsRoot());
if (cxfConfig != null)
14 years, 2 months
- 1
- 0