You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/01/04 05:23:29 UTC
svn commit: r1054891 - in /cxf/branches/2.3.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/transport/http/
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/
systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/
Author: dkulp
Date: Tue Jan 4 04:23:28 2011
New Revision: 1054891
URL: http://svn.apache.org/viewvc?rev=1054891&view=rev
Log:
Merged revisions 1054890 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1054890 | dkulp | 2011-01-03 23:22:34 -0500 (Mon, 03 Jan 2011) | 2 lines
[CXF-2770] Support for autoRewriteSoapAddress frmo Spring
Patch from Jim Talbut applied
........
Added:
cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AbstractSpringConfiguredAutoRewriteSoapAddressTest.java
- copied unchanged from r1054890, cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AbstractSpringConfiguredAutoRewriteSoapAddressTest.java
cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java
- copied unchanged from r1054890, cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java
cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java
- copied unchanged from r1054890, cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java
cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml
- copied unchanged from r1054890, cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml
cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml
- copied unchanged from r1054890, cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1054890
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java?rev=1054891&r1=1054890&r2=1054891&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java Tue Jan 4 04:23:28 2011
@@ -58,6 +58,7 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.XMLUtils;
+import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.transports.http.StemMatchingQueryHandler;
@@ -296,10 +297,10 @@ public class WSDLQueryHandler implements
LOG,
base), e);
}
-
- Boolean rewriteSoapAddress = ei.getProperty("autoRewriteSoapAddress", Boolean.class);
-
- if (rewriteSoapAddress != null && rewriteSoapAddress.booleanValue()) {
+
+ Object rewriteSoapAddress = ei.getProperty("autoRewriteSoapAddress");
+
+ if (rewriteSoapAddress != null && MessageUtils.isTrue(rewriteSoapAddress)) {
List<Element> serviceList = DOMUtils.findAllElementsByTagNameNS(doc.getDocumentElement(),
"http://schemas.xmlsoap.org/wsdl/",
"service");
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=1054891&r1=1054890&r2=1054891&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Tue Jan 4 04:23:28 2011
@@ -27,6 +27,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
@@ -321,6 +322,13 @@ public class EndpointImpl extends javax.
// TODO is there a good place to put this key-string as a constant?
endpointInfo.setProperty("publishedEndpointUrl", publishedEndpointUrl);
}
+
+ if (null != properties) {
+ for (Entry<String, Object> entry : properties.entrySet()) {
+ endpointInfo.setProperty(entry.getKey(), entry.getValue());
+ }
+ }
+
this.address = endpointInfo.getAddress();
}
serv.start();