Author: alessio.soldano(a)jboss.com
Date: 2013-06-21 03:58:07 -0400 (Fri, 21 Jun 2013)
New Revision: 17715
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
Log:
[JBWS-3653] Always explicitly set the AUTO_REWRITE_ADDRESS_ALL prop to avoid relying on
CXF default (false)
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
---
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2013-06-21
07:42:31 UTC (rev 17714)
+++
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2013-06-21
07:58:07 UTC (rev 17715)
@@ -202,12 +202,10 @@
final String ctxUri = req.getRequestURI();
final String baseUri = req.getRequestURL().toString() + "?" +
queryString;
final EndpointInfo endpointInfo = dest.getEndpointInfo();
- final ServerConfig serverConfig =
AbstractServerConfig.getServerIntegrationServerConfig();
- endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS,
SoapAddressRewriteHelper.isAutoRewriteOn(serverConfig));
- if (serverConfig.isModifySOAPAddress()) {
- endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL,
-
ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()));
- }
+ final boolean autoRewrite = SoapAddressRewriteHelper.isAutoRewriteOn(
+ AbstractServerConfig.getServerIntegrationServerConfig());
+ endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS, autoRewrite);
+ endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL,
autoRewrite);
for (QueryHandler queryHandler : qhr.getHandlers())
{
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
---
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2013-06-21
07:42:31 UTC (rev 17714)
+++
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2013-06-21
07:58:07 UTC (rev 17715)
@@ -295,7 +295,7 @@
} else {
//same comment as above regarding auto rewrite...
if (!SoapAddressRewriteHelper.isAutoRewriteOn(sc)) {
- ddep.setPublishedEndpointUrl(ddep.getAddress()); //force compute address for
code first endpoints
+ ddep.setPublishedEndpointUrl(ddep.getAddress()); //force computed address for
code first endpoints
}
}
}
Show replies by date