JBossWS SVN: r6881 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-06 03:33:00 -0400 (Tue, 06 May 2008)
New Revision: 6881
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2173] Fix eventing for maven build
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-05 11:39:18 UTC (rev 6880)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-06 07:33:00 UTC (rev 6881)
@@ -91,5 +91,8 @@
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
+# [JBWS-2173] Fix eventing for maven build
+org/jboss/test/ws/jaxws/samples/wseventing/**
+
# [JBWS-2171] JBossClientMetaData.class not found
org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.*
16 years
JBossWS SVN: r6880 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-05 07:39:18 -0400 (Mon, 05 May 2008)
New Revision: 6880
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
update metro test excludes
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-05 08:03:38 UTC (rev 6879)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-05 11:39:18 UTC (rev 6880)
@@ -12,9 +12,6 @@
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
-# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
-org/jboss/test/ws/jaxws/wsrm/**
-
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-05 08:03:38 UTC (rev 6879)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-05 11:39:18 UTC (rev 6880)
@@ -12,9 +12,6 @@
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
-# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
-org/jboss/test/ws/jaxws/wsrm/**
-
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-05 08:03:38 UTC (rev 6879)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-05 11:39:18 UTC (rev 6880)
@@ -15,9 +15,6 @@
org/jboss/test/ws/jaxws/webserviceref/Secure**
org/jboss/test/ws/jaxws/jbws1840/**
-# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
-org/jboss/test/ws/jaxws/wsrm/**
-
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-05 08:03:38 UTC (rev 6879)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-05 11:39:18 UTC (rev 6880)
@@ -22,9 +22,6 @@
org/jboss/test/ws/jaxws/webserviceref/Secure**
org/jboss/test/ws/jaxws/jbws1840/**
-# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
-org/jboss/test/ws/jaxws/wsrm/**
-
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
16 years
JBossWS SVN: r6879 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core: jaxws/client and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-05 04:03:38 -0400 (Mon, 05 May 2008)
New Revision: 6879
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
Log:
[JBWS-2014] Calling restore xop in DispatchImpl too
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2008-05-05 07:03:37 UTC (rev 6878)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2008-05-05 08:03:38 UTC (rev 6879)
@@ -547,12 +547,7 @@
{
SOAPMessageContextJAXRPC msgContext = (SOAPMessageContextJAXRPC)MessageContextAssociation.peekMessageContext();
HandlerChainBaseImpl handlerChain = (HandlerChainBaseImpl)jaxrpcService.getHandlerChain(portName);
- boolean status = (handlerChain != null ? handlerChain.handleRequest(msgContext, type) : true);
-
- if (type == HandlerType.ENDPOINT)
- XOPContext.visitAndRestoreXOPData();
-
- return status;
+ return (handlerChain != null ? handlerChain.handleRequest(msgContext, type) : true);
}
@Override
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2008-05-05 07:03:37 UTC (rev 6878)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2008-05-05 08:03:38 UTC (rev 6879)
@@ -71,6 +71,7 @@
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.config.ConfigurationProvider;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -230,6 +231,8 @@
handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[1]);
handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[2]);
+ XOPContext.visitAndRestoreXOPData();
+
// Handlers might have replaced the message
reqMsg = (SOAPMessageImpl)msgContext.getSOAPMessage();
16 years
JBossWS SVN: r6878 - in spi/tags/jbossws-spi-1.0.3.GA: src/main/java/org/jboss/wsf/spi/deployment/integration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-05 03:03:37 -0400 (Mon, 05 May 2008)
New Revision: 6878
Added:
spi/tags/jbossws-spi-1.0.3.GA/jbossws-spi-1.0.3.GA.iml
Modified:
spi/tags/jbossws-spi-1.0.3.GA/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java
spi/tags/jbossws-spi-1.0.3.GA/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java
spi/tags/jbossws-spi-1.0.3.GA/version.properties
Log:
Add container name property
Added: spi/tags/jbossws-spi-1.0.3.GA/jbossws-spi-1.0.3.GA.iml
===================================================================
--- spi/tags/jbossws-spi-1.0.3.GA/jbossws-spi-1.0.3.GA.iml (rev 0)
+++ spi/tags/jbossws-spi-1.0.3.GA/jbossws-spi-1.0.3.GA.iml 2008-05-05 07:03:37 UTC (rev 6878)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: spi/tags/jbossws-spi-1.0.3.GA/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java
===================================================================
--- spi/tags/jbossws-spi-1.0.3.GA/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java 2008-05-02 19:35:54 UTC (rev 6877)
+++ spi/tags/jbossws-spi-1.0.3.GA/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java 2008-05-05 07:03:37 UTC (rev 6878)
@@ -29,13 +29,21 @@
public interface WebServiceDeclaration
{
/**
- * Web service endpoint impl. name
+ * A distinct identifier across deployments.<br>
+ * In case of EJB3 this would be the <code>ObjectName</code> under which get's registered with the MC.
+ * @return
+ */
+ String getContainerName();
+
+ /**
+ * An identifier within a deployment.
+ * In case of EJB3 this would be the <code>ejb-name</code>.
* @return a name, that can be used to susequently address the service impl.
*/
String getComponentName();
/**
- * Web sevice endpoint impl. class
+ * Web service endpoint implementation class
* @return
*/
String getComponentClassName();
@@ -44,7 +52,7 @@
* Get a unified meta data view represented by an annotation.
*
* @param t
- * @return
+ * @return
*/
<T extends java.lang.annotation.Annotation> T getAnnotation(Class<T> t);
}
Modified: spi/tags/jbossws-spi-1.0.3.GA/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java
===================================================================
--- spi/tags/jbossws-spi-1.0.3.GA/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java 2008-05-02 19:35:54 UTC (rev 6877)
+++ spi/tags/jbossws-spi-1.0.3.GA/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java 2008-05-05 07:03:37 UTC (rev 6878)
@@ -31,9 +31,15 @@
public interface ServiceEndpointContainer
{
/**
- * The actualk web service implementation hosted by this container.
+ * Identifies a service endpoint container
* @return
*/
+ String getContainerName();
+
+ /**
+ * The actual web service implementation hosted by this container.
+ * @return
+ */
Class getServiceImplementationClass();
/**
Modified: spi/tags/jbossws-spi-1.0.3.GA/version.properties
===================================================================
--- spi/tags/jbossws-spi-1.0.3.GA/version.properties 2008-05-02 19:35:54 UTC (rev 6877)
+++ spi/tags/jbossws-spi-1.0.3.GA/version.properties 2008-05-05 07:03:37 UTC (rev 6878)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-3.0
-version.id=1.0.2.GA
-repository.id=1.0.2.GA
+version.id=1.0.3.GA
+repository.id=1.0.3.GA
implementation.title=JBoss Web Services - SPI
implementation.url=http://www.jboss.org/products/jbossws
16 years
JBossWS SVN: r6877 - stack/native/trunk/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-02 15:35:54 -0400 (Fri, 02 May 2008)
New Revision: 6877
Modified:
stack/native/trunk/src/main/distro/build.xml
Log:
move native api to front of classpath
Modified: stack/native/trunk/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/src/main/distro/build.xml 2008-05-02 19:35:14 UTC (rev 6876)
+++ stack/native/trunk/src/main/distro/build.xml 2008-05-02 19:35:54 UTC (rev 6877)
@@ -67,6 +67,7 @@
<target name="tests-init" depends="init,tests-classpath">
<path id="ws.stack.classpath">
+ <!-- Move the native API to the front of the classpath -->
<pathelement location="${thirdparty.dir}/jbossws-native-jaxws-ext.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-native-jaxws.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-native-jaxrpc.jar"/>
16 years
JBossWS SVN: r6876 - stack/native/trunk/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-02 15:35:14 -0400 (Fri, 02 May 2008)
New Revision: 6876
Modified:
stack/native/trunk/src/main/distro/build.xml
Log:
move native api to front of classpath
Modified: stack/native/trunk/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/src/main/distro/build.xml 2008-05-02 19:29:44 UTC (rev 6875)
+++ stack/native/trunk/src/main/distro/build.xml 2008-05-02 19:35:14 UTC (rev 6876)
@@ -67,9 +67,11 @@
<target name="tests-init" depends="init,tests-classpath">
<path id="ws.stack.classpath">
- <fileset dir="${thirdparty.dir}">
- <exclude name="jaxws-rt.jar"/>
- </fileset>
+ <pathelement location="${thirdparty.dir}/jbossws-native-jaxws-ext.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-native-jaxws.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-native-jaxrpc.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-native-saaj.jar"/>
+ <fileset dir="${thirdparty.dir}"/>
</path>
<path id="tests.extra.classpath">
16 years
JBossWS SVN: r6875 - stack/native/trunk/modules/client.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-02 15:29:44 -0400 (Fri, 02 May 2008)
New Revision: 6875
Modified:
stack/native/trunk/modules/client/pom.xml
Log:
This shortens the path to the JAX-WS impl. Otherwise jaxws-rt.jar might be seen first
Modified: stack/native/trunk/modules/client/pom.xml
===================================================================
--- stack/native/trunk/modules/client/pom.xml 2008-05-02 17:54:03 UTC (rev 6874)
+++ stack/native/trunk/modules/client/pom.xml 2008-05-02 19:29:44 UTC (rev 6875)
@@ -15,8 +15,19 @@
<!-- Dependencies -->
<dependencies>
+ <!-- This shortens the path to the JAX-WS impl. Otherwise jaxws-rt.jar might be seen first -->
<dependency>
<groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-jaxws-ext</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-jaxrpc</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-core</artifactId>
<version>${version}</version>
</dependency>
16 years
JBossWS SVN: r6874 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-02 13:54:03 -0400 (Fri, 02 May 2008)
New Revision: 6874
Modified:
stack/native/trunk/.classpath
Log:
Include tests in the Eclipse sources
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2008-05-02 17:52:44 UTC (rev 6873)
+++ stack/native/trunk/.classpath 2008-05-02 17:54:03 UTC (rev 6874)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="modules/saaj/src/main/java"/>
+ <classpathentry kind="src" path="modules/testsuite/native-tests/src/test/java"/>
<classpathentry kind="src" path="modules/jaxrpc/src/main/java"/>
<classpathentry kind="src" path="modules/jaxws/src/main/java"/>
<classpathentry kind="src" path="modules/jaxws-ext/src/main/java"/>
16 years
JBossWS SVN: r6873 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: core/jaxws/handler and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-02 13:52:44 -0400 (Fri, 02 May 2008)
New Revision: 6873
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java
Log:
[JBWS-2014] Restore XOP Include & attachments after handlers execution (including non-endpoint ones, WS-Security handlers for instance)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2008-05-02 17:49:10 UTC (rev 6872)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2008-05-02 17:52:44 UTC (rev 6873)
@@ -56,6 +56,7 @@
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.extensions.wsrm.RMConstant;
+import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -297,6 +298,8 @@
boolean handlerPass = callRequestHandlerChain(portName, handlerType[0]);
handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[1]);
handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[2]);
+
+ XOPContext.visitAndRestoreXOPData();
// Handlers might have replaced the message
reqMessage = msgContext.getMessageAbstraction();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2008-05-02 17:49:10 UTC (rev 6872)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2008-05-02 17:52:44 UTC (rev 6873)
@@ -105,7 +105,7 @@
boolean status = (executor != null ? executor.handleMessage(msgContext) : true);
MessageAbstraction msg = ((CommonMessageContext)msgContext).getMessageAbstraction();
- if (type == HandlerType.ENDPOINT && (msg instanceof SOAPMessage))
+ if (msg instanceof SOAPMessage)
XOPContext.visitAndRestoreXOPData();
return status;
@@ -131,7 +131,7 @@
boolean status = (executor != null ? executor.handleFault(msgContext, ex) : true);
MessageAbstraction msg = ((CommonMessageContext)msgContext).getMessageAbstraction();
- if (type == HandlerType.ENDPOINT && (msg instanceof SOAPMessage))
+ if (msg instanceof SOAPMessage)
XOPContext.visitAndRestoreXOPData();
return status;
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2008-05-02 17:49:10 UTC (rev 6872)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2008-05-02 17:52:44 UTC (rev 6873)
@@ -22,8 +22,10 @@
package org.jboss.ws.core.soap;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
@@ -66,6 +68,8 @@
protected org.w3c.dom.Node domNode;
// A list of soap children
private List<NodeImpl> soapChildren = new ArrayList<NodeImpl>();
+ // A hash with the user data
+ private Map<String, Object> userData;
/** Construct the Node for a given org.w3c.dom.Node
*
@@ -613,8 +617,11 @@
public Object getUserData(String key)
{
- // FIXME getUserData
- throw new NotImplementedException("getUserData");
+ if (userData != null)
+ {
+ return userData.get(key);
+ }
+ return null;
}
public boolean isDefaultNamespace(String namespaceURI)
@@ -654,8 +661,11 @@
public Object setUserData(String key, Object data, UserDataHandler handler)
{
- // FIXME setUserData
- throw new NotImplementedException("setUserData");
+ if (userData == null)
+ {
+ userData = new HashMap<String, Object>();
+ }
+ return userData.put(key, data);
}
// END org.w3c.dom.Node DOM Level 3 *****************************************************************************
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2008-05-02 17:49:10 UTC (rev 6872)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2008-05-02 17:52:44 UTC (rev 6873)
@@ -33,6 +33,8 @@
import javax.xml.soap.SOAPFault;
import org.jboss.logging.Logger;
+import org.jboss.ws.Constants;
+import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.wsf.common.DOMUtils;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -136,6 +138,8 @@
{
SOAPElement soapChild = createElement((Element)child);
soapElement.addChildElement(soapChild);
+ if (Constants.NAME_XOP_INCLUDE.equals(soapChild.getElementQName()))
+ XOPContext.inlineXOPData(soapChild);
}
else if (nodeType == Node.TEXT_NODE)
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2008-05-02 17:49:10 UTC (rev 6872)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2008-05-02 17:52:44 UTC (rev 6873)
@@ -72,6 +72,8 @@
private static final Logger log = Logger.getLogger(XOPContext.class);
private static final String NS_XOP_JBOSSWS = "http://org.jboss.ws/xop";
+
+ private static final String NS_XOP_JBOSSWS_CONTENT_TYPE = NS_XOP_JBOSSWS + ":content-type";
/**
* Check if the current soap message flagged as a XOP package.
@@ -258,11 +260,11 @@
*/
public static void restoreXOPDataDOM(SOAPElement xopElement)
{
- String contentType = xopElement.getAttributeNS(NS_XOP_JBOSSWS, "content-type");
+ String contentType = (String)xopElement.getUserData(NS_XOP_JBOSSWS_CONTENT_TYPE);
if (contentType != null && contentType.length() > 0)
{
replaceBase64Representation(xopElement, contentType);
- xopElement.removeAttribute(new NameImpl(new QName(NS_XOP_JBOSSWS, "content-type")));
+ xopElement.setUserData(NS_XOP_JBOSSWS_CONTENT_TYPE, null, null);
}
else
{
@@ -345,7 +347,7 @@
String base64 = SimpleTypeBindings.marshalBase64(data);
parent.removeChild(xopIncludeElement);
parent.setValue(base64);
- parent.setAttributeNS(NS_XOP_JBOSSWS, "content-type", contentType);
+ parent.setUserData(NS_XOP_JBOSSWS_CONTENT_TYPE, contentType, null);
if (log.isDebugEnabled())
log.debug("Created base64 representation for content-type " + contentType);
16 years
JBossWS SVN: r6872 - in stack/native/trunk/modules/testsuite/native-tests/src: test/java/org/jboss/test/ws/jaxws and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-02 13:49:10 -0400 (Fri, 02 May 2008)
New Revision: 6872
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/encrypt/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/encrypt/META-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/sign/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/sign/META-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/wsse.keystore
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/wsse.truststore
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/scripts/build-jars-jaxws.xml
Log:
[JBWS-2014][JBWS-2172] Add test cases
Modified: stack/native/trunk/modules/testsuite/native-tests/src/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/scripts/build-jars-jaxws.xml 2008-05-02 17:47:02 UTC (rev 6871)
+++ stack/native/trunk/modules/testsuite/native-tests/src/scripts/build-jars-jaxws.xml 2008-05-02 17:49:10 UTC (rev 6872)
@@ -231,6 +231,32 @@
<include name="jboss.xml"/>
</metainf>
</jar>
+
+ <!-- jaxws-jbws2014-->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2014-sign.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2014/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2014/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/sign/META-INF">
+ <include name="jboss-wsse-server.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/">
+ <include name="wsse.*"/>
+ </metainf>
+ </jar>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2014-encrypt.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2014/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2014/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/encrypt/META-INF">
+ <include name="jboss-wsse-server.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/">
+ <include name="wsse.*"/>
+ </metainf>
+ </jar>
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java 2008-05-02 17:49:10 UTC (rev 6872)
@@ -0,0 +1,112 @@
+/*
+ * 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.test.ws.jaxws.jbws2014;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPBinding;
+
+import junit.framework.Test;
+
+import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test JBWS-2014 (WS-Security with MTOM) - signature + encryption
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 01-May-2008
+ */
+public class EncryptTestCase extends JBossWSTest
+{
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(EncryptTestCase.class, "jaxws-jbws2014-encrypt.jar");
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testEndpoint() throws Exception
+ {
+ TestDto in0 = new TestDto();
+ in0.setId("myId");
+ String text = "This is the attachment for id: myId";
+ in0.setContent(new DataHandler(text, "text/plain"));
+ TestEndpoint port = getPort();
+ TestDto retObj = port.echo(in0);
+
+ Map<String, Object> ctx = ((BindingProvider)port).getResponseContext();
+ Object resContentType = ((HashMap<String,Object>)ctx.get("javax.xml.ws.http.response.headers")).get("Content-Type");
+
+ //Inline data when using encryption
+ assertTrue(resContentType.toString().contains("text/xml"));
+ assertTrue(!resContentType.toString().contains("multipart"));
+
+
+ assertEquals("myId", retObj.getId());
+ Object result = retObj.getContent().getContent();
+ if (result instanceof InputStream)
+ {
+ InputStream in = (InputStream)result;
+ StringBuilder out = new StringBuilder();
+ byte[] b = new byte[4096];
+ for (int n; (n = in.read(b)) != -1;) {
+ out.append(new String(b, 0, n));
+ }
+ result = out.toString();
+ }
+ assertEquals(text, result);
+ }
+
+ private TestEndpoint getPort() throws Exception
+ {
+ System.setProperty("org.jboss.ws.wsse.keyStore", getResourceFile("jaxws/jbws2014/wsse.keystore").getPath());
+ System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("jaxws/jbws2014/wsse.truststore").getPath());
+ System.setProperty("org.jboss.ws.wsse.keyStorePassword", "jbossws");
+ System.setProperty("org.jboss.ws.wsse.trustStorePassword", "jbossws");
+ System.setProperty("org.jboss.ws.wsse.keyStoreType", "jks");
+ System.setProperty("org.jboss.ws.wsse.trustStoreType", "jks");
+
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2014?wsdl");
+ URL securityURL = getResourceURL("jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml");
+ QName serviceName = new QName("http://org.jboss.ws/jbws2014", "TestService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ ((StubExt)port).setSecurityConfig(securityURL.toExternalForm());
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
+
+ SOAPBinding binding = (SOAPBinding)((BindingProvider)port).getBinding();
+ binding.setMTOMEnabled(true);
+ return port;
+ }
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java 2008-05-02 17:49:10 UTC (rev 6872)
@@ -0,0 +1,108 @@
+/*
+ * 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.test.ws.jaxws.jbws2014;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPBinding;
+
+import junit.framework.Test;
+
+import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test JBWS-2014 (WS-Security with MTOM) - signature
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 01-May-2008
+ */
+public class SignTestCase extends JBossWSTest
+{
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(SignTestCase.class, "jaxws-jbws2014-sign.jar");
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testEndpoint() throws Exception
+ {
+ TestDto in0 = new TestDto();
+ in0.setId("myId");
+ String text = "This is the attachment for id: myId";
+ //This also tests JBWS-2172
+ in0.setContent(new DataHandler(text, "text/plain"));
+ TestEndpoint port = getPort();
+ TestDto retObj = port.echo(in0);
+
+ Map<String, Object> ctx = ((BindingProvider)port).getResponseContext();
+ Object resContentType = ((HashMap<String,Object>)ctx.get("javax.xml.ws.http.response.headers")).get("Content-Type");
+ //Check attachment
+ assertTrue(resContentType.toString().contains("multipart"));
+
+ assertEquals("myId", retObj.getId());
+ Object result = retObj.getContent().getContent();
+ if (result instanceof InputStream)
+ {
+ InputStream in = (InputStream)result;
+ StringBuilder out = new StringBuilder();
+ byte[] b = new byte[4096];
+ for (int n; (n = in.read(b)) != -1;) {
+ out.append(new String(b, 0, n));
+ }
+ result = out.toString();
+ }
+ assertEquals(text, result);
+ }
+
+ private TestEndpoint getPort() throws Exception
+ {
+ System.setProperty("org.jboss.ws.wsse.keyStore", getResourceFile("jaxws/jbws2014/wsse.keystore").getPath());
+ System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("jaxws/jbws2014/wsse.truststore").getPath());
+ System.setProperty("org.jboss.ws.wsse.keyStorePassword", "jbossws");
+ System.setProperty("org.jboss.ws.wsse.trustStorePassword", "jbossws");
+ System.setProperty("org.jboss.ws.wsse.keyStoreType", "jks");
+ System.setProperty("org.jboss.ws.wsse.trustStoreType", "jks");
+
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2014?wsdl");
+ URL securityURL = getResourceURL("jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml");
+ QName serviceName = new QName("http://org.jboss.ws/jbws2014", "TestService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ ((StubExt)port).setSecurityConfig(securityURL.toExternalForm());
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
+
+ SOAPBinding binding = (SOAPBinding)((BindingProvider)port).getBinding();
+ binding.setMTOMEnabled(true);
+ return port;
+ }
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java 2008-05-02 17:49:10 UTC (rev 6872)
@@ -0,0 +1,28 @@
+package org.jboss.test.ws.jaxws.jbws2014;
+
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlMimeType;
+
+public class TestDto
+{
+ private DataHandler content;
+ private String id;
+
+ @XmlMimeType("text/plain")
+ public DataHandler getContent()
+ {
+ return content;
+ }
+ public void setContent(DataHandler content)
+ {
+ this.content = content;
+ }
+ public String getId()
+ {
+ return id;
+ }
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java 2008-05-02 17:49:10 UTC (rev 6872)
@@ -0,0 +1,35 @@
+/*
+ * 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.test.ws.jaxws.jbws2014;
+
+//$Id$
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(targetNamespace = "http://org.jboss.ws/jbws2014")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT,
+ use = SOAPBinding.Use.LITERAL)
+public interface TestEndpoint
+{
+ public TestDto echo(TestDto dto);
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java 2008-05-02 17:49:10 UTC (rev 6872)
@@ -0,0 +1,55 @@
+/*
+ * 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.test.ws.jaxws.jbws2014;
+
+//$Id$
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.BindingType;
+
+import org.jboss.ws.annotation.EndpointConfig;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+/**
+ * The MTOM endpoint
+ *
+ * @author alessio.soldano(a)jboss.org
+ * @since 01-May-2008
+ */
+@Stateless
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws2014.TestEndpoint",
+ name = "TestEndpoint",
+ targetNamespace = "http://org.jboss.ws/jbws2014",
+ serviceName = "TestService")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL)
+@WebContext(contextRoot="/jaxws-jbws2014", urlPattern="/*")
+@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
+@EndpointConfig(configName = "Standard WSSecurity Endpoint")
+public class TestEndpointImpl
+{
+ public TestDto echo(TestDto dto)
+ {
+ return dto;
+ }
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml 2008-05-02 17:49:10 UTC (rev 6872)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <config>
+ <sign type="x509v3" alias="wsse"/>
+ <encrypt type="x509v3" alias="wsse"/>
+ <requires>
+ <signature/>
+ <encryption/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml 2008-05-02 17:49:10 UTC (rev 6872)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <key-store-file>META-INF/wsse.keystore</key-store-file>
+ <key-store-password>jbossws</key-store-password>
+ <trust-store-file>META-INF/wsse.truststore</trust-store-file>
+ <trust-store-password>jbossws</trust-store-password>
+ <config>
+ <sign type="x509v3" alias="wsse"/>
+ <encrypt type="x509v3" alias="wsse"/>
+ <requires>
+ <signature/>
+ <encryption/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml 2008-05-02 17:49:10 UTC (rev 6872)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <config>
+ <sign type="x509v3" alias="wsse" includeTimestamp="false"/>
+ <requires>
+ <signature/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml 2008-05-02 17:49:10 UTC (rev 6872)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <key-store-file>META-INF/wsse.keystore</key-store-file>
+ <key-store-password>jbossws</key-store-password>
+ <trust-store-file>META-INF/wsse.truststore</trust-store-file>
+ <trust-store-password>jbossws</trust-store-password>
+ <config>
+ <sign type="x509v3" alias="wsse" includeTimestamp="false"/>
+ <requires>
+ <signature/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/wsse.keystore
===================================================================
(Binary files differ)
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/wsse.keystore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/wsse.truststore
===================================================================
(Binary files differ)
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/wsse.truststore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years