August 2009 - jbossws-commits - Jboss List Archives

JBossWS SVN: r10459 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-08-03 08:40:51 -0400 (Mon, 03 Aug 2009) New Revision: 10459 Removed: stack/native/branches/ropalka/ Log: removing obsolete branch

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10458 - stack/metro/branches.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-08-03 08:40:02 -0400 (Mon, 03 Aug 2009) New Revision: 10458 Removed: stack/metro/branches/ropalka/ Log: removing obsolete branch

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10457 - stack/cxf/branches.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-08-03 08:39:48 -0400 (Mon, 03 Aug 2009) New Revision: 10457 Removed: stack/cxf/branches/ropalka/ Log: removing obsolete branch

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10456 - container/jboss50/branches.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-08-03 08:39:18 -0400 (Mon, 03 Aug 2009) New Revision: 10456 Removed: container/jboss50/branches/ropalka-jboss510/ Log: Removing obsolete branch

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10455 - spi/branches.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-08-03 08:37:59 -0400 (Mon, 03 Aug 2009) New Revision: 10455 Removed: spi/branches/ropalka/ Log: removing obsolete branch

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10454 - common/branches.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-08-03 08:37:44 -0400 (Mon, 03 Aug 2009) New Revision: 10454 Removed: common/branches/ropalka/ Log: removing obsolete branch

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10453 - framework/branches.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-08-03 08:37:28 -0400 (Mon, 03 Aug 2009) New Revision: 10453 Removed: framework/branches/ropalka/ Log: removing obsolete branch

15 years, 7 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-08-03 08:29:06 -0400 (Mon, 03 Aug 2009) New Revision: 10452 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java Log: [JBWS-2370] fixing WSDL publisher Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-08-03 11:03:05 UTC (rev 10451) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-08-03 12:29:06 UTC (rev 10452) @@ -212,7 +212,7 @@ URL orgURL = new URL(orgLocation); String protocol = orgURL.getProtocol(); - String host = wsdlHost; + String host = orgURL.getHost(); int port = getPortForProtocol(protocol); String path = orgURL.getPath(); final boolean rewriteLocation = @@ -221,7 +221,7 @@ if (rewriteLocation) { - String newLocation = new URL(protocol, host, port, path).toString(); + String newLocation = new URL(protocol, wsdlHost, port, path).toString(); if (!newLocation.equals(orgLocation)) { locationAttr.setNodeValue(newLocation);

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r10451 - common/trunk/src/main/java/org/jboss/wsf/common/management.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-08-03 07:03:05 -0400 (Mon, 03 Aug 2009) New Revision: 10451 Modified: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java Log: [JBWS-2370] decrease logging level Modified: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2009-08-03 10:58:17 UTC (rev 10450) +++ common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2009-08-03 11:03:05 UTC (rev 10451) @@ -129,7 +129,7 @@ if (localPort <= 0) { // Do not initialize webServicePort with the default, the connector port may become available later - log.warn("Unable to calculate 'WebServicePort', using default '8080'"); + log.debug("Unable to calculate 'WebServicePort', using default '8080'"); localPort = 8080; } @@ -145,7 +145,7 @@ if (localPort <= 0) { // Do not initialize webServiceSecurePort with the default, the connector port may become available later - log.warn("Unable to calculate 'WebServiceSecurePort', using default '8443'"); + log.debug("Unable to calculate 'WebServiceSecurePort', using default '8443'"); localPort = 8443; }

15 years, 7 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-08-03 06:58:17 -0400 (Mon, 03 Aug 2009) New Revision: 10450 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java Log: [JBWS-2370] fixing WSDL publisher Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-08-03 06:52:31 UTC (rev 10449) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-08-03 10:58:17 UTC (rev 10450) @@ -54,11 +54,14 @@ // provide logging private Logger log = Logger.getLogger(WSDLRequestHandler.class); - private EndpointMetaData epMetaData; + private final EndpointMetaData epMetaData; + private final ServerConfig config; public WSDLRequestHandler(EndpointMetaData epMetaData) { this.epMetaData = epMetaData; + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + this.config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); } /** @@ -208,24 +211,22 @@ String orgLocation = locationAttr.getNodeValue(); URL orgURL = new URL(orgLocation); - String orgHost = orgURL.getHost(); - String orgPath = orgURL.getPath(); + String protocol = orgURL.getProtocol(); + String host = wsdlHost; + int port = getPortForProtocol(protocol); + String path = orgURL.getPath(); + final boolean rewriteLocation = + ServerConfig.UNDEFINED_HOSTNAME.equals(host) || + this.config.isModifySOAPAddress(); - if (ServerConfig.UNDEFINED_HOSTNAME.equals(orgHost)) + if (rewriteLocation) { - URL newURL = new URL(wsdlHost); - String newProtocol = newURL.getProtocol(); - String newHost = newURL.getHost(); - int newPort = newURL.getPort(); - - String newLocation = newProtocol + "://" + newHost; - if (newPort != -1) - newLocation += ":" + newPort; - - newLocation += orgPath; - locationAttr.setNodeValue(newLocation); - - log.trace("Mapping address from '" + orgLocation + "' to '" + newLocation + "'"); + String newLocation = new URL(protocol, host, port, path).toString(); + if (!newLocation.equals(orgLocation)) + { + locationAttr.setNodeValue(newLocation); + log.debug("Mapping address from '" + orgLocation + "' to '" + newLocation + "'"); + } } } } @@ -237,4 +238,26 @@ } } + /** + * Returns real http and https protocol values. Returns -1 for non http(s) protocols. + * + * @param protocol to handle + * @return real http(s) value, or -1 if not http(s) protocol + */ + private int getPortForProtocol( final String protocol ) + { + final String lowerCasedProtocol = protocol.toLowerCase(); + + if ( "http".equals( lowerCasedProtocol ) ) + { + return config.getWebServicePort(); + } + else if ( "https".equals( lowerCasedProtocol ) ) + { + return config.getWebServiceSecurePort(); + } + + return -1; + } + }

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 August 2009