2:15 p.m.
Author: heiko.braun(a)jboss.com
Date: 2007-05-22 15:15:59 -0400 (Tue, 22 May 2007)
New Revision: 3191
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
branches/jbossws-2.0/jbossws-core/src/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml
Log:
Simple override for endpoint properties
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-05-22
18:27:12 UTC (rev 3190)
+++
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-05-22
19:15:59 UTC (rev 3191)
@@ -53,7 +53,7 @@
* Per default HTTP 1.1 chunked encoding is used.
* This may be ovverriden through {@link
org.jboss.ws.metadata.config.EndpointProperty#CHUNKED_ENCODING_SIZE}.
* A chunksize value of zero disables chunked encoding.
- *
+ *
* @author Thomas.Diesler(a)jboss.org
* @author <a href="mailto:jason@stacksmash.com">Jason T.
Greene</a>
*
@@ -116,9 +116,9 @@
this.closed = closed;
}
- /**
+ /**
* 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) throws IOException
@@ -143,7 +143,7 @@
{
timeout = callProps.get(StubExt.PROPERTY_CLIENT_TIMEOUT);
targetAddress = addURLParameter(targetAddress, "timeout",
timeout.toString());
- }
+ }
}
else if (endpoint instanceof EndpointReference)
{
@@ -155,18 +155,18 @@
targetAddress = endpoint.toString();
}
- // setup remoting client
+ // remoting props may come from client config as well
+ mergeConfigContribution();
+
+ // setup remoting client
Map<String, Object> metadata = createRemotingMetaData(reqMessage,
callProps);
Client client = createRemotingClient(endpoint, targetAddress, oneway);
- // remoting props may come from client config as well
- mergeConfigContribution();
-
try
{
if (log.isDebugEnabled())
log.debug("Remoting metadata: " + metadata);
-
+
// debug the outgoing message
MessageTrace.traceMessage("Outgoing Request Message", reqMessage);
@@ -196,7 +196,7 @@
{
if(timeout!=null && (th.getCause() instanceof SocketTimeoutException))
{
- throw new WSTimeoutException("Timeout after: " + timeout +
"ms", new Long(timeout.toString()));
+ throw new WSTimeoutException("Timeout after: " + timeout +
"ms", new Long(timeout.toString()));
}
IOException io = new IOException("Could not transmit message");
@@ -212,15 +212,15 @@
if(msgContext!=null)
{
Properties epmdProps = msgContext.getEndpointMetaData().getProperties();
- if(epmdProps.containsKey(EndpointProperty.CHUNKED_ENCODING_SIZE))
- {
- String chunkSizeValue =
epmdProps.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE);
- int chunkSize = Integer.valueOf(chunkSizeValue);
- if(chunkSize>0)
- clientConfig.put(EndpointProperty.CHUNKED_ENCODING_SIZE, chunkSizeValue);
- else
- clientConfig.remove(EndpointProperty.CHUNKED_ENCODING_SIZE);
- }
+
+ // chunksize settings
+ String chunkSizeValue =
epmdProps.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE);
+ int chunkSize = chunkSizeValue!=null ? Integer.valueOf(chunkSizeValue) : -1;
+ if(chunkSize>0)
+ clientConfig.put(EndpointProperty.CHUNKED_ENCODING_SIZE, chunkSizeValue);
+ else
+ clientConfig.remove("chunkedLength");
+
}
}
@@ -344,7 +344,7 @@
protected void populateHeaders(MessageAbstraction reqMessage, Map<String,
Object> metadata)
{
MimeHeaders mimeHeaders = reqMessage.getMimeHeaders();
-
+
Properties props = new Properties();
metadata.put("HEADER", props);
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-05-22
18:27:12 UTC (rev 3190)
+++
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-05-22
19:15:59 UTC (rev 3191)
@@ -683,6 +683,7 @@
config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile());
// arbitrary endpoint properties
+ getProperties().clear();
for(EndpointProperty p: config.getProperties())
{
getProperties().put(p.name.toString(), p.value);
Modified:
branches/jbossws-2.0/jbossws-core/src/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2007-05-22
18:27:12 UTC (rev 3190)
+++
branches/jbossws-2.0/jbossws-core/src/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2007-05-22
19:15:59 UTC (rev 3191)
@@ -2,7 +2,8 @@
<!-- $Id$ -->
-<jaxws-config xmlns="urn:jboss:jaxws-config:2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+<jaxws-config xmlns="urn:jboss:jaxws-config:2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
xsi:schemaLocation="urn:jboss:jaxws-config:2.0
jaxws-config_2_0.xsd">
<client-config>
@@ -15,6 +16,11 @@
</client-config>
<client-config>
+ <config-name>HTTP 1.0 Client</config-name>
+ <feature>http://org.jboss.ws/dispatch/validate</feature>
+ </client-config>
+
+ <client-config>
<config-name>Standard WSAddressing Client</config-name>
<post-handler-chains>
<javaee:handler-chain>