JBossWS SVN: r3560 - in branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core: soap and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-13 07:50:00 -0400 (Wed, 13 Jun 2007)
New Revision: 3560
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
Log:
[JBWS-1692] SOAPElement.importNode() not supported
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-06-13 10:54:09 UTC (rev 3559)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-06-13 11:50:00 UTC (rev 3560)
@@ -40,6 +40,7 @@
import org.jboss.ws.core.HTTPMessageImpl;
import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.soap.EnvelopeBuilder;
+import org.jboss.ws.core.soap.EnvelopeBuilderDOM;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPContentElement;
@@ -111,7 +112,7 @@
try
{
soapBody.removeContents();
- EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null);
+ EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
envBuilder.setStyle(style);
Element domBodyElement = DOMUtils.sourceToElement(source);
envBuilder.buildBodyElementRpc(soapBody, domBodyElement);
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-06-13 10:54:09 UTC (rev 3559)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-06-13 11:50:00 UTC (rev 3560)
@@ -249,7 +249,7 @@
soapMessage.setAttachments(attachments);
// Get the SOAPEnvelope builder
- EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null);
+ EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
envBuilder.setStyle(getStyle());
// Build the payload
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-06-13 10:54:09 UTC (rev 3559)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-06-13 11:50:00 UTC (rev 3560)
@@ -556,6 +556,17 @@
{
retNode = new TextImpl(node);
}
+ else if (node instanceof org.w3c.dom.Element)
+ {
+ try
+ {
+ retNode = new SOAPFactoryImpl().createElement((Element)node);
+ }
+ catch (SOAPException ex)
+ {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "CAnnot convert to SOAP element: " + node);
+ }
+ }
else
{
throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Operation not supported on this type of node: " + node);
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-06-13 10:54:09 UTC (rev 3559)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-06-13 11:50:00 UTC (rev 3560)
@@ -172,7 +172,7 @@
else
throw new SOAPException("Unsupported DOMSource node: " + node);
- EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null);
+ EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
envBuilder.setStyle(Style.DOCUMENT);
envBuilder.build(soapMessage, domElement);
}
@@ -181,7 +181,7 @@
try
{
StreamSource streamSource = (StreamSource)source;
- EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null);
+ EnvelopeBuilder envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
envBuilder.setStyle(Style.DOCUMENT);
InputStream stream = streamSource.getInputStream();
Reader reader = streamSource.getReader();
@@ -362,7 +362,7 @@
public Document getOwnerDocument()
{
- throw new NotImplementedException();
+ return doc;
}
public org.w3c.dom.Node getParentNode()
18 years, 10 months
JBossWS SVN: r3559 - in branches/jbossws-2.0/jbossws-core: src/main/java/javax/xml/ws and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-13 06:54:09 -0400 (Wed, 13 Jun 2007)
New Revision: 3559
Removed:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java
Modified:
branches/jbossws-2.0/jbossws-core/ant-import-tests/build-testsuite.xml
branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/Service.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/StubExt.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
Log:
Remove ServiceExt, because our JAXWS Service cannot be loaded via endorsed
Move security config getter/setter to StubExt
Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-testsuite.xml 2007-06-13 08:04:57 UTC (rev 3558)
+++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-testsuite.xml 2007-06-13 10:54:09 UTC (rev 3559)
@@ -77,7 +77,7 @@
<taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
<classpath refid="ws.stack.classpath"/>
<classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/>
-
+ <classpath location="${core.dir}/thirdparty/jaxb-api.jar"/>
<classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/>
<classpath location="${core.dir}/thirdparty/jaxb-impl.jar"/>
<classpath location="${core.dir}/thirdparty/jaxws-rt.jar"/>
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/Service.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/Service.java 2007-06-13 08:04:57 UTC (rev 3558)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/Service.java 2007-06-13 10:54:09 UTC (rev 3559)
@@ -718,23 +718,7 @@
**/
public static Service create(URL wsdlLocation, QName serviceName)
{
- Service service;
- try
- {
- Class extClass = Class.forName("org.jboss.ws.core.jaxws.client.ServiceExt");
- Constructor ctor = extClass.getConstructor(new Class[] { URL.class, QName.class });
- service = (Service)ctor.newInstance(new Object[] { wsdlLocation, serviceName });
- }
- catch (InvocationTargetException ex)
- {
- Throwable target = ex.getTargetException();
- throw new WebServiceException(target);
- }
- catch (Exception e)
- {
- service = new Service(wsdlLocation, serviceName);
- }
- return service;
+ return new Service(wsdlLocation, serviceName);
}
/**
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-13 08:04:57 UTC (rev 3558)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-13 10:54:09 UTC (rev 3559)
@@ -23,6 +23,7 @@
// $Id:CommonClient.java 660 2006-08-01 16:29:43Z thomas.diesler(a)jboss.com $
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -54,6 +55,7 @@
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.integration.ResourceLoaderAdapter;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -61,6 +63,8 @@
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
+import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory;
+import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
@@ -88,6 +92,8 @@
private Map<QName, UnboundHeader> unboundHeaders = new LinkedHashMap<QName, UnboundHeader>();
// A List<AttachmentPart> of attachment parts set through the proxy
private List<AttachmentPart> attachmentParts = new ArrayList<AttachmentPart>();
+ // The WS-Security config
+ private String securityConfig;
/** Create a call that needs to be configured manually
*/
@@ -639,4 +645,34 @@
EndpointMetaData epMetaData = getEndpointMetaData();
return epMetaData.getConfigFile();
}
+
+ public String getSecurityConfig()
+ {
+ return securityConfig;
+ }
+
+ public void setSecurityConfig(String securityConfig)
+ {
+ this.securityConfig = securityConfig;
+
+ if (securityConfig != null)
+ {
+ EndpointMetaData epMetaData = getEndpointMetaData();
+ ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData();
+ if (serviceMetaData.getSecurityConfiguration() == null)
+ {
+ try
+ {
+ WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance();
+ UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile();
+ WSSecurityConfiguration config = wsseConfFactory.createConfiguration(vfsRoot, securityConfig);
+ serviceMetaData.setSecurityConfiguration(config);
+ }
+ catch (IOException ex)
+ {
+ WSException.rethrow("Cannot set security config", ex);
+ }
+ }
+ }
+ }
}
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/StubExt.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/StubExt.java 2007-06-13 08:04:57 UTC (rev 3558)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/StubExt.java 2007-06-13 10:54:09 UTC (rev 3559)
@@ -126,4 +126,14 @@
* Creates a new empty AttachmentPart object.
*/
AttachmentPart createAttachmentPart();
+
+ /**
+ * Get the WS-Security configuration
+ */
+ String getSecurityConfig();
+
+ /**
+ * Set the WS-Security configuration
+ */
+ void setSecurityConfig(String securityConfig);
}
Deleted: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-06-13 08:04:57 UTC (rev 3558)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-06-13 10:54:09 UTC (rev 3559)
@@ -1,178 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.core.jaxws.client;
-
-// $Id$
-
-import java.io.IOException;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.EndpointReference;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceFeature;
-
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.ConfigProvider;
-import org.jboss.ws.core.StubExt;
-import org.jboss.ws.integration.UnifiedVirtualFile;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory;
-import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
-
-/**
- * Extends the standard JAXWS Service
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 18-Jan-2007
- */
-public class ServiceExt extends Service implements ConfigProvider
-{
- // The config name for all created ports
- private String configName;
- // The config file for all created ports
- private String configFile;
- // The WS-Security config
- private String securityConfig;
-
- public ServiceExt(URL wsdlDocumentLocation, QName serviceName)
- {
- super(wsdlDocumentLocation, serviceName);
- }
-
- /**
- * Get the port configuration file for newly created ports
- */
- public String getConfigFile()
- {
- return configFile;
- }
-
- /**
- * Get the port configuration name for newly created ports
- */
- public String getConfigName()
- {
- return configName;
- }
-
- /**
- * Set the port configuration name for newly created ports
- */
- public void setConfigName(String configName)
- {
- this.configName = configName;
- }
-
- /**
- * Set the port configuration name for newly created ports
- */
- public void setConfigName(String configName, String configFile)
- {
- this.configName = configName;
- this.configFile = configFile;
- }
-
- /**
- * Get the WS-Security configuration
- */
- public String getSecurityConfig()
- {
- return securityConfig;
- }
-
- /**
- * Set the WS-Security configuration
- */
- public void setSecurityConfig(String securityConfig)
- {
- this.securityConfig = securityConfig;
- }
-
- @Override
- public <T> T getPort(Class<T> serviceEndpointInterface, WebServiceFeature... features)
- {
- T port = super.getPort(serviceEndpointInterface, features);
- configurePort(port);
- return port;
- }
-
- @Override
- public <T> T getPort(Class<T> serviceEndpointInterface)
- {
- T port = super.getPort(serviceEndpointInterface);
- configurePort(port);
- return port;
- }
-
- @Override
- public <T> T getPort(EndpointReference endpointReference, Class<T> serviceEndpointInterface, WebServiceFeature... features)
- {
- T port = super.getPort(endpointReference, serviceEndpointInterface, features);
- configurePort(port);
- return port;
- }
-
- @Override
- public <T> T getPort(QName portName, Class<T> serviceEndpointInterface, WebServiceFeature... features)
- {
- T port = super.getPort(portName, serviceEndpointInterface, features);
- configurePort(port);
- return port;
- }
-
- @Override
- public <T> T getPort(QName portName, Class<T> serviceEndpointInterface)
- {
- T port = super.getPort(portName, serviceEndpointInterface);
- configurePort(port);
- return port;
- }
-
- private void configurePort(Object port)
- {
- ConfigProvider cp = (ConfigProvider)port;
- if (configName != null || configFile != null)
- cp.setConfigName(configName, configFile);
-
- if (securityConfig != null)
- {
- EndpointMetaData epMetaData = ((StubExt)port).getEndpointMetaData();
- ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData();
- if (serviceMetaData.getSecurityConfiguration() == null)
- {
- try
- {
- WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance();
- UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile();
- WSSecurityConfiguration config = wsseConfFactory.createConfiguration(vfsRoot, securityConfig);
- serviceMetaData.setSecurityConfiguration(config);
- }
- catch (IOException ex)
- {
- WSException.rethrow("Cannot set security config", ex);
- }
- }
- }
- }
-}
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-06-13 08:04:57 UTC (rev 3558)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-06-13 10:54:09 UTC (rev 3559)
@@ -32,7 +32,6 @@
import junit.framework.Test;
import org.jboss.ws.core.StubExt;
-import org.jboss.ws.core.jaxws.client.ServiceExt;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
@@ -73,9 +72,9 @@
QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
Service service = Service.create(wsdlURL, serviceName);
- ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm());
Hello port = (Hello)service.getPort(Hello.class);
+ ((StubExt)port).setSecurityConfig(securityURL.toExternalForm());
((StubExt)port).setConfigName("Standard WSSecurity Client");
Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext();
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-06-13 08:04:57 UTC (rev 3558)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-06-13 10:54:09 UTC (rev 3559)
@@ -32,7 +32,6 @@
import junit.framework.Test;
import org.jboss.ws.core.StubExt;
-import org.jboss.ws.core.jaxws.client.ServiceExt;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
@@ -69,9 +68,9 @@
QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
Service service = Service.create(wsdlURL, serviceName);
- ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm());
Hello port = (Hello)service.getPort(Hello.class);
+ ((StubExt)port).setSecurityConfig(securityURL.toExternalForm());
((StubExt)port).setConfigName("Standard WSSecurity Client");
Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext();
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-06-13 08:04:57 UTC (rev 3558)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-06-13 10:54:09 UTC (rev 3559)
@@ -31,8 +31,6 @@
import junit.framework.Test;
-import org.jboss.ws.core.StubExt;
-import org.jboss.ws.core.jaxws.client.ServiceExt;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
18 years, 10 months
JBossWS SVN: r3558 - in trunk/jbossws-core: src/test/resources/interop/root and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-13 04:04:57 -0400 (Wed, 13 Jun 2007)
New Revision: 3558
Added:
trunk/jbossws-core/src/test/resources/interop/root/META-INF/
trunk/jbossws-core/src/test/resources/interop/root/META-INF/application.xml
Removed:
trunk/jbossws-core/ant-import-tests/build-interop-jars.xml
Modified:
trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
trunk/jbossws-core/src/test/resources/interop/root/index.html
Log:
Create an EAR file from interop endpoints
Deleted: trunk/jbossws-core/ant-import-tests/build-interop-jars.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-interop-jars.xml 2007-06-12 18:22:50 UTC (rev 3557)
+++ trunk/jbossws-core/ant-import-tests/build-interop-jars.xml 2007-06-13 08:04:57 UTC (rev 3558)
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
-<!-- $Id$ -->
-
-<project name="JBossWS">
-
- <description>JBossWS test archive builder</description>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="build-interop-jars">
-
- <mkdir dir="${build.tests.dir}/libs/"/>
-
- <!-- Root.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-root.war"
- webxml="${test.resources.dir}/interop/microsoft/root/WEB-INF/web.xml">
- <webinf dir="${test.resources.dir}/interop/microsoft/root/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/root">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- BaseDataTypesDocLitB client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitB-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**.*"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- BaseDataTypesDocLitB_Service.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitB_Service.war"
- webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**.*"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- BaseDataTypesDocLitW client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitW-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- BaseDataTypesRpcLit client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesRpcLit-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- ComplexDataTypesDocLitB client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- ComplexDataTypesDocLitW client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- ComplexDataTypesRpcLit client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
-
- <!-- BaseDataTypesDocLitW_Service.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitW_Service.war"
- webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- BaseDataTypesRpcLit_Service.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesRpcLit_Service.war"
- webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- ComplexDataTypesDocLitB_Service.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB_Service.war"
- webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- ComplexDataTypesDocLitW_Service.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW_Service.war"
- webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- ComplexDataTypesRpcLit_Service.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit_Service.war"
- webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- <include name="scenarios.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- mtom-utf8.war -->
- <war warfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8.war"
- webxml="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF/web.xml">
- <classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
- <webinf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**.*"/>
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/mtom/utf8">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- mtom-utf8 client -->
- <jar jarfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8-client.jar">
- <fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
- <!-- mtom-utf8_wsse-sign.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-mtomUTF8_wsse.war"
- webxml="${test.resources.dir}/interop/microsoft/mtom/utf8/wsse/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </classes>
-
- <webinf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**.*"/>
- </webinf>
- <webinf dir="${test.resources.dir}/interop/microsoft/security/wsse10Shared/META-INF">
- <include name="alice.jks"/>
- <include name="wsse10.truststore"/>
- </webinf>
-
- <webinf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/wsse/WEB-INF">
- <include name="jboss-wsse-server.xml"/>
- <include name="jboss-web.xml"/>
- </webinf>
- <fileset dir="${test.resources.dir}/interop/microsoft/mtom/utf8">
- <include name="*.*"/>
- </fileset>
- </war>
-
- <!-- mtom-utf8_wsse-sign client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-mtomUTF8_wsse-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/>
- <include name="org/jboss/test/ws/interop/microsoft/*.class"/>
- </fileset>
- <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/security/wsse10Shared/META-INF">
- <include name="alice.jks"/>
- <include name="wsse10.truststore"/>
- </metainf>
- <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/wsse/META-INF">
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- <include name="application-client.xml"/>
- <include name="scenarios.xml"/>
- </metainf>
- </jar>
- </target>
-
-</project>
\ No newline at end of file
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 18:22:50 UTC (rev 3557)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-13 08:04:57 UTC (rev 3558)
@@ -439,7 +439,7 @@
</target>
<target name="build-interop-jars">
-
+
<!-- Root.war -->
<war warfile="${tests.output.dir}/libs/jbossws-interop-root.war"
webxml="${tests.output.dir}/resources/interop/root/WEB-INF/web.xml">
@@ -573,6 +573,11 @@
<metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF"/>
</jar>
+ <!-- wrap up in an *.ear for easier deployment -->
+ <ear destfile="${tests.output.dir}/libs/jbossws-interop.ear" appxml="${tests.output.dir}/resources/interop/root/META-INF/application.xml">
+ <fileset dir="${tests.output.dir}/libs" includes="*interop*.war"/>
+ </ear>
+
</target>
</project>
Added: trunk/jbossws-core/src/test/resources/interop/root/META-INF/application.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/interop/root/META-INF/application.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/interop/root/META-INF/application.xml 2007-06-13 08:04:57 UTC (rev 3558)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
+ version="1.4">
+
+ <display-name>JBossWS Interop Endpoints</display-name>
+
+ <module>
+ <web>
+ <web-uri>jbossws-interop-root.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>jbossws-interop-BaseDataTypesDocLitB.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>jbossws-interop-BaseDataTypesDocLitW.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>jbossws-interop-BaseDataTypesRpcLit.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>jbossws-interop-wsa10.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>jbossws-interop-wsse10Encrypt.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>jbossws-interop-wsse10Sign.war</web-uri>
+ </web>
+ </module>
+</application>
Property changes on: trunk/jbossws-core/src/test/resources/interop/root/META-INF/application.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/src/test/resources/interop/root/index.html
===================================================================
--- trunk/jbossws-core/src/test/resources/interop/root/index.html 2007-06-12 18:22:50 UTC (rev 3557)
+++ trunk/jbossws-core/src/test/resources/interop/root/index.html 2007-06-13 08:04:57 UTC (rev 3558)
@@ -5,7 +5,7 @@
<body>
<table border=0>
<tr valign=bottom>
- <td><a href="http://jboss.org"><img src="logo.gif" border="0"></a></td>
+ <td><a href="/interop"><img src="logo.gif" border="0"></a></td>
<td><a href="/interop"><h2>JBossWS / WCF interop </h2></a></td>
</tr>
<tr valign=bottom>
18 years, 10 months
JBossWS SVN: r3557 - branches.
by jbossws-commits@lists.jboss.org
Author: richard_opalka
Date: 2007-06-12 14:22:50 -0400 (Tue, 12 Jun 2007)
New Revision: 3557
Added:
branches/ropalka/
Log:
Creating WS-RM branch
Copied: branches/ropalka (from rev 3556, trunk)
18 years, 10 months
JBossWS SVN: r3556 - in trunk/jbossws-core: src/main/java/org/jboss/ws/metadata/wsse and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-12 10:20:53 -0400 (Tue, 12 Jun 2007)
New Revision: 3556
Modified:
trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java
trunk/jbossws-core/src/test/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl
Log:
Resurrect ws-security interop endpoints
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 13:50:25 UTC (rev 3555)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 14:20:53 UTC (rev 3556)
@@ -519,6 +519,60 @@
</fileset>
</war>
+ <!-- jbossws-interop-wsse10Encrypt.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt.war"
+ webxml="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF">
+ <include name="wsdl/**.*"/>
+ <include name="jboss-wsse-server.xml"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
+ <include name="alice.jks"/>
+ <include name="wsse10.truststore"/>
+ </webinf>
+
+ <fileset dir="${tests.output.dir}/resources/interop/wsse/">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+ <!-- jbossws-interop-wsse10Encrypt-client.jar -->
+ <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar">
+ <metainf dir="${tests.output.dir}/resources/interop/wsse/encrypt/META-INF"/>
+ </jar>
+
+ <!-- jbossws-interop-wsse10Sign.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign.war"
+ webxml="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF">
+ <include name="wsdl/**.*"/>
+ <include name="jboss-wsse-server.xml"/>
+ <include name="jboss-web.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
+ <include name="alice.jks"/>
+ <include name="wsse10.truststore"/>
+ </webinf>
+
+ <fileset dir="${tests.output.dir}/resources/interop/wsse/">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+ <!-- jbossws-interop-wsse10Sign-client.jar -->
+ <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign-client.jar">
+ <metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF"/>
+ </jar>
+
</target>
</project>
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-06-12 13:50:25 UTC (rev 3555)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-06-12 14:20:53 UTC (rev 3556)
@@ -41,7 +41,7 @@
public class WSSecurityConfigFactory
{
// provide logging
- final Logger log = Logger.getLogger(JAXRPCServerMetaDataBuilder.class);
+ final Logger log = Logger.getLogger(WSSecurityConfigFactory.class);
public static WSSecurityConfigFactory newInstance()
{
@@ -74,8 +74,13 @@
initKeystorePath(vfsRoot, config);
}
-
- return config;
+ else
+ {
+ // an exception might be better here...
+ log.warn("Unable to load ws-security config ("+resourceName+"). Security processing will be disabled");
+ }
+
+ return config;
}
public void initKeystorePath(UnifiedVirtualFile vfsRoot, WSSecurityConfiguration config)
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java 2007-06-12 13:50:25 UTC (rev 3555)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java 2007-06-12 14:20:53 UTC (rev 3556)
@@ -93,10 +93,10 @@
*/
}
- protected static void prepareClientClasspath(String s) {
+ protected static void addClientConfToClasspath(String s) {
try
{
- // wrap the classload upfront to allow inclusion of the client.jar
+ // wrap the classloader upfront to allow inclusion of the client.jar
JBossWSTestHelper helper = new JBossWSTestHelper();
ClassLoader parent = Thread.currentThread().getContextClassLoader();
URLClassLoader replacement = new URLClassLoader(new URL[] {helper.getArchiveURL(s)}, parent);
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-06-12 13:50:25 UTC (rev 3555)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-06-12 14:20:53 UTC (rev 3556)
@@ -34,12 +34,12 @@
public static Test suite()
{
- prepareClientClasspath("jbossws-interop-wsse10Encrypt-client.jar");
+ addClientConfToClasspath("jbossws-interop-wsse10Encrypt-client.jar");
return JBossWSTestSetup.newTestSetup(EncryptTestCase.class, "jbossws-interop-wsse10Encrypt.war");
}
- String getEndpointURL() {
- return "http://jbossws.demo.jboss.com:8080/wsse10Encrypt/endpoint";
+ String getEndpointURL() {
+ return "http://"+getServerHost()+":8080/wsse10Encrypt/endpoint";
}
// Scenario 3.3. X509 Mutual Authentication, Sign Then Encrypt
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-06-12 13:50:25 UTC (rev 3555)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-06-12 14:20:53 UTC (rev 3556)
@@ -33,12 +33,12 @@
public static Test suite()
{
- prepareClientClasspath("jbossws-interop-wsse10Sign-client.jar");
+ addClientConfToClasspath("jbossws-interop-wsse10Sign-client.jar");
return JBossWSTestSetup.newTestSetup(SignTestCase.class, "jbossws-interop-wsse10Sign.war");
}
String getEndpointURL() {
- return "http://jbossws.demo.jboss.com:8080/wsse10Sign/endpoint";
+ return "http://"+getServerHost()+":8080/wsse10Sign/endpoint";
}
// Scenario 3.2. X509 Mutual Authentication, Sign Only
Modified: trunk/jbossws-core/src/test/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl
===================================================================
--- trunk/jbossws-core/src/test/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl 2007-06-12 13:50:25 UTC (rev 3555)
+++ trunk/jbossws-core/src/test/resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl 2007-06-12 14:20:53 UTC (rev 3556)
@@ -1,33 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="PingService10Sign" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsap10="http://www.w3.org/2005/08/addressing" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:i0="http://InteropBaseAddress/interop" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/09/policy/addressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:tns="http://tempuri.org/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsa10="http://www.w3.org/2005/08/addressing"><wsp:Policy wsu:Id="MutualCertificate10Sign_IPingServiceSign_policy"><!
wsp:ExactlyOne><wsp:All><sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><wsp:Policy><sp:InitiatorToken><wsp:Policy><sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysT..."><wsp:Policy><sp:WssX509V3Token10/></wsp:Policy></sp:X509Token></wsp:Policy></sp:InitiatorToken><sp:RecipientToken><wsp:Policy><sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never"><wsp:Policy><sp:WssX509V3Token10/></wsp:Policy></sp:X509Token></wsp:Policy></sp:RecipientToken><sp:AlgorithmSuite><wsp:Policy><sp:Basic256/></wsp:Policy></sp:AlgorithmSuite><sp:Layout><wsp:Policy><sp:Lax/></wsp:Policy></sp:Layout><sp:IncludeTimestamp/><sp:EncryptSignature/><sp:OnlySignEntireHeadersAndBody/></wsp:Policy></sp:AsymmetricBinding><sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><wsp:Policy><sp:MustSupportRefKeyIdentifier/><sp:MustSupportRefIssuerSe!
rial/></wsp:Policy></sp:Wss10></wsp:All></wsp:ExactlyOne></wsp:Policy>
<wsp:Policy wsu:Id="MutualCertificate10Sign_IPingServiceSign_Ping_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="MutualCertificate10Sign_IPingServiceSign_Ping_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="MutualCertificate10Sign_IPingServiceSign_echo_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="MutualCertificate10Sign_IPingServiceSign_echo_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/></sp:SignedParts></wsp:All></wsp:Exa!
ctlyOne></wsp:Policy><wsp:Policy wsu:Id="KS10_IPingServiceSign_policy"><wsp:ExactlyOne><wsp:All><sp:SymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><wsp:Policy><sp:ProtectionToken><wsp:Policy><sp:KerberosToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once"><wsp:Policy><sp:WssGssKerberosV5ApReqToken11/></wsp:Policy></sp:KerberosToken></wsp:Policy></sp:ProtectionToken><sp:AlgorithmSuite><wsp:Policy><sp:Basic128/></wsp:Policy></sp:AlgorithmSuite><sp:Layout><wsp:Policy><sp:Lax/></wsp:Policy></sp:Layout><sp:IncludeTimestamp/><sp:OnlySignEntireHeadersAndBody/></wsp:Policy></sp:SymmetricBinding><sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><wsp:Policy><sp:MustSupportRefKeyIdentifier/><sp:MustSupportRefIssuerSerial/></wsp:Policy></sp:Wss10><wsap:UsingAddressing/></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KS10_IPingServiceSign_Ping_Input_policy"><wsp:ExactlyOne><ws!
p:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/
securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KS10_IPingServiceSign_Ping_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="h!
ttp://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KS10_IPingServiceSign_echo_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:He!
ader Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/a
ddressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KS10_IPingServiceSign_echo_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="htt!
p://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KSD10_IPingServiceSign_policy"><wsp:ExactlyOne><wsp:All><sp:SymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><wsp:Policy><sp:ProtectionToken><wsp:Policy><sp:KerberosToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once"><wsp:Policy><sp:RequireDerivedKeys/><sp:WssGssKerberosV5ApReqToken11/></wsp:Policy></sp:KerberosToken></wsp:Policy></sp:ProtectionToken><sp:AlgorithmSuite><wsp:Policy><sp:Basic128/></wsp:Policy></sp:AlgorithmSuite><sp:Layout><wsp:Policy><sp:Lax/></wsp:Policy></sp:Layout><sp:IncludeTimestamp/><sp:OnlySignEntireHeadersAndBody/></wsp:Policy></sp:SymmetricBinding><sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><wsp:Policy><sp:MustSupportRefKeyIdentifier/><sp!
:MustSupportRefIssuerSerial/></wsp:Policy></sp:Wss10><wsap:UsingAddres
sing/></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KSD10_IPingServiceSign_Ping_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KSD10_IPingServiceSign_Ping_output_policy"><wsp:ExactlyOne><wsp:All><sp:Signed!
Parts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KSD10_IPingServiceSign_echo_Input_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2!
004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.x
mlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="ReplyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy><wsp:Policy wsu:Id="KSD10_IPingServiceSign_echo_output_policy"><wsp:ExactlyOne><wsp:All><sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"><sp:Body/><sp:Header Name="To" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="From" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="FaultTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Rep!
lyTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="MessageID" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="RelatesTo" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/><sp:Header Name="Action" Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/></sp:SignedParts></wsp:All></wsp:ExactlyOne></wsp:Policy>
-
+<wsdl:definitions name="PingService10Sign" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsap10="http://www.w3.org/2005/08/addressing" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:i0="http://InteropBaseAddress/interop" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/09/policy/addressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:tns="http://tempuri.org/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsa10="http://www.w3.org/2005/08/addressing">
+
<wsdl:import namespace="http://InteropBaseAddress/interop" location="wsdl0.wsdl"/>
<wsdl:types/>
<wsdl:binding name="MutualCertificate10_IPingService"
type="i0:IPingService">
- <wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_policy"/>
<soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="Ping">
<soap:operation soapAction="http://xmlsoap.org/Ping" style="document"/>
<wsdl:input name="PingRequest">
- <wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_Ping_Input_policy"/>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output name="PingResponse">
- <wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_Ping_output_policy"/>
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="echo">
<soap:operation soapAction="http://InteropBaseAddress/interop/echo" style="document"/>
- <wsdl:input><wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_echo_Input_policy"/>
+ <wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
- <wsp:PolicyReference URI="#MutualCertificate10Sign_IPingServiceSign_echo_output_policy"/>
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
18 years, 10 months
JBossWS SVN: r3555 - branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-12 09:50:25 -0400 (Tue, 12 Jun 2007)
New Revision: 3555
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java
Log:
log error output
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2007-06-12 13:17:18 UTC (rev 3554)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2007-06-12 13:50:25 UTC (rev 3555)
@@ -134,7 +134,7 @@
KeyStore keyStore = null;
try
{
- if(log.isDebugEnabled()) log.debug("loadStore: " + storeURL);
+ log.debug("loadStore: " + storeURL);
InputStream stream = storeURL.openStream();
if (stream == null)
throw new WSSecurityException("Cannot load store from: " + storeURL);
@@ -203,17 +203,33 @@
private String execPasswordCmd(String keyStorePasswordCmd) throws WSSecurityException
{
- if(log.isDebugEnabled()) log.debug("Executing cmd: " + keyStorePasswordCmd);
+ log.debug("Executing cmd: " + keyStorePasswordCmd);
try
{
+ String password = null;
Runtime rt = Runtime.getRuntime();
Process p = rt.exec(keyStorePasswordCmd);
- InputStream stdin = p.getInputStream();
- BufferedReader reader = new BufferedReader(new InputStreamReader(stdin));
- String password = reader.readLine();
- stdin.close();
- int exitCode = p.waitFor();
- if(log.isDebugEnabled()) log.debug("Command exited with: " + exitCode);
+ int status = p.waitFor();
+ if (status == 0)
+ {
+ InputStream stdin = p.getInputStream();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(stdin));
+ password = reader.readLine();
+ stdin.close();
+ }
+ else
+ {
+ InputStream stderr = p.getErrorStream();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(stderr));
+ String line = reader.readLine();
+ while (line != null)
+ {
+ log.error(line);
+ line = reader.readLine();
+ }
+ stderr.close();
+ }
+ log.debug("Command exited with: " + status);
return password;
}
catch (Exception e)
@@ -233,7 +249,7 @@
classname = keyStorePasswordCmd.substring(0, colon);
ctorArg = keyStorePasswordCmd.substring(colon + 1);
}
- if(log.isDebugEnabled()) log.debug("Loading class: " + classname + ", ctorArg=" + ctorArg);
+ log.debug("Loading class: " + classname + ", ctorArg=" + ctorArg);
try
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
@@ -252,16 +268,16 @@
}
try
{
- if(log.isDebugEnabled()) log.debug("Checking for toCharArray");
+ log.debug("Checking for toCharArray");
Class[] sig = {};
Method toCharArray = c.getMethod("toCharArray", sig);
Object[] args = {};
- if(log.isDebugEnabled()) log.debug("Invoking toCharArray");
+ log.debug("Invoking toCharArray");
password = new String((char[])toCharArray.invoke(instance, args));
}
catch (NoSuchMethodException e)
{
- if(log.isDebugEnabled()) log.debug("No toCharArray found, invoking toString");
+ log.debug("No toCharArray found, invoking toString");
password = instance.toString();
}
}
@@ -428,7 +444,7 @@
}
catch (Exception e)
{
- if(log.isDebugEnabled()) log.debug("Certificate is invalid", e);
+ log.debug("Certificate is invalid", e);
throw new FailedAuthenticationException();
}
@@ -477,7 +493,7 @@
}
catch (CertPathValidatorException cpve)
{
- if(log.isDebugEnabled()) log.debug("Certificate is invalid:", cpve);
+ log.debug("Certificate is invalid:", cpve);
throw new FailedAuthenticationException();
}
catch (InvalidAlgorithmParameterException e)
18 years, 10 months
JBossWS SVN: r3554 - in trunk/jbossws-core: src/test/java/org/jboss/test/ws/interop/wsa and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-12 09:17:18 -0400 (Tue, 12 Jun 2007)
New Revision: 3554
Modified:
trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java
trunk/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl
trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt
Log:
Add wsa10 endpoints
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 12:51:03 UTC (rev 3553)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 13:17:18 UTC (rev 3554)
@@ -451,7 +451,7 @@
</fileset>
</war>
- <!-- BaseDataTypesDocLitB.war -->
+ <!-- jbossws-interop-BaseDataTypesDocLitB.war -->
<war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war"
webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -468,7 +468,7 @@
</fileset>
</war>
- <!-- BaseDataTypesDocLitW.war -->
+ <!-- jbossws-interop-BaseDataTypesDocLitW.war -->
<war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war"
webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -485,7 +485,7 @@
</fileset>
</war>
- <!-- BaseDataTypesRpcLit.war -->
+ <!-- jbossws-interop-BaseDataTypesRpcLit.war -->
<war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war"
webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -502,6 +502,23 @@
</fileset>
</war>
+ <!-- jbossws-interop-wsa10.war -->
+ <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10.war"
+ webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/interop/wsa/**/*.class"/>
+ <include name="org/jboss/test/ws/interop/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jboss-web.xml"/>
+ <include name="scenarios.xml"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/interop/wsa">
+ <include name="*.*"/>
+ </fileset>
+ </war>
+
</target>
</project>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-06-12 12:51:03 UTC (rev 3553)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-06-12 13:17:18 UTC (rev 3554)
@@ -60,8 +60,8 @@
static
{
- org.jboss.test.ws.interop.wsa.AddressingTestCase.BUILDER = AddressingBuilder.getAddressingBuilder();
- org.jboss.test.ws.interop.wsa.AddressingTestCase.CONSTANTS = org.jboss.test.ws.interop.wsa.AddressingTestCase.BUILDER.newAddressingConstants();
+ AddressingTestCase.BUILDER = AddressingBuilder.getAddressingBuilder();
+ AddressingTestCase.CONSTANTS = AddressingTestCase.BUILDER.newAddressingConstants();
}
private Element customerParam;
@@ -72,7 +72,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10-service.war");
+ return JBossWSTestSetup.newTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10.war");
}
protected void setUp() throws Exception
@@ -89,9 +89,16 @@
((StubExt)echoPort).setConfigName("Standard WSAddressing Client");
((StubExt)notifyPort).setConfigName("Standard WSAddressing Client");
- ((BindingProvider)echoPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/echo");
- ((BindingProvider)notifyPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/notify");
+ ((BindingProvider)echoPort).getRequestContext().put(
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://"+getServerHost()+":8080/wsa10/echo"
+ );
+ ((BindingProvider)notifyPort).getRequestContext().put(
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://"+getServerHost()+":8080/wsa10/notify"
+ );
+
configureClient();
}
@@ -106,11 +113,11 @@
private void configureClient() {
((BindingProvider)echoPort).getRequestContext().put(
- BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://jbossws.demo.jboss.com:8080/wsa10/echo"
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/echo"
);
((BindingProvider)notifyPort).getRequestContext().put(
- BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://jbossws.demo.jboss.com:8080/wsa10/notify"
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/notify"
);
/*
Modified: trunk/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl
===================================================================
--- trunk/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl 2007-06-12 12:51:03 UTC (rev 3553)
+++ trunk/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl 2007-06-12 13:17:18 UTC (rev 3554)
@@ -1,70 +1,9 @@
<wsdl:definitions targetNamespace='http://example.org/' xmlns:i0='http://example.org/notify' xmlns:i1='http://example.org/echo' xmlns:msc='http://schemas.microsoft.com/ws/2005/12/wsdl/contract' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://example.org/' xmlns:wsa='http://schemas.xmlsoap.org/ws/2004/08/addressing' xmlns:wsa10='http://www.w3.org/2005/08/addressing' xmlns:wsap='http://schemas.xmlsoap.org/ws/2004/08/addressing/policy' xmlns:wsaw='http://www.w3.org/2006/05/addressing/wsdl' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...' xmlns:wsx='http://schemas.xmlsoap.org/ws/2004/09/mex' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <wsp:Policy wsu:Id='CustomBinding_Notify_policy'>
- <wsp:ExactlyOne>
- <wsp:All>
- <wsaw:UsingAddressing/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id='CustomBinding_Notify1_policy'>
- <wsp:ExactlyOne>
- <wsp:All>
- <wsaw:UsingAddressing/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id='CustomBinding_Echo_policy'>
- <wsp:ExactlyOne>
- <wsp:All>
- <wsaw:UsingAddressing/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id='CustomBinding_Echo1_policy'>
- <wsp:ExactlyOne>
- <wsp:All>
- <wsaw:UsingAddressing/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id='CustomBinding_Echo2_policy'>
- <wsp:ExactlyOne>
- <wsp:All>
- <wsaw:UsingAddressing/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id='CustomBinding_Echo3_policy'>
- <wsp:ExactlyOne>
- <wsp:All>
- <wsaw:UsingAddressing/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id='CustomBinding_Echo4_policy'>
- <wsp:ExactlyOne>
- <wsp:All>
- <cdp:CompositeDuplex xmlns:cdp='http://schemas.microsoft.com/net/2006/06/duplex'/>
- <ow:OneWay xmlns:ow='http://schemas.microsoft.com/ws/2005/05/routing/policy'/>
- <wsaw:UsingAddressing/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
- <wsp:Policy wsu:Id='CustomBinding_Echo5_policy'>
- <wsp:ExactlyOne>
- <wsp:All>
- <cdp:CompositeDuplex xmlns:cdp='http://schemas.microsoft.com/net/2006/06/duplex'/>
- <ow:OneWay xmlns:ow='http://schemas.microsoft.com/ws/2005/05/routing/policy'/>
- <wsaw:UsingAddressing/>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
<wsdl:import location='wsdl0.wsdl' namespace='http://example.org/notify'/>
<wsdl:import location='wsdl2.wsdl' namespace='http://example.org/echo'/>
<wsdl:types/>
- <wsdl:binding name='CustomBinding_Notify' type='i0:Notify'>
- <wsp:PolicyReference URI='#CustomBinding_Notify_policy'/>
+ <wsdl:binding name='CustomBinding_Notify' type='i0:Notify'>
<soap:binding transport='http://schemas.xmlsoap.org/soap/http'/>
<wsdl:operation name='Notify'>
<soap:operation soapAction='http://example.org/action/notify' style='document'/>
@@ -84,7 +23,6 @@
</wsdl:operation>
</wsdl:binding-->
<wsdl:binding name='CustomBinding_Echo' type='i1:EchoPortType'>
- <wsp:PolicyReference URI='#CustomBinding_Echo_policy'/>
<soap:binding transport='http://schemas.xmlsoap.org/soap/http'/>
<wsdl:operation name='EchoOp'>
<soap:operation soapAction='http://example.org/action/echoIn' style='document'/>
@@ -110,7 +48,6 @@
</wsdl:operation>
</wsdl:binding-->
<wsdl:binding name='CustomBinding_Echo2' type='i1:EchoPortType'>
- <wsp:PolicyReference URI='#CustomBinding_Echo2_policy'/>
<soap:binding transport='http://schemas.xmlsoap.org/soap/http'/>
<wsdl:operation name='EchoOp'>
<soap:operation soapAction='http://example.org/action/echoIn' style='document'/>
@@ -136,7 +73,6 @@
</wsdl:operation>
</wsdl:binding-->
<wsdl:binding name='CustomBinding_Echo4' type='i1:EchoPortType'>
- <wsp:PolicyReference URI='#CustomBinding_Echo4_policy'/>
<soap:binding transport='http://schemas.xmlsoap.org/soap/http'/>
<wsdl:operation name='EchoOp'>
<soap:operation soapAction='http://example.org/action/echoIn' style='document'/>
Modified: trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt 2007-06-12 12:51:03 UTC (rev 3553)
+++ trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt 2007-06-12 13:17:18 UTC (rev 3554)
@@ -1,5 +1,5 @@
# Always exclude
-org/jboss/test/ws/interop/**
+#org/jboss/test/ws/interop/**
org/jboss/test/ws/benchmark/**
# EJB3/Injection excludes
18 years, 10 months
JBossWS SVN: r3553 - trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-12 08:51:03 -0400 (Tue, 12 Jun 2007)
New Revision: 3553
Modified:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
Log:
Minor changes
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-06-12 12:47:14 UTC (rev 3552)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-06-12 12:51:03 UTC (rev 3553)
@@ -100,7 +100,6 @@
/** This sends a fault message to the FaultTo endpoint and verfies whether we can read it of again.
*/
-
public void testFaultToMessage() throws Exception
{
String reqEnv =
18 years, 10 months
JBossWS SVN: r3552 - in branches/jbossws-2.0/jbossws-core/src/test: resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-12 08:47:14 -0400 (Tue, 12 Jun 2007)
New Revision: 3552
Modified:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml
Log:
Fix ws-addressing tests
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2007-06-12 12:46:53 UTC (rev 3551)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2007-06-12 12:47:14 UTC (rev 3552)
@@ -31,11 +31,13 @@
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPMessage;
import javax.xml.ws.addressing.AddressingBuilder;
+import javax.xml.ws.addressing.AddressingException;
import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
import org.jboss.util.xml.DOMUtils;
import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl;
/**
* Test the SOAPAddressingProperties
@@ -72,6 +74,21 @@
" <env:Body/>" +
"</env:Envelope>";
+ private String ERRORNOUS_XML = "<soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/'>\n" +
+ " <soap:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" +
+ "<wsa:Action></wsa:Action>\n" +
+ "<wsa:MessageID>urn:uuid:1fa5a31f-bbe7-4ad5-8b92-d765f4a32dc9</wsa:MessageID>\n" +
+ "<wsa:ReplyTo>\n" +
+ "<wsa:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>\n" +
+ "<wsa:ReferenceParameters>\n" +
+ "<ns1:clientid xmlns:ns1=\"http://somens\">clientid-1</ns1:clientid>\n" +
+ "</wsa:ReferenceParameters>\n" +
+ "</wsa:ReplyTo>\n" +
+ "<wsa:To>http://mycomp:8080/testws</wsa:To>\n" +
+ "</soap:Header>" +
+ " <soap:Body/>\n" +
+ "</soap:Envelope>";
+
public void setUp() throws Exception
{
super.setUp();
@@ -132,4 +149,22 @@
assertEquals(DOMUtils.parse(expEnv), DOMUtils.parse(wasEnv));
}
+
+ public void testReplyToWithoutAction() throws Exception
+ {
+ MessageFactory mf = MessageFactory.newInstance();
+ SOAPMessage message = mf.createMessage(null, new ByteArrayInputStream(ERRORNOUS_XML.getBytes()));
+
+ SOAPAddressingPropertiesImpl props = new SOAPAddressingPropertiesImpl();
+ try
+ {
+ props.readHeaders(message);
+ fail("ERRORNOUS_XML should cause a parsing exception due to missing wsa:Action value");
+ }
+ catch (AddressingException e)
+ {
+ // expected an exception
+ }
+
+ }
}
Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml 2007-06-12 12:46:53 UTC (rev 3551)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml 2007-06-12 12:47:14 UTC (rev 3552)
@@ -6,7 +6,6 @@
<jndi-name>replyto-client</jndi-name>
<service-ref>
<service-ref-name>service/ReplyToService</service-ref-name>
- <config-name>Standard WSAddressing Client</config-name>
<wsdl-override>http://@jboss.bind.address@:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl</wsdl-override>
</service-ref>
</jboss-client>
18 years, 10 months