September 2009 - jbossws-commits - Jboss List Archives

JBossWS SVN: r10703 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-09-16 13:13:09 -0400 (Wed, 16 Sep 2009) New Revision: 10703 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java Log: [JBWS-2763] Remove useless traces Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2009-09-16 17:11:18 UTC (rev 10702) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2009-09-16 17:13:09 UTC (rev 10703) @@ -33,7 +33,6 @@ import javax.xml.soap.SOAPFault; import javax.xml.soap.Text; -import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.wsf.common.DOMUtils; import org.w3c.dom.Comment; @@ -54,9 +53,6 @@ */ public class SOAPBodyImpl extends SOAPElementImpl implements SOAPBody { - // provide logging - private static Logger log = Logger.getLogger(SOAPBodyImpl.class); - public SOAPBodyImpl(String prefix, String namespace) { super("Body", prefix, namespace); @@ -65,8 +61,6 @@ /** Convert the child into a SOAPBodyElement */ public SOAPElement addChildElement(SOAPElement child) throws SOAPException { - log.trace("addChildElement: " + child.getElementName()); - if ((child instanceof SOAPBodyElement) == false) child = convertToBodyElement(child); @@ -76,21 +70,18 @@ public SOAPBodyElement addBodyElement(Name name) throws SOAPException { - log.trace("addBodyElement: " + name); SOAPBodyElement child = new SOAPBodyElementDoc(name); return (SOAPBodyElement)addChildElement(child); } public SOAPBodyElement addBodyElement(QName qname) throws SOAPException { - log.trace("addBodyElement: " + qname); SOAPBodyElement child = new SOAPBodyElementDoc(qname); return (SOAPBodyElement)addChildElement(child); } public SOAPBodyElement addDocument(Document doc) throws SOAPException { - log.trace("addDocument"); Element rootElement = doc.getDocumentElement(); SOAPFactoryImpl soapFactory = new SOAPFactoryImpl(); SOAPElement soapElement = soapFactory.createElement(rootElement); @@ -99,7 +90,6 @@ public SOAPFault addFault() throws SOAPException { - log.trace("addFault"); if (hasFault()) throw new SOAPException("A SOAPBody may contain at most one SOAPFault child element"); @@ -111,7 +101,6 @@ public SOAPFault addFault(Name faultCode, String faultString) throws SOAPException { - log.trace("addFault"); if (hasFault()) throw new SOAPException("A SOAPBody may contain at most one SOAPFault child element"); @@ -124,7 +113,6 @@ public SOAPFault addFault(QName faultCode, String faultString) throws SOAPException { - log.trace("addFault"); if (hasFault()) throw new SOAPException("A SOAPBody may contain at most one SOAPFault child element"); @@ -137,7 +125,6 @@ public SOAPFault addFault(Name faultCode, String faultString, Locale locale) throws SOAPException { - log.trace("addFault"); if (hasFault()) throw new SOAPException("A SOAPBody may contain at most one SOAPFault child element"); @@ -150,7 +137,6 @@ public SOAPFault addFault(QName faultCode, String faultString, Locale locale) throws SOAPException { - log.trace("addFault"); if (hasFault()) throw new SOAPException("A SOAPBody may contain at most one SOAPFault child element"); @@ -163,7 +149,6 @@ public SOAPFault getFault() { - log.trace("getFault"); Iterator it = faultIterator(); SOAPFault soapFault = it.hasNext() ? (SOAPFault)it.next() : null; return soapFault; @@ -171,7 +156,6 @@ public boolean hasFault() { - log.trace("hasFault"); return faultIterator().hasNext(); } @@ -195,7 +179,6 @@ public Node appendChild(Node newChild) throws DOMException { - log.trace("appendChild: " + newChild.getNodeName()); if (needsConversionToBodyElement(newChild)) newChild = convertToBodyElement(newChild); @@ -204,7 +187,6 @@ public Node insertBefore(Node newChild, Node refChild) throws DOMException { - log.trace("insertBefore: " + newChild.getNodeName()); if (needsConversionToBodyElement(newChild)) newChild = convertToBodyElement(newChild); @@ -213,7 +195,6 @@ public Node replaceChild(Node newChild, Node oldChild) throws DOMException { - log.trace("replaceChild: " + newChild.getNodeName()); if (needsConversionToBodyElement(newChild)) newChild = convertToBodyElement(newChild); @@ -232,8 +213,6 @@ public Document extractContentAsDocument() throws SOAPException { - log.trace("extractContentAsDocument"); - Iterator childElements = getChildElements(); SOAPElementImpl childElement = null; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2009-09-16 17:11:18 UTC (rev 10702) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2009-09-16 17:13:09 UTC (rev 10703) @@ -150,7 +150,7 @@ } else { - log.trace("Ignore child type: " + nodeType); + if (log.isTraceEnabled()) log.trace("Ignore child type: " + nodeType); } } }

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10702 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-09-16 13:11:18 -0400 (Wed, 16 Sep 2009) New Revision: 10702 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java Log: [JBWS-2763] Reuse header names Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2009-09-16 17:10:26 UTC (rev 10701) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2009-09-16 17:11:18 UTC (rev 10702) @@ -166,7 +166,8 @@ while (i.hasNext()) { MimeHeader header = (MimeHeader)i.next(); - Object currentValue = metadata.get(header.getName()); + String hName = header.getName(); + Object currentValue = metadata.get(hName); /* * Coalesce multiple headers into one @@ -183,11 +184,11 @@ */ if (currentValue != null) { - metadata.put(header.getName(), currentValue + "," + header.getValue()); + metadata.put(hName, currentValue + "," + header.getValue()); } else { - metadata.put(header.getName(), header.getValue()); + metadata.put(hName, header.getValue()); } } }

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10701 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-09-16 13:10:26 -0400 (Wed, 16 Sep 2009) New Revision: 10701 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java Log: [JBWS-2763] Using precompile pattern to clean headers Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2009-09-16 17:09:04 UTC (rev 10700) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2009-09-16 17:10:26 UTC (rev 10701) @@ -31,6 +31,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.regex.Pattern; import javax.net.ssl.SSLEngine; import javax.xml.rpc.Stub; @@ -84,6 +85,8 @@ //We always use chunked transfer encoding unless explicitly disabled by user private Integer chunkSize = new Integer(DEFAULT_CHUNK_SIZE); + private static final Pattern headerCleanerPattern = Pattern.compile("[\r\n\f]"); + /** * Construct a Netty client with the provided marshaller/unmarshaller. * @@ -347,7 +350,7 @@ for (String key : headers.keySet()) { String header = (String)headers.get(key); - message.addHeader(key, header.replaceAll("[\r\n\f]", " ")); + message.addHeader(key, headerCleanerPattern.matcher(header).replaceAll(" ")); } }

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10700 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-09-16 13:09:04 -0400 (Wed, 16 Sep 2009) New Revision: 10700 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java Log: [JBWS-2753] Use shared thread pool Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java 2009-09-16 17:07:29 UTC (rev 10699) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java 2009-09-16 17:09:04 UTC (rev 10700) @@ -28,6 +28,7 @@ import java.security.AccessController; import java.util.Map; import java.util.StringTokenizer; +import java.util.concurrent.Executor; import java.util.concurrent.Executors; import org.jboss.logging.Logger; @@ -71,6 +72,9 @@ //the keep alive timeout in seconds private int keepAliveTimeout; + private static Executor bossExecutor = Executors.newCachedThreadPool(); + private static Executor workerExecutor = Executors.newCachedThreadPool(); + static { String keepAlive = AccessController.doPrivileged(new java.security.PrivilegedAction<String>() { @@ -93,7 +97,7 @@ { this.url = url; - factory = new NioClientSocketChannelFactory(Executors.newCachedThreadPool(), Executors.newCachedThreadPool()); + factory = new NioClientSocketChannelFactory(bossExecutor, workerExecutor); ClientBootstrap bootstrap = new ClientBootstrap(factory); bootstrap.setPipelineFactory(pipelineFactory); @@ -307,7 +311,6 @@ { channel.close(); } - factory.releaseExternalResources(); } public boolean getHttpKeepAliveSet()

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10699 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-09-16 13:07:29 -0400 (Wed, 16 Sep 2009) New Revision: 10699 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java Log: [JBWS-2763] Prevent useless multiple invocations Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-09-16 17:05:29 UTC (rev 10698) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-09-16 17:07:29 UTC (rev 10699) @@ -262,8 +262,9 @@ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setOperationMetaData(opMetaData); + Map<String, Object> requestCtx = getRequestContext(); // Copy properties to the message context - msgContext.putAll(getRequestContext()); + msgContext.putAll(requestCtx); // The direction of the message DirectionHolder direction = new DirectionHolder(Direction.OutBound); @@ -333,7 +334,7 @@ if (targetAddress == null) throw new WSException("Target endpoint address not set"); - Map<String, Object> callProps = new HashMap<String, Object>(getRequestContext()); + Map<String, Object> callProps = new HashMap<String, Object>(requestCtx); EndpointInfo epInfo = new EndpointInfo(epMetaData, targetAddress, callProps); boolean maintainSession = shouldMaintainSession(); if (maintainSession) @@ -342,8 +343,8 @@ RemoteConnection remoteConnection = new RemoteConnectionFactory().getRemoteConnection(epInfo); MessageAbstraction resMessage = remoteConnection.invoke(reqMessage, epInfo, oneway); - if (shouldMaintainSession()) - saveSessionInfo(callProps, getRequestContext()); + if (maintainSession) + saveSessionInfo(callProps, requestCtx); // At pivot the message context might be replaced msgContext = processPivotInternal(msgContext, direction);

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10698 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-09-16 13:05:29 -0400 (Wed, 16 Sep 2009) New Revision: 10698 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java Log: [JBWS-2763] Using Map putAll() instead of manually iterating over keyset Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2009-09-15 14:51:18 UTC (rev 10697) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2009-09-16 17:05:29 UTC (rev 10698) @@ -336,11 +336,7 @@ } // Copy the inbound msg properties to the binding's response context - for (String key : msgContext.keySet()) - { - Object value = msgContext.get(key); - resContext.put(key, value); - } + resContext.putAll(msgContext); } } finally

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10697 - in stack/native/trunk/modules: jaxws and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-09-15 10:51:18 -0400 (Tue, 15 Sep 2009) New Revision: 10697 Added: stack/native/trunk/modules/jaxws/ stack/native/trunk/modules/jaxws/pom.xml stack/native/trunk/modules/jaxws/src/ stack/native/trunk/modules/jaxws/src/main/ stack/native/trunk/modules/jaxws/src/main/resources/ stack/native/trunk/modules/jaxws/src/main/resources/META-INF/ stack/native/trunk/modules/jaxws/src/main/resources/META-INF/services/ stack/native/trunk/modules/jaxws/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider Log: [JBWS-2741] implementing endorsed mechanism - manifest only jar Added: stack/native/trunk/modules/jaxws/pom.xml =================================================================== --- stack/native/trunk/modules/jaxws/pom.xml (rev 0) +++ stack/native/trunk/modules/jaxws/pom.xml 2009-09-15 14:51:18 UTC (rev 10697) @@ -0,0 +1,16 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Web Services - Stack Native JAX-WS</name> + <artifactId>jbossws-native-jaxws</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native</artifactId> + <version>3.2.1-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + +</project> Added: stack/native/trunk/modules/jaxws/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider =================================================================== --- stack/native/trunk/modules/jaxws/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider (rev 0) +++ stack/native/trunk/modules/jaxws/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2009-09-15 14:51:18 UTC (rev 10697) @@ -0,0 +1 @@ +org.jboss.ws.core.jaxws.spi.ProviderImpl \ No newline at end of file

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10696 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-09-15 10:46:05 -0400 (Tue, 15 Sep 2009) New Revision: 10696 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java Log: [JBWS-2753] Updating RMChannelTask too Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2009-09-15 14:46:04 UTC (rev 10695) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2009-09-15 14:46:05 UTC (rev 10696) @@ -77,14 +77,15 @@ Map<String, Object> callProps = new HashMap<String, Object>(); callProps.putAll(rmRequest.getMetadata().getContext(RMChannelConstants.INVOCATION_CONTEXT)); + MessageTrace.traceMessage("Outgoing RM Response Message", rmRequest.getPayload()); RMMessage rmResponse = null; if (oneWay && (null == backPort)) { - client.invoke(rmRequest.getPayload(), targetAddress, false, additionalHeaders, callProps); + client.invoke(rmRequest.getPayload(), targetAddress, true, additionalHeaders, callProps); } else { - Object retVal = client.invoke(rmRequest.getPayload(), targetAddress, true, additionalHeaders, callProps); + Object retVal = client.invoke(rmRequest.getPayload(), targetAddress, false, additionalHeaders, callProps); if ((null != retVal) && (false == (retVal instanceof RMMessage))) { String msg = retVal.getClass().getName() + ": '" + retVal + "'";

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10695 - in stack/native/trunk: modules/client and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-09-15 10:46:04 -0400 (Tue, 15 Sep 2009) New Revision: 10695 Modified: stack/native/trunk/modules/client/pom.xml stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/pom.xml stack/native/trunk/src/main/distro/build-project-gen.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2741] implementing endorsed mechanism - manifest only jar Modified: stack/native/trunk/modules/client/pom.xml =================================================================== --- stack/native/trunk/modules/client/pom.xml 2009-09-15 14:17:45 UTC (rev 10694) +++ stack/native/trunk/modules/client/pom.xml 2009-09-15 14:46:04 UTC (rev 10695) @@ -48,7 +48,7 @@ <configuration> <archive> <manifestEntries> - <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jaxws-api.jar jsr181-api.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-xml-binding.jar netty.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path> + <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jaxws-api.jar jsr181-api.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-xml-binding.jar netty.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path> </manifestEntries> </archive> </configuration> Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2009-09-15 14:17:45 UTC (rev 10694) +++ stack/native/trunk/modules/core/pom.xml 2009-09-15 14:46:04 UTC (rev 10695) @@ -31,6 +31,11 @@ </dependency> <dependency> <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-jaxws</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-jaxws-ext</artifactId> <version>${version}</version> </dependency> Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-09-15 14:17:45 UTC (rev 10694) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-09-15 14:46:04 UTC (rev 10695) @@ -44,6 +44,7 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws-ext.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-09-15 14:17:45 UTC (rev 10694) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-09-15 14:46:04 UTC (rev 10695) @@ -78,6 +78,7 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws-ext.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxrpc.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-saaj.jar" Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-09-15 14:17:45 UTC (rev 10694) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-09-15 14:46:04 UTC (rev 10695) @@ -42,6 +42,7 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws-ext.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-09-15 14:17:45 UTC (rev 10694) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-09-15 14:46:04 UTC (rev 10695) @@ -76,6 +76,7 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws-ext.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxrpc.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-saaj.jar" Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-09-15 14:17:45 UTC (rev 10694) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-09-15 14:46:04 UTC (rev 10695) @@ -48,6 +48,7 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxws-ext.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-09-15 14:17:45 UTC (rev 10694) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-09-15 14:46:04 UTC (rev 10695) @@ -75,6 +75,7 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxrpc.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-jaxws-ext.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-saaj.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar" Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-09-15 14:17:45 UTC (rev 10694) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-09-15 14:46:04 UTC (rev 10695) @@ -41,6 +41,7 @@ <include name="**/jbossws-native-client.jar"/> <include name="**/jbossws-native-core.jar"/> <include name="**/jbossws-native-jaxrpc.jar"/> + <include name="**/jbossws-native-jaxws.jar"/> <include name="**/jbossws-native-jaxws-ext.jar"/> <include name="**/jbossws-native-saaj.jar"/> <include name="**/jbossws-spi.jar"/> @@ -59,6 +60,7 @@ </patternset> <patternset id="jbossws.lib.endorsed.patternset"> + <include name="**/jbossws-native-jaxws.jar"/> <include name="**/jbossws-native-saaj.jar"/> <include name="**/jaxb-api.jar"/> </patternset> @@ -69,6 +71,7 @@ <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-native-jaxrpc.jar"/> + <include name="**/jbossws-native-jaxws.jar"/> <include name="**/jbossws-native-jaxws-ext.jar"/> <include name="**/jbossws-native-saaj.jar"/> <include name="**/jbossws-spi.jar"/> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2009-09-15 14:17:45 UTC (rev 10694) +++ stack/native/trunk/pom.xml 2009-09-15 14:46:04 UTC (rev 10695) @@ -37,6 +37,7 @@ <modules> <module>modules/saaj</module> <module>modules/jaxrpc</module> + <module>modules/jaxws</module> <module>modules/jaxws-ext</module> <module>modules/core</module> <module>modules/client</module> Modified: stack/native/trunk/src/main/distro/build-project-gen.xml =================================================================== --- stack/native/trunk/src/main/distro/build-project-gen.xml 2009-09-15 14:17:45 UTC (rev 10694) +++ stack/native/trunk/src/main/distro/build-project-gen.xml 2009-09-15 14:46:04 UTC (rev 10695) @@ -112,6 +112,7 @@ <pathelement location="${jboss.client}/jbossws-common.jar"/> <pathelement location="${jboss.client}/jbossws-spi.jar"/> <pathelement location="${jboss.client}/jbossws-native-jaxrpc.jar"/> + <pathelement location="${jboss.client}/jbossws-native-jaxws.jar"/> <pathelement location="${jboss.client}/jbossws-native-jaxws-ext.jar"/> <pathelement location="${jboss.client}/jbossws-native-saaj.jar"/> <pathelement location="${jboss.client}/jbossws-native-core.jar"/> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-09-15 14:17:45 UTC (rev 10694) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-09-15 14:46:04 UTC (rev 10695) @@ -44,6 +44,7 @@ <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> <include>org.jboss.ws.native:jbossws-native-jaxrpc:jar</include> + <include>org.jboss.ws.native:jbossws-native-jaxws:jar</include> <include>org.jboss.ws.native:jbossws-native-jaxws-ext:jar</include> <include>org.jboss.ws.native:jbossws-native-saaj:jar</include> <include>org.codehaus.jettison:jettison:jar</include>

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10694 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core: client and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-09-15 10:17:45 -0400 (Tue, 15 Sep 2009) New Revision: 10694 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnection.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/WSResponseHandler.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java Log: [JBWS-2753] Using response handler for one-way message exchanges too to correctly handle response headers Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-09-15 14:13:16 UTC (rev 10693) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-09-15 14:17:45 UTC (rev 10694) @@ -340,7 +340,7 @@ addSessionInfo(reqMessage, callProps); RemoteConnection remoteConnection = new RemoteConnectionFactory().getRemoteConnection(epInfo); - MessageAbstraction resMessage = remoteConnection.invoke(reqMessage, epInfo, oneway, maintainSession); + MessageAbstraction resMessage = remoteConnection.invoke(reqMessage, epInfo, oneway); if (shouldMaintainSession()) saveSessionInfo(callProps, getRequestContext()); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2009-09-15 14:13:16 UTC (rev 10693) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2009-09-15 14:17:45 UTC (rev 10694) @@ -87,17 +87,12 @@ this.chunkSize = chunkSize; } - public MessageAbstraction invoke(MessageAbstraction reqMessage, Object endpoint, boolean oneway) throws IOException - { - return this.invoke(reqMessage, endpoint, oneway, true); - } - /** * Sends the given message to the specified endpoint. * * A null reqMessage signifies a HTTP GET request. */ - public MessageAbstraction invoke(MessageAbstraction reqMessage, Object endpoint, boolean oneway, boolean maintainSession) throws IOException + public MessageAbstraction invoke(MessageAbstraction reqMessage, Object endpoint, boolean oneway) throws IOException { if (endpoint == null) throw new IllegalArgumentException("Given endpoint cannot be null"); @@ -152,7 +147,7 @@ populateHeaders(reqMessage, additionalHeaders); //Trace the outgoing message MessageTrace.traceMessage("Outgoing Request Message", reqMessage); - MessageAbstraction resMessage = (MessageAbstraction)client.invoke(reqMessage, targetAddress, !oneway || maintainSession, additionalHeaders, callProps); + MessageAbstraction resMessage = (MessageAbstraction)client.invoke(reqMessage, targetAddress, oneway, additionalHeaders, callProps); //Trace the incoming response message MessageTrace.traceMessage("Incoming Response Message", resMessage); return resMessage; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnection.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnection.java 2009-09-15 14:13:16 UTC (rev 10693) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnection.java 2009-09-15 14:17:45 UTC (rev 10694) @@ -39,6 +39,4 @@ UnMarshaller getUnmarshaller(); MessageAbstraction invoke(MessageAbstraction reqMessage, Object endpoint, boolean oneway) throws IOException; - - MessageAbstraction invoke(MessageAbstraction reqMessage, Object endpoint, boolean oneway, boolean maintainSession) throws IOException; } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2009-09-15 14:13:16 UTC (rev 10693) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2009-09-15 14:17:45 UTC (rev 10694) @@ -53,7 +53,7 @@ } @Override - public MessageAbstraction invoke(MessageAbstraction reqMessage, Object endpoint, boolean oneway, boolean maintainSession) throws IOException + public MessageAbstraction invoke(MessageAbstraction reqMessage, Object endpoint, boolean oneway) throws IOException { try { @@ -66,7 +66,7 @@ if (reqMessage != null && soapMessage.saveRequired()) soapMessage.saveChanges(); - return super.invoke(reqMessage, endpoint, oneway, maintainSession); + return super.invoke(reqMessage, endpoint, oneway); } catch (SOAPException ex) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2009-09-15 14:13:16 UTC (rev 10693) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2009-09-15 14:17:45 UTC (rev 10694) @@ -22,16 +22,12 @@ package org.jboss.ws.core.client.transport; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.net.ConnectException; -import java.net.InetSocketAddress; import java.net.MalformedURLException; import java.net.URL; import java.nio.channels.ClosedChannelException; import java.util.Map; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -41,14 +37,11 @@ import javax.xml.ws.BindingProvider; import org.jboss.logging.Logger; -import org.jboss.netty.bootstrap.ClientBootstrap; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBufferOutputStream; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; -import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.ChannelFuture; -import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.handler.codec.http.DefaultHttpRequest; import org.jboss.netty.handler.codec.http.HttpHeaders; import org.jboss.netty.handler.codec.http.HttpMessage; @@ -108,15 +101,14 @@ * * @param reqMessage The request message * @param targetAddress The target address - * @param waitForResponse A boolean saying if the method should wait for the results before returning. Waiting is required for two-ways invocations + * @param oneway True for one-way message exchanges * and when maintaining sessions using cookies. * @param additionalHeaders Additional http headers to be added to the request * @param callProps * @return * @throws IOException */ - public Object invoke(Object reqMessage, String targetAddress, boolean waitForResponse, Map<String, Object> additionalHeaders, Map<String, Object> callProps) - throws IOException + public Object invoke(Object reqMessage, String targetAddress, boolean oneway, Map<String, Object> additionalHeaders, Map<String, Object> callProps) throws IOException { URL target; try @@ -136,12 +128,8 @@ setActualTimeout(callProps); channel = transport.getChannel(timeout); - WSResponseHandler responseHandler = null; - if (waitForResponse) - { - responseHandler = new WSResponseHandler(); - NettyHelper.setResponseHandler(channel, responseHandler); - } + WSResponseHandler responseHandler = new WSResponseHandler(); + NettyHelper.setResponseHandler(channel, responseHandler); //Send the HTTP request HttpRequest request = new DefaultHttpRequest(HttpVersion.HTTP_1_1, reqMessage != null ? HttpMethod.POST : HttpMethod.GET, targetAddress); @@ -159,19 +147,12 @@ { writeFuture.awaitUninterruptibly(); } - if (!waitForResponse) - { - //No need to wait for the result, just wait for the write to be completed. - return null; - } - Object resMessage = null; //Get the response Future<Result> futureResult = responseHandler.getFutureResult(); Result result = timeout == null ? futureResult.get() : futureResult.get(timeout, TimeUnit.MILLISECONDS); resHeaders = result.getResponseHeaders(); - InputStream is = result.getResponse(); - resMessage = unmarshaller.read(is, resHeaders); + Object resMessage = oneway ? null : unmarshaller.read(result.getResponse(), resHeaders); //Update props with response headers (required to maintain session using cookies) callProps.clear(); @@ -214,7 +195,7 @@ } finally { - if (channel != null && waitForResponse) + if (channel != null) { NettyHelper.clearResponseHandler(channel); } @@ -365,16 +346,8 @@ { for (String key : headers.keySet()) { - try - { - String header = (String)headers.get(key); - message.addHeader(key, header.replaceAll("[\r\n\f]", " ")); - } - catch (Exception e) - { - e.printStackTrace(); - throw new RuntimeException(e); - } + String header = (String)headers.get(key); + message.addHeader(key, header.replaceAll("[\r\n\f]", " ")); } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/WSResponseHandler.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/WSResponseHandler.java 2009-09-15 14:13:16 UTC (rev 10693) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/WSResponseHandler.java 2009-09-15 14:17:45 UTC (rev 10694) @@ -83,6 +83,10 @@ ChannelBuffer content = response.getContent(); result.setResponse(new ChannelBufferInputStream(content)); } + catch (Throwable t) + { + future.setException(t); + } finally { future.done(); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2009-09-15 14:13:16 UTC (rev 10693) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2009-09-15 14:17:45 UTC (rev 10694) @@ -140,7 +140,7 @@ try { remotingConnection = getRemotingConnection(endpoint); - MessageAbstraction resMessage = remotingConnection.invoke((SOAPMessageImpl)reqMessage, endpoint, oneway, false); + MessageAbstraction resMessage = remotingConnection.invoke((SOAPMessageImpl)reqMessage, endpoint, oneway); return resMessage; } catch (Exception ex)

15 years, 7 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits September 2009