[jbossws-commits] JBossWS SVN: r13662 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850: src/main/java/org/jboss/ws/core and 15 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Feb 2 20:27:31 EST 2011
Author: bmaxwell
Date: 2011-02-02 20:27:30 -0500 (Wed, 02 Feb 2011)
New Revision: 13662
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/wsse.keystore
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/wsse.truststore
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/wsse.keystore
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/wsse.truststore
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/CommonClient.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/resources/standard-config/standard-jaxws-client-config.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml
Log:
[JBPAPP-5850] - JBossWS: MTOM + WS-Security not working
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/ant-import-tests/build-jars-jaxws.xml 2011-02-02 15:40:02 UTC (rev 13661)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/ant-import-tests/build-jars-jaxws.xml 2011-02-03 01:27:30 UTC (rev 13662)
@@ -360,6 +360,32 @@
<include name="org/jboss/test/ws/jaxws/jbws1283/*.*"/>
</fileset>
</jar>
+
+ <!-- jaxws-jbws2014-->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws2014-sign.jar">
+ <fileset dir="${tests.output.dir}/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}/resources/jaxws/jbws2014/sign/META-INF">
+ <include name="jboss-wsse-server.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws2014/">
+ <include name="wsse.*"/>
+ </metainf>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws2014-encrypt.jar">
+ <fileset dir="${tests.output.dir}/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}/resources/jaxws/jbws2014/encrypt/META-INF">
+ <include name="jboss-wsse-server.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws2014/">
+ <include name="wsse.*"/>
+ </metainf>
+ </jar>
<!-- jaxws-jbws1422 -->
<jar destfile="${tests.output.dir}/libs/jaxws-jbws1422.jar">
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/CommonClient.java 2011-02-02 15:40:02 UTC (rev 13661)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/CommonClient.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -54,6 +54,7 @@
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
+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;
@@ -295,6 +296,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/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2011-02-02 15:40:02 UTC (rev 13661)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -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/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-02-02 15:40:02 UTC (rev 13661)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -70,6 +70,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.EndpointConfigMetaData;
@@ -226,6 +227,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();
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2011-02-02 15:40:02 UTC (rev 13661)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -28,13 +28,17 @@
import java.util.Set;
import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPMessage;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.PortInfo;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.server.ServerHandlerDelegate;
import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.EndpointConfigMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
@@ -100,7 +104,13 @@
log.debug("callResponseHandlerChain: " + type);
HandlerChainExecutor executor = getExecutor(type);
MessageContext msgContext = (MessageContext)MessageContextAssociation.peekMessageContext();
- return (executor != null ? executor.handleMessage(msgContext) : true);
+ boolean status = (executor != null ? executor.handleMessage(msgContext) : true);
+
+ MessageAbstraction msg = ((CommonMessageContext)msgContext).getMessageAbstraction();
+ if (msg instanceof SOAPMessage)
+ XOPContext.visitAndRestoreXOPData();
+
+ return status;
}
public void closeHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type)
@@ -120,7 +130,13 @@
log.debug("callFaultHandlerChain: " + type);
HandlerChainExecutor executor = getExecutor(type);
MessageContext msgContext = (MessageContext)MessageContextAssociation.peekMessageContext();
- return (executor != null ? executor.handleFault(msgContext, ex) : true);
+ boolean status = (executor != null ? executor.handleFault(msgContext, ex) : true);
+
+ MessageAbstraction msg = ((CommonMessageContext)msgContext).getMessageAbstraction();
+ if (msg instanceof SOAPMessage)
+ XOPContext.visitAndRestoreXOPData();
+
+ return status;
}
private List<Handler> getHandlerChain(EndpointMetaData epMetaData, HandlerType type)
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2011-02-02 15:40:02 UTC (rev 13661)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -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
*
@@ -612,8 +616,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)
@@ -662,8 +669,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/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2011-02-02 15:40:02 UTC (rev 13661)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -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/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2011-02-02 15:40:02 UTC (rev 13661)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -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);
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2011-02-02 15:40:02 UTC (rev 13661)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -131,7 +131,7 @@
processSOAPBinding(sepMetaData, seiClass);
// Process an optional @BindingType annotation
- processBindingType(sepMetaData, seiClass);
+ processBindingType(sepMetaData, sepClass);
// process config
processEndpointConfig(sepClass, linkName, sepMetaData);
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/resources/standard-config/standard-jaxws-client-config.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/resources/standard-config/standard-jaxws-client-config.xml 2011-02-02 15:40:02 UTC (rev 13661)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/resources/standard-config/standard-jaxws-client-config.xml 2011-02-03 01:27:30 UTC (rev 13662)
@@ -36,7 +36,7 @@
<config-name>Standard WSSecurity Client</config-name>
<post-handler-chains>
<javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings>
<javaee:handler>
<javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name>
<javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class>
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml 2011-02-02 15:40:02 UTC (rev 13661)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml 2011-02-03 01:27:30 UTC (rev 13662)
@@ -35,7 +35,7 @@
<config-name>Standard WSSecurity Endpoint</config-name>
<post-handler-chains>
<javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings>
<javaee:handler>
<javaee:handler-name>WSSecurity Handler</javaee:handler-name>
<javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class>
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014 (from rev 13516, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java 2010-12-17 06:22:05 UTC (rev 13516)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -1,128 +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.test.ws.jaxws.jbws2014;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-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 at 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;
- }
-
- /** Try to discover the URL for the test resource */
- public URL getResourceURL(String resource) throws MalformedURLException
- {
- return getResourceFile(resource).toURL();
- }
-
- /** Try to discover the File for the test resource */
- public File getResourceFile(String resource)
- {
- File file = new File(resource);
- return file;
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java (from rev 13516, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -0,0 +1,127 @@
+/*
+ * 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.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+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 at 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("resources/jaxws/jbws2014/wsse.keystore").getPath());
+ System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("resources/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("resources/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;
+ }
+
+ /** Try to discover the URL for the test resource */
+ public URL getResourceURL(String resource) throws MalformedURLException
+ {
+ return getResourceFile(resource).toURL();
+ }
+
+ /** Try to discover the File for the test resource */
+ public File getResourceFile(String resource)
+ {
+ File file = new File(resource);
+ return file;
+ }
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java 2010-12-17 06:22:05 UTC (rev 13516)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -1,123 +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.test.ws.jaxws.jbws2014;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-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 at 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;
- }
-
- /** Try to discover the URL for the test resource */
- public URL getResourceURL(String resource) throws MalformedURLException
- {
- return getResourceFile(resource).toURL();
- }
-
- /** Try to discover the File for the test resource */
- public File getResourceFile(String resource)
- {
- File file = new File(resource);
- return file;
- }
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java (from rev 13516, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -0,0 +1,123 @@
+/*
+ * 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.File;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+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 at 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("resources/jaxws/jbws2014/wsse.keystore").getPath());
+ System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("resources/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("resources/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;
+ }
+
+ /** Try to discover the URL for the test resource */
+ public URL getResourceURL(String resource) throws MalformedURLException
+ {
+ return getResourceFile(resource).toURL();
+ }
+
+ /** Try to discover the File for the test resource */
+ public File getResourceFile(String resource)
+ {
+ File file = new File(resource);
+ return file;
+ }
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java 2010-12-17 06:22:05 UTC (rev 13516)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -1,28 +0,0 @@
-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;
- }
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java (from rev 13516, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -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;
+ }
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java 2010-12-17 06:22:05 UTC (rev 13516)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -1,35 +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.test.ws.jaxws.jbws2014;
-
-//$Id: TestEndpoint.java 6872 2008-05-02 17:49:10Z alessio.soldano at jboss.com $
-
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
- at WebService(targetNamespace = "http://org.jboss.ws/jbws2014")
- at SOAPBinding(style = SOAPBinding.Style.DOCUMENT,
- use = SOAPBinding.Use.LITERAL)
-public interface TestEndpoint
-{
- public TestDto echo(TestDto dto);
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java (from rev 13516, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -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: TestEndpoint.java 6872 2008-05-02 17:49:10Z alessio.soldano at jboss.com $
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+ at WebService(targetNamespace = "http://org.jboss.ws/jbws2014")
+ at SOAPBinding(style = SOAPBinding.Style.DOCUMENT,
+ use = SOAPBinding.Use.LITERAL)
+public interface TestEndpoint
+{
+ public TestDto echo(TestDto dto);
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java 2010-12-17 06:22:05 UTC (rev 13516)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -1,55 +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.test.ws.jaxws.jbws2014;
-
-//$Id: TestEndpointImpl.java 6872 2008-05-02 17:49:10Z alessio.soldano at jboss.com $
-
-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 at jboss.org
- * @since 01-May-2008
- */
- at Stateless
- at WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws2014.TestEndpoint",
- name = "TestEndpoint",
- targetNamespace = "http://org.jboss.ws/jbws2014",
- serviceName = "TestService")
- at SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL)
- at WebContext(contextRoot="/jaxws-jbws2014", urlPattern="/*")
- at BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
- at EndpointConfig(configName = "Standard WSSecurity Endpoint")
-public class TestEndpointImpl
-{
- public TestDto echo(TestDto dto)
- {
- return dto;
- }
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java (from rev 13516, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java 2011-02-03 01:27:30 UTC (rev 13662)
@@ -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: TestEndpointImpl.java 6872 2008-05-02 17:49:10Z alessio.soldano at jboss.com $
+
+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 at jboss.org
+ * @since 01-May-2008
+ */
+ at Stateless
+ at WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws2014.TestEndpoint",
+ name = "TestEndpoint",
+ targetNamespace = "http://org.jboss.ws/jbws2014",
+ serviceName = "TestService")
+ at SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL)
+ at WebContext(contextRoot="/jaxws-jbws2014", urlPattern="/*")
+ at BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
+ at EndpointConfig(configName = "Standard WSSecurity Endpoint")
+public class TestEndpointImpl
+{
+ public TestDto echo(TestDto dto)
+ {
+ return dto;
+ }
+}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014 (from rev 13517, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt (from rev 13517, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/encrypt)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF (from rev 13517, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/encrypt/META-INF)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml 2010-12-17 06:37:50 UTC (rev 13517)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml 2011-02-03 01:27:30 UTC (rev 13662)
@@ -1,13 +0,0 @@
-<?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
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml (from rev 13517, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml 2011-02-03 01:27:30 UTC (rev 13662)
@@ -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
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml 2010-12-17 06:37:50 UTC (rev 13517)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml 2011-02-03 01:27:30 UTC (rev 13662)
@@ -1,17 +0,0 @@
-<?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
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml (from rev 13517, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-server.xml 2011-02-03 01:27:30 UTC (rev 13662)
@@ -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
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign (from rev 13517, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/sign)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF (from rev 13517, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/sign/META-INF)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml 2010-12-17 06:37:50 UTC (rev 13517)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml 2011-02-03 01:27:30 UTC (rev 13662)
@@ -1,11 +0,0 @@
-<?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
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml (from rev 13517, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml 2011-02-03 01:27:30 UTC (rev 13662)
@@ -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
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml 2010-12-17 06:37:50 UTC (rev 13517)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml 2011-02-03 01:27:30 UTC (rev 13662)
@@ -1,15 +0,0 @@
-<?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
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml (from rev 13517, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-server.xml 2011-02-03 01:27:30 UTC (rev 13662)
@@ -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
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/wsse.keystore
===================================================================
(Binary files differ)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/wsse.keystore (from rev 13517, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/wsse.keystore)
===================================================================
(Binary files differ)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/wsse.truststore
===================================================================
(Binary files differ)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-5850/src/test/resources/jaxws/jbws2014/wsse.truststore (from rev 13517, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2014/wsse.truststore)
===================================================================
(Binary files differ)
More information about the jbossws-commits
mailing list