JBossWS SVN: r17070 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: configuration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-13 10:14:27 -0500 (Thu, 13 Dec 2012)
New Revision: 17070
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/configuration/ServerBeanCustomizer.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
Log:
[JBWS-3576] Get ServerConfig from AbstractServerConfig static convenient method whenever it makes sense
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 2012-12-13 15:13:24 UTC (rev 17069)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2012-12-13 15:14:27 UTC (rev 17070)
@@ -46,30 +46,26 @@
import org.apache.cxf.transports.http.QueryHandler;
import org.apache.cxf.transports.http.QueryHandlerRegistry;
import org.jboss.util.NotImplementedException;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.ws.common.management.AbstractServerConfig;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointMetrics;
import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
/**
* A request handler
*
* @author Thomas.Diesler(a)jboss.org
+ * @author alessio.soldano(a)jboss.com
* @since 21-May-2007
*/
public class RequestHandlerImpl implements RequestHandler
{
- private ServerConfig serverConfig;
-
RequestHandlerImpl()
{
- final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+
}
public void handleHttpRequest(Endpoint ep, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException
@@ -197,6 +193,7 @@
String ctxUri = req.getRequestURI();
String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString();
EndpointInfo endpointInfo = dest.getEndpointInfo();
+ ServerConfig serverConfig = AbstractServerConfig.getServerIntegrationServerConfig();
if (serverConfig.isModifySOAPAddress()) {
endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL,
ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()));
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2012-12-13 15:13:24 UTC (rev 17069)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2012-12-13 15:14:27 UTC (rev 17070)
@@ -26,13 +26,10 @@
import org.apache.cxf.frontend.ServerFactoryBean;
import org.jboss.ws.api.annotation.EndpointConfig;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
+import org.jboss.ws.common.management.AbstractServerConfig;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.config.ConfigMetaDataParser;
import org.jboss.wsf.spi.metadata.config.ConfigRoot;
import org.jboss.wsf.stack.cxf.JBossWSInvoker;
@@ -48,8 +45,6 @@
*/
public class ServerBeanCustomizer extends BeanCustomizer
{
- private static ServerConfig serverConfig;
-
private WSDLFilePublisher wsdlPublisher;
private List<Endpoint> depEndpoints;
@@ -139,7 +134,7 @@
if (configFile == null)
{
//use endpoint configs from AS domain
- ServerConfig sc = getServerConfig();
+ ServerConfig sc = AbstractServerConfig.getServerIntegrationServerConfig();
for (org.jboss.wsf.spi.metadata.config.EndpointConfig config : sc.getEndpointConfigs())
{
if (config.getConfigName().equals(configName))
@@ -166,17 +161,6 @@
}
}
- private static synchronized ServerConfig getServerConfig()
- {
- if (serverConfig == null)
- {
- final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
- serverConfig = spiProvider.getSPI(ServerConfigFactory.class, cl).getServerConfig();
- }
- return serverConfig;
- }
-
public void setDeploymentRoot(UnifiedVirtualFile deploymentRoot)
{
this.deploymentRoot = deploymentRoot;
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 2012-12-13 15:13:24 UTC (rev 17069)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2012-12-13 15:14:27 UTC (rev 17070)
@@ -42,14 +42,12 @@
import org.jboss.ws.common.JavaUtils;
import org.jboss.ws.common.deployment.SOAPAddressWSDLParser;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.ws.common.management.AbstractServerConfig;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.HttpEndpoint;
import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
@@ -70,8 +68,6 @@
*/
public class MetadataBuilder
{
- private static ServerConfig serverConfig;
-
public MetadataBuilder()
{
@@ -303,7 +299,7 @@
//do not try rewriting addresses for not-http binding
String wsdlAddress = parser.filterSoapAddress(ddep.getServiceName(), ddep.getPortName(), SOAPAddressWSDLParser.SOAP_HTTP_NS);
- final ServerConfig sc = getServerConfig();
+ final ServerConfig sc = AbstractServerConfig.getServerIntegrationServerConfig();
String rewrittenWsdlAddress = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(wsdlAddress, ddep.getAddress(), sc);
//If "auto rewrite", leave "publishedEndpointUrl" unset so that CXF do not force host/port values for
//wsdl imports and auto-rewrite them too; otherwise set the new address into "publishedEndpointUrl",
@@ -361,14 +357,4 @@
return sb.toString();
}
- private static synchronized ServerConfig getServerConfig()
- {
- if (serverConfig == null)
- {
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- }
- return serverConfig;
- }
-
}
11 years, 4 months
JBossWS SVN: r17069 - in common/trunk/src/main/java/org/jboss/ws/common: management and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-13 10:13:24 -0500 (Thu, 13 Dec 2012)
New Revision: 17069
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
Log:
[JBWS-3576] Centralize ServerConfig retrieval into AbstractServerConfig
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2012-12-11 18:24:53 UTC (rev 17068)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2012-12-13 15:13:24 UTC (rev 17069)
@@ -33,14 +33,12 @@
import org.jboss.ws.api.annotation.WebContext;
import org.jboss.ws.common.Messages;
import org.jboss.ws.common.integration.AbstractDeploymentAspect;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.ws.common.management.AbstractServerConfig;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.HttpEndpoint;
import org.jboss.wsf.spi.deployment.Service;
import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
@@ -52,6 +50,7 @@
* A deployer that assigns the endpoint address.
*
* @author Thomas.Diesler(a)jboss.org
+ * @author alessio.soldano(a)jboss.com
* @since 19-May-2007
*/
public class EndpointAddressDeploymentAspect extends AbstractDeploymentAspect
@@ -64,21 +63,10 @@
if (contextRoot == null)
throw Messages.MESSAGES.cannotObtainContextRoot(dep.getSimpleName());
- // TODO: remove this hack - review API
- String protocol = (String)service.getProperty("protocol");
- String host = (String)service.getProperty("host");
-
PortValue port = new PortValue((Integer)service.getProperty("port"), null);
-
- if (protocol == null)
- {
- SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
- ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class);
- ServerConfig serverConfig = spi.getServerConfig();
-
- host = serverConfig.getWebServiceHost();
- port.setServerConfig(serverConfig);
- }
+ ServerConfig serverConfig = AbstractServerConfig.getServerIntegrationServerConfig();
+ port.setServerConfig(serverConfig);
+ String host = serverConfig.getWebServiceHost();
Map<String, Endpoint> endpointsMap = new HashMap<String, Endpoint>();
List<Endpoint> deleteList = new LinkedList<Endpoint>();
for (Endpoint ep : service.getEndpoints())
@@ -97,7 +85,7 @@
if (urlPattern.endsWith("/*"))
urlPattern = urlPattern.substring(0, urlPattern.length() - 2);
- protocol = confidential ? "https://" : "http://";
+ String protocol = confidential ? "https://" : "http://";
String address = protocol + hostAndPort + (contextRoot.equals("/") && urlPattern.startsWith("/") ? "" : contextRoot) + urlPattern;
httpEp.setAddress(address);
//JBWS-2957: EJB3 binds the same endpoint class to multiple beans at multiple JNDI locations;
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2012-12-11 18:24:53 UTC (rev 17068)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2012-12-13 15:13:24 UTC (rev 17069)
@@ -39,6 +39,7 @@
import org.jboss.wsf.spi.WSFException;
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.management.StackConfig;
import org.jboss.wsf.spi.management.StackConfigFactory;
import org.jboss.wsf.spi.management.WebServerInfo;
@@ -78,6 +79,9 @@
private final List<ClientConfig> clientConfigs = Collections.synchronizedList(new ArrayList<ClientConfig>(2));
// The default endpoint configs, if any
private final List<EndpointConfig> endpointConfigs = Collections.synchronizedList(new ArrayList<EndpointConfig>(3));
+
+ // The server integration classloader' ServerConfig instance reference
+ private static ServerConfig serverConfig;
public MBeanServer getMbeanServer()
{
@@ -215,6 +219,17 @@
}
}
+ public static synchronized ServerConfig getServerIntegrationServerConfig()
+ {
+ if (serverConfig == null)
+ {
+ final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
+ serverConfig = spiProvider.getSPI(ServerConfigFactory.class, cl).getServerConfig();
+ }
+ return serverConfig;
+ }
+
public String getImplementationTitle()
{
return stackConfig.getImplementationTitle();
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2012-12-11 18:24:53 UTC (rev 17068)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2012-12-13 15:13:24 UTC (rev 17069)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.common.utils;
-import static org.jboss.ws.common.Loggers.DEPLOYMENT_LOGGER;;
+import static org.jboss.ws.common.Loggers.DEPLOYMENT_LOGGER;
import static org.jboss.ws.common.Messages.MESSAGES;
import static org.jboss.ws.common.integration.WSHelper.isJseDeployment;
import static org.jboss.ws.common.integration.WSHelper.isWarArchive;
@@ -45,11 +45,9 @@
import org.jboss.ws.common.DOMUtils;
import org.jboss.ws.common.IOUtils;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.ws.common.management.AbstractServerConfig;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.w3c.dom.Element;
/**
@@ -77,8 +75,7 @@
serverConfig = dep.getAttachment(ServerConfig.class);
if (serverConfig == null)
{
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ serverConfig = AbstractServerConfig.getServerIntegrationServerConfig();
}
if (isJseDeployment(dep) || isWarArchive(dep))
11 years, 4 months
JBossWS SVN: r17068 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-11 13:24:53 -0500 (Tue, 11 Dec 2012)
New Revision: 17068
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/CachedOutputStream.java
Log:
Minor fix
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/CachedOutputStream.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/CachedOutputStream.java 2012-12-11 14:30:36 UTC (rev 17067)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/CachedOutputStream.java 2012-12-11 18:24:53 UTC (rev 17068)
@@ -196,13 +196,19 @@
{
FileInputStream fin = new FileInputStream(tempFile);
byte bytes[] = new byte[1024];
- int x = fin.read(bytes);
- while (x != -1)
+ try
{
- out.append(new String(bytes, 0, x, charsetName));
- x = fin.read(bytes);
+ int x = fin.read(bytes);
+ while (x != -1)
+ {
+ out.append(new String(bytes, 0, x, charsetName));
+ x = fin.read(bytes);
+ }
}
- fin.close();
+ finally
+ {
+ fin.close();
+ }
}
}
11 years, 4 months
JBossWS SVN: r17067 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-11 09:30:36 -0500 (Tue, 11 Dec 2012)
New Revision: 17067
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
Log:
Few fixes / improvements
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2012-12-11 13:28:40 UTC (rev 17066)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2012-12-11 14:30:36 UTC (rev 17067)
@@ -158,7 +158,6 @@
throw MESSAGES.differentElementExpected(handlerFile, "{" + ParserConstants.JAVAEE_NS + "}"
+ ParserConstants.HANDLER_CHAINS, "{" + el.getNamespaceURI() + "}" + el.getLocalName());
}
- chain = new ArrayList<Handler>();
Node node = el.getFirstChild();
while (node != null) {
if (node instanceof Element) {
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-12-11 13:28:40 UTC (rev 17066)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-12-11 14:30:36 UTC (rev 17067)
@@ -24,6 +24,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
@@ -168,7 +169,8 @@
{
if (props != null && !props.isEmpty()) {
Map<String, Map<String, String>> queuesMap = new HashMap<String, Map<String,String>>();
- for (final String k : props.keySet()) {
+ for (Entry<String, String> e : props.entrySet()) {
+ String k = e.getKey();
if (k.startsWith(Constants.CXF_QUEUE_PREFIX)) {
String sk = k.substring(Constants.CXF_QUEUE_PREFIX.length());
int i = sk.indexOf(".");
@@ -180,13 +182,14 @@
m = new HashMap<String, String>();
queuesMap.put(queueName, m);
}
- m.put(queueProp, props.get(k));
+ m.put(queueProp, e.getValue());
}
}
}
WorkQueueManager mgr = bus.getExtension(WorkQueueManager.class);
- for (String queueName : queuesMap.keySet()) {
- AutomaticWorkQueue q = createWorkQueue(queueName, queuesMap.get(queueName));
+ for (Entry<String, Map<String, String>> e : queuesMap.entrySet()) {
+ final String queueName = e.getKey();
+ AutomaticWorkQueue q = createWorkQueue(queueName, e.getValue());
mgr.addNamedWorkQueue(queueName, q);
}
}
@@ -269,7 +272,7 @@
this.bus = bus;
}
- private class BusHolderLifeCycleListener implements BusLifeCycleListener
+ private static class BusHolderLifeCycleListener implements BusLifeCycleListener
{
private volatile boolean preShutdown = false;
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2012-12-11 13:28:40 UTC (rev 17066)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2012-12-11 14:30:36 UTC (rev 17067)
@@ -86,8 +86,14 @@
File tmpDir = IOUtils.createTempDirectory();
tmpFile = File.createTempFile("jbossws-cxf", ".xml", tmpDir);
Writer writer = new OutputStreamWriter(new FileOutputStream(tmpFile));
- writeTo(writer);
- writer.close();
+ try
+ {
+ writeTo(writer);
+ }
+ finally
+ {
+ writer.close();
+ }
return tmpFile.toURI().toURL();
}
11 years, 4 months
JBossWS SVN: r17066 - spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-12-11 08:28:40 -0500 (Tue, 11 Dec 2012)
New Revision: 17066
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
Log:
[JBPAPP6-859] fixing NPE
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2012-12-11 13:19:32 UTC (rev 17065)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2012-12-11 13:28:40 UTC (rev 17066)
@@ -236,7 +236,7 @@
match = portName.equals(getPortQName());
// if it fails try seiName
- if (match == false)
+ if (!match && seiName != null)
match = seiName.equals(getServiceEndpointInterface());
return match;
11 years, 4 months
JBossWS SVN: r17065 - in common/trunk/src/main/java/org/jboss/ws/common: configuration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-11 08:19:32 -0500 (Tue, 11 Dec 2012)
New Revision: 17065
Modified:
common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
common/trunk/src/main/java/org/jboss/ws/common/monitoring/LogRecorder.java
common/trunk/src/main/java/org/jboss/ws/common/monitoring/MemoryBufferRecorder.java
Log:
Further minor fixes / improvements
Modified: common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java 2012-12-11 11:13:27 UTC (rev 17064)
+++ common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java 2012-12-11 13:19:32 UTC (rev 17065)
@@ -66,6 +66,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
@@ -340,11 +341,9 @@
// that are defined further up the tree
if (completeNamespaces)
{
- Iterator<String> itPrefix = nsMap.keySet().iterator();
- while (itPrefix.hasNext())
- {
- String prefix = itPrefix.next();
- String nsURI = nsMap.get(prefix);
+ for (Entry<String, String> e : nsMap.entrySet()) {
+ String prefix = e.getKey();
+ String nsURI = e.getValue();
if (nsURI == null)
{
nsURI = getNamespaceURI(prefix, element, null);
Modified: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2012-12-11 11:13:27 UTC (rev 17064)
+++ common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2012-12-11 13:19:32 UTC (rev 17065)
@@ -91,7 +91,10 @@
{
is = SecurityActions.getContextClassLoader().getResourceAsStream(configFile);
ConfigRoot config = ConfigMetaDataParser.parse(is);
- return config.getClientConfigByName(configName);
+ ClientConfig cc = config.getClientConfigByName(configName);
+ if (cc != null) {
+ return cc;
+ }
}
catch (Exception e)
{
@@ -115,8 +118,8 @@
}
}
}
- throw MESSAGES.configurationNotFound(configName);
}
+ throw MESSAGES.configurationNotFound(configName);
}
/**
Modified: common/trunk/src/main/java/org/jboss/ws/common/monitoring/LogRecorder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/monitoring/LogRecorder.java 2012-12-11 11:13:27 UTC (rev 17064)
+++ common/trunk/src/main/java/org/jboss/ws/common/monitoring/LogRecorder.java 2012-12-11 13:19:32 UTC (rev 17065)
@@ -24,6 +24,7 @@
import java.io.Serializable;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.jboss.ws.api.monitoring.Record;
import org.jboss.ws.api.monitoring.Record.MessageType;
@@ -103,18 +104,17 @@
Map<String, List<String>> headers = record.getHeaders();
if (this.isProcessHeaders() && headers != null)
{
- for (String key : headers.keySet())
+ for (Entry<String, List<String>> e : headers.entrySet())
{
- sb.append(key);
+ sb.append(e.getKey());
sb.append(": ");
- for (String h : headers.get(key))
+ for (String h : e.getValue())
{
sb.append(h);
sb.append("; ");
}
sb.append("\n");
}
- sb.append("\n");
}
sb.append("\n");
if (this.isProcessEnvelope())
Modified: common/trunk/src/main/java/org/jboss/ws/common/monitoring/MemoryBufferRecorder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/monitoring/MemoryBufferRecorder.java 2012-12-11 11:13:27 UTC (rev 17064)
+++ common/trunk/src/main/java/org/jboss/ws/common/monitoring/MemoryBufferRecorder.java 2012-12-11 13:19:32 UTC (rev 17065)
@@ -28,6 +28,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -196,11 +197,10 @@
sb.append("</pre></span>");
if (!groupRecords)
openTable(sb, showDetails);
- for (String key : records.keySet())
- {
+ for (Entry<String, List<Record>> e : records.entrySet()) {
if (groupRecords)
openTable(sb, showDetails);
- for (Record record : records.get(key))
+ for (Record record : e.getValue())
{
appendRecordRow(sb, record, showDetails);
}
11 years, 4 months
JBossWS SVN: r17064 - in common/trunk/src/main/java/org/jboss/ws/common: configuration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-11 06:13:27 -0500 (Tue, 11 Dec 2012)
New Revision: 17064
Modified:
common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandler.java
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java
common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
Log:
Fixing few minor bugs / leaks
Modified: common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java 2012-12-10 18:19:30 UTC (rev 17063)
+++ common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java 2012-12-11 11:13:27 UTC (rev 17064)
@@ -523,15 +523,15 @@
if (! type.isArray())
return type.getName();
- String arrayNotation = "";
+ StringBuilder arrayNotation = new StringBuilder();
Class<?> component = type;
while(component.isArray())
{
component = component.getComponentType();
- arrayNotation += "[]";
+ arrayNotation.append("[]");
}
- return component.getName() + arrayNotation;
+ return component.getName() + arrayNotation.toString();
}
public static String capitalize(String source)
Modified: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandler.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandler.java 2012-12-10 18:19:30 UTC (rev 17063)
+++ common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandler.java 2012-12-11 11:13:27 UTC (rev 17064)
@@ -51,7 +51,7 @@
@Override
public boolean handleFault(T context)
{
- return handleFault(context);
+ return delegate.handleFault(context);
}
@Override
Modified: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java 2012-12-10 18:19:30 UTC (rev 17063)
+++ common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java 2012-12-11 11:13:27 UTC (rev 17064)
@@ -21,6 +21,7 @@
*/
package org.jboss.ws.common.configuration;
+import java.io.Serializable;
import java.util.Comparator;
import javax.xml.ws.handler.Handler;
@@ -33,8 +34,10 @@
*
*/
@SuppressWarnings("rawtypes")
-public final class ConfigDelegateHandlerComparator<T extends Handler> implements Comparator<T>
+public final class ConfigDelegateHandlerComparator<T extends Handler> implements Comparator<T>, Serializable
{
+ static final long serialVersionUID = 5045492270035185007L;
+
@Override
public int compare(Handler o1, Handler o2)
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2012-12-10 18:19:30 UTC (rev 17063)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2012-12-11 11:13:27 UTC (rev 17064)
@@ -182,7 +182,7 @@
return "CONFIDENTIAL".equals(transportGuarantee);
}
- private class PortValue {
+ private static class PortValue {
private ServerConfig config;
private Integer port;
private Integer securePort;
11 years, 4 months
JBossWS SVN: r17063 - in shared-testsuite/trunk/testsuite/src/test: resources/jaxws/jbws2150/WEB-INF/wsdl and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-10 13:19:30 -0500 (Mon, 10 Dec 2012)
New Revision: 17063
Added:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2150/WEB-INF/wsdl/inner.wsdl
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2150/WEB-INF/wsdl/Service.wsdl
Log:
[JBWS-3570] Extending testcase
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2012-12-10 13:51:55 UTC (rev 17062)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2012-12-10 18:19:30 UTC (rev 17063)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -22,10 +22,12 @@
package org.jboss.test.ws.jaxws.jbws2150;
import java.net.URL;
+import java.util.Collection;
import javax.management.Attribute;
import javax.management.ObjectName;
import javax.wsdl.Definition;
+import javax.wsdl.Import;
import javax.wsdl.Port;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
@@ -33,28 +35,30 @@
import javax.xml.ws.Service;
import org.jboss.ws.common.ObjectNameFactory;
+import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.test.JBossWSTest;
import com.ibm.wsdl.extensions.soap.SOAPAddressImpl;
/**
* [JBWS-2150] Migrate AddressRewritingTestCase to jaxws
+ *
+ * soap:address rewrite tests
+ *
* @author richard.opalka(a)jboss.com
+ * @author alessio.soldano(a)jboss.com
*/
public final class JBWS2150TestCaseForked extends JBossWSTest
{
private static final ObjectName SERVER_CONFIG_OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServerConfig");
private static final String NAMESPACE = "http://test.jboss.org/addressrewrite";
+ private static final String NAMESPACE_IMP = "http://test.jboss.org/addressrewrite/wsdlimp";
- private String wsdlLocation;
- private String wsdlLocationSec;
private Boolean modifySOAPAddress;
private String webServiceHost;
public void setUp() throws Exception
{
- wsdlLocation = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl";
- wsdlLocationSec = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl";
if (modifySOAPAddress == null)
{
modifySOAPAddress = (Boolean)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "ModifySOAPAddress");
@@ -71,7 +75,8 @@
}
/**
- * Test soap:address rewrite
+ * Test soap:address rewrite with rewrite engine on
+ *
* @throws Exception
*/
public void testRewrite() throws Exception
@@ -80,24 +85,117 @@
deploy("jaxws-jbws2150.war");
try
{
+ final String[] wsdlLocations = new String[4];
+ wsdlLocations[0] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl";
+ wsdlLocations[1] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl";
+ wsdlLocations[2] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl";
+ wsdlLocations[3] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl";
+
+ for (String wsdlLocation : wsdlLocations) {
+ Definition definition = getWSDLDefinition(wsdlLocation);
+
+ String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
+ assertEquals("http://" + webServiceHost + ":8080/jaxws-jbws2150/ValidURL", address);
+ //avoid invoking on https endpoints as that would require getting the imported wsdl using https...
+ if (wsdlLocation.equals(wsdlLocations[0]) || wsdlLocation.equals(wsdlLocations[1])) {
+ ServiceIface endpoint = getEndpoint(wsdlLocation, "ValidURLService");
+ assertEquals(endpoint.echo("hello"), "hello");
+ }
+
+ address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
+ assertEquals("http://" + webServiceHost + ":8080/jaxws-jbws2150/InvalidURL", address);
+ if (wsdlLocation.equals(wsdlLocations[0]) || wsdlLocation.equals(wsdlLocations[1])) {
+ ServiceIface endpoint = getEndpoint(wsdlLocation, "InvalidURLService");
+ assertEquals(endpoint.echo("hello"), "hello");
+ }
+
+ address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
+ assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL", address);
+
+ address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
+ assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150.war");
+ }
+ }
+
+ /**
+ * Test soap:address rewrite with rewrite engine on and the webServiceHost set to a (fake) load balancer host
+ *
+ * @throws Exception
+ */
+ public void testRewriteLoadBalancer() throws Exception
+ {
+ setModifySOAPAddress(true);
+ final String testWebServiceHost = "myloadbalancer.com";
+ setWebServiceHost(testWebServiceHost);
+ deploy("jaxws-jbws2150.war");
+ try
+ {
+ final String[] wsdlLocations = new String[4];
+ wsdlLocations[0] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl";
+ wsdlLocations[1] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl";
+ wsdlLocations[2] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl";
+ wsdlLocations[3] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl";
+
+ for (String wsdlLocation : wsdlLocations) {
+ Definition definition = getWSDLDefinition(wsdlLocation);
+
+ String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
+ assertEquals("http://" + testWebServiceHost + ":8080/jaxws-jbws2150/ValidURL", address);
+
+ address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
+ assertEquals("http://" + testWebServiceHost + ":8080/jaxws-jbws2150/InvalidURL", address);
+
+ address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
+ assertEquals("https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL", address);
+
+ address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
+ assertEquals("https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
+
+ //check wsdl import (which is bound to the endpoint currently serving the wsdl)
+ assertTrue(getWsdlImportAddress(definition).contains(testWebServiceHost));
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150.war");
+ }
+ }
- Definition definition = getWSDLDefinition(wsdlLocation);
-
- String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
- assertEquals("http://" + webServiceHost + ":8080/jaxws-jbws2150/ValidURL", address);
- ServiceIface endpoint = getEndpoint(wsdlLocation, "ValidURLService");
- assertEquals(endpoint.echo("hello"), "hello");
-
- address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
- assertEquals("http://" + webServiceHost + ":8080/jaxws-jbws2150/InvalidURL", address);
- endpoint = getEndpoint(wsdlLocation, "InvalidURLService");
- assertEquals(endpoint.echo("hello"), "hello");
-
- address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL", address);
-
- address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
+ /**
+ * Test soap:address rewrite with rewrite engine on and the webServiceHost set to jbossws.undefined.host
+ *
+ * @throws Exception
+ */
+ public void testAutoRewrite() throws Exception
+ {
+ setModifySOAPAddress(true);
+ setWebServiceHost(ServerConfig.UNDEFINED_HOSTNAME);
+ deploy("jaxws-jbws2150.war");
+ try
+ {
+ final String[] wsdlLocations = new String[4];
+ wsdlLocations[0] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl";
+ wsdlLocations[1] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl";
+ wsdlLocations[2] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl";
+ wsdlLocations[3] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl";
+
+ for (String wsdlLocation : wsdlLocations) {
+ Definition definition = getWSDLDefinition(wsdlLocation);
+
+ String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
+ assertEquals("http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidURL", address);
+
+ address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
+ assertEquals("http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidURL", address);
+
+ //no further checks on the ports forcing https even when getting the wsdl over http
+ //as there's no way to tell which port to use for the secure access given the invoked wsdl address (on http)
+ }
}
finally
{
@@ -107,6 +205,7 @@
/**
* [JBWS-454] Test soap:address URL rewrite according to transport guarantee
+ *
* @throws Exception
*/
public void testSecureRewrite() throws Exception
@@ -115,28 +214,81 @@
deploy("jaxws-jbws2150-sec.war");
try
{
- Definition definition = getWSDLDefinition(wsdlLocationSec);
-
- String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150-sec/ValidURL", address);
-
- address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150-sec/InvalidURL", address);
-
- address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150-sec/ValidSecureURL", address);
-
- address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150-sec/InvalidSecureURL", address);
+ final String[] wsdlLocationsSec = new String[4];
+ wsdlLocationsSec[0] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl";
+ wsdlLocationsSec[1] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl";
+ wsdlLocationsSec[2] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl";
+ wsdlLocationsSec[3] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl";
+
+ for (String wsdlLocationSec : wsdlLocationsSec) {
+ Definition definition = getWSDLDefinition(wsdlLocationSec);
+
+ String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
+ assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150-sec/ValidURL", address);
+
+ address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
+ assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150-sec/InvalidURL", address);
+
+ address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
+ assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150-sec/ValidSecureURL", address);
+
+ address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
+ assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150-sec/InvalidSecureURL", address);
+ }
}
finally
{
undeploy("jaxws-jbws2150-sec.war");
}
}
+
+ /**
+ * [JBWS-454] Test soap:address URL rewrite according to transport guarantee
+ *
+ * @throws Exception
+ */
+ public void testSecureRewriteLoadBalancer() throws Exception
+ {
+ setModifySOAPAddress(true);
+ final String testWebServiceHost = "myloadbalancer.com";
+ setWebServiceHost(testWebServiceHost);
+ deploy("jaxws-jbws2150-sec.war");
+ try
+ {
+ final String[] wsdlLocationsSec = new String[4];
+ wsdlLocationsSec[0] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl";
+ wsdlLocationsSec[1] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl";
+ wsdlLocationsSec[2] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl";
+ wsdlLocationsSec[3] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl";
+
+ for (String wsdlLocationSec : wsdlLocationsSec) {
+ Definition definition = getWSDLDefinition(wsdlLocationSec);
+
+ String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
+ assertEquals("https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/ValidURL", address);
+
+ address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
+ assertEquals("https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/InvalidURL", address);
+
+ address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
+ assertEquals("https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/ValidSecureURL", address);
+
+ address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
+ assertEquals("https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/InvalidSecureURL", address);
+
+ //check wsdl import (which is bound to the endpoint currently serving the wsdl)
+ assertTrue(getWsdlImportAddress(definition).contains(testWebServiceHost));
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150-sec.war");
+ }
+ }
/**
- * Test no soap:address rewrite
+ * Test soap:address rewrite when the rewrite engine is off
+ *
* @throws Exception
*/
public void testNoRewrite() throws Exception
@@ -145,19 +297,27 @@
deploy("jaxws-jbws2150.war");
try
{
- Definition definition = getWSDLDefinition(wsdlLocation);
-
- String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
- assertEquals("http://somehost:80/somepath", address);
-
- address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
- assertEquals("http://" + webServiceHost + ":8080/jaxws-jbws2150/InvalidURL", address);
-
- address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
- assertEquals("https://somehost:443/some-secure-path", address);
-
- address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
+ final String[] wsdlLocations = new String[4];
+ wsdlLocations[0] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl";
+ wsdlLocations[1] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl";
+ wsdlLocations[2] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl";
+ wsdlLocations[3] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl";
+
+ for (String wsdlLocation : wsdlLocations) {
+ Definition definition = getWSDLDefinition(wsdlLocation);
+
+ String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
+ assertEquals("http://somehost:80/somepath", address);
+
+ address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
+ assertEquals("http://" + webServiceHost + ":8080/jaxws-jbws2150/InvalidURL", address);
+
+ address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
+ assertEquals("https://somehost:443/some-secure-path", address);
+
+ address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
+ assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
+ }
}
finally
{
@@ -170,6 +330,12 @@
Attribute attr = new Attribute("ModifySOAPAddress", value);
getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
}
+
+ private void setWebServiceHost(String value) throws Exception
+ {
+ Attribute attr = new Attribute("WebServiceHost", value);
+ getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr);
+ }
private ServiceIface getEndpoint(String wsdlLocation, String serviceName) throws Exception
{
@@ -177,11 +343,13 @@
QName portName = service.getPorts().next();
return service.getPort(portName, ServiceIface.class);
}
-
+
private Definition getWSDLDefinition(String wsdlLocation) throws Exception
{
WSDLFactory wsdlFactory = WSDLFactory.newInstance();
WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
+ wsdlReader.setFeature("javax.wsdl.importDocuments", false);
+ wsdlReader.setFeature("javax.wsdl.verbose", false);
Definition definition = wsdlReader.readWSDL(null, wsdlLocation);
return definition;
@@ -192,5 +360,14 @@
Port port = definition.getService(new QName(NAMESPACE, serviceName)).getPort(portName);
return ((SOAPAddressImpl)port.getExtensibilityElements().get(0)).getLocationURI();
}
+
+ private String getWsdlImportAddress(Definition definition)
+ {
+ Collection<Import> imports = definition.getImports(NAMESPACE_IMP);
+ if (imports.size() == 1) {
+ return imports.iterator().next().getLocationURI();
+ }
+ return null;
+ }
}
Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2150/WEB-INF/wsdl/Service.wsdl
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2150/WEB-INF/wsdl/Service.wsdl 2012-12-10 13:51:55 UTC (rev 17062)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2150/WEB-INF/wsdl/Service.wsdl 2012-12-10 18:19:30 UTC (rev 17063)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions name='HelloService' targetNamespace='http://test.jboss.org/addressrewrite' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/addressrewrite' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <import namespace="http://test.jboss.org/addressrewrite/wsdlimp" location="inner.wsdl"/>
<types/>
<message name='HelloWs_echo'>
<part name='String_1' type='xsd:string'/>
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2150/WEB-INF/wsdl/inner.wsdl
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2150/WEB-INF/wsdl/inner.wsdl (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2150/WEB-INF/wsdl/inner.wsdl 2012-12-10 18:19:30 UTC (rev 17063)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions targetNamespace='http://test.jboss.org/addressrewrite/wsdlimp' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <types/>
+</definitions>
11 years, 4 months
JBossWS SVN: r17061 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-10 04:14:13 -0500 (Mon, 10 Dec 2012)
New Revision: 17061
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
Log:
Use SecurityActions to get system props
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-12-10 09:03:28 UTC (rev 17060)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-12-10 09:14:13 UTC (rev 17061)
@@ -67,8 +67,8 @@
{
try
{
- String userCfgFile = System.getProperty(Configurer.USER_CFG_FILE_PROPERTY_NAME);
- String sysCfgFileUrl = System.getProperty(Configurer.USER_CFG_FILE_PROPERTY_URL);
+ String userCfgFile = SecurityActions.getSystemProperty(Configurer.USER_CFG_FILE_PROPERTY_NAME, null);
+ String sysCfgFileUrl = SecurityActions.getSystemProperty(Configurer.USER_CFG_FILE_PROPERTY_URL, null);
Resource r = BusApplicationContext.findResource(Configurer.DEFAULT_USER_CFG_FILE);
if (!customContextProvided && userCfgFile == null && cfgFiles == null && sysCfgFileUrl == null
&& (r == null || !r.exists()) && includeDefaults)
11 years, 4 months