JBossWS SVN: r17682 - in stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782: modules/core and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2013-06-14 21:07:28 -0400 (Fri, 14 Jun 2013)
New Revision: 17682
Modified:
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedAuthenticationException.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/InvalidSecurityHeaderException.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/InvalidSecurityTokenException.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/SecurityTokenUnavailableException.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/UnsupportedAlgorithmException.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/UnsupportedSecurityTokenException.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/testsuite/native-tests/
Log:
[JBPAPP-10782] Customer's fix: WSSecurityException conversion to SOAP 1.2 fault fails
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2:17030
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007:15579
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2:17030,17378
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007:15579
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2/modules/core:17030
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/core:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/core:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2/modules/core:17030,17378
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/core:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/core:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2013-06-15 00:51:26 UTC (rev 17681)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2013-06-15 01:07:28 UTC (rev 17682)
@@ -800,7 +800,7 @@
public void writeElement(Writer writer)
{
- new DOMWriter(writer).print(this);
+ new DOMWriter(writer).setCompleteNamespaces(false).print(this);
}
private static SOAPElement getChildElement(SOAPElement element, QName name)
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-06-15 00:51:26 UTC (rev 17681)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-06-15 01:07:28 UTC (rev 17682)
@@ -25,16 +25,20 @@
import java.util.List;
import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
import javax.xml.ws.WebServiceException;
+import javax.xml.ws.soap.SOAPFaultException;
+import javax.xml.ws.soap.SOAPBinding;
import org.jboss.logging.Logger;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.core.soap.SOAPFaultImpl;
import org.jboss.ws.extensions.security.exception.InvalidSecurityHeaderException;
import org.jboss.ws.extensions.security.exception.WSSecurityException;
import org.jboss.ws.extensions.security.nonce.DefaultNonceFactory;
@@ -263,21 +267,65 @@
return newList;
}
- private CommonSOAPFaultException convertToFault(WSSecurityException e)
+ private RuntimeException convertToFault(WSSecurityException e) throws SOAPException
{
return convertToFault(e, VERBOSE_EXCEPTION_REPORTING);
}
- private CommonSOAPFaultException convertToFault(WSSecurityException e, boolean verbose)
+ private RuntimeException convertToFault(WSSecurityException e, boolean verbose) throws SOAPException
{
- if (verbose) {
- return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
- } else {
- QName faultCode = new QName(Constants.JBOSS_WSSE_NS, "GenericError", Constants.JBOSS_WSSE_PREFIX);
- return new CommonSOAPFaultException(faultCode, "A WS-Security error occurred.");
+ //Try to reduce redundant stack trace elements printed to log
+ chopStackTrace(e);
+ log.error("Original WSSecurityException: ", e);
+
+ if(isSOAP12())
+ {
+ SOAPFaultImpl fault = new SOAPFaultImpl(
+ org.jboss.ws.Constants.PREFIX_ENV,
+ org.jboss.ws.Constants.NS_SOAP12_ENV
+ );
+
+ if(e.isInternalError())
+ fault.setFaultCode(SOAPConstants.SOAP_RECEIVER_FAULT);
+ else
+ fault.setFaultCode(SOAPConstants.SOAP_SENDER_FAULT);
+
+ fault.appendFaultSubcode(e.getFaultCode());
+ fault.setFaultString(e.getFaultString());
+
+ return new SOAPFaultException(fault);
}
+ else
+ {
+ if (verbose)
+ {
+ return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
+ }
+ else
+ {
+ QName faultCode = new QName(Constants.JBOSS_WSSE_NS, "GenericError", Constants.JBOSS_WSSE_PREFIX);
+ return new CommonSOAPFaultException(faultCode, "A WS-Security error occurred.");
+ }
+ }
}
+ private void chopStackTrace(Exception e)
+ {
+ StackTraceElement[] original = e.getStackTrace();
+ int cutOffElement = 0;
+ for(; cutOffElement < original.length; cutOffElement++)
+ {
+ StackTraceElement elem = original[cutOffElement];
+ String className = elem.getClassName();
+ if("javax.servlet.http.HttpServlet".equals(className))
+ {
+ StackTraceElement[] newSte = new StackTraceElement[cutOffElement + 1];
+ System.arraycopy(original, 0, newSte, 0, cutOffElement + 1);
+ e.setStackTrace(newSte);
+ }
+ }
+ }
+
private List<RequireOperation> buildRequireOperations(Config operationConfig, boolean fault)
{
if (operationConfig == null)
@@ -368,4 +416,20 @@
return requires != null && (!fault || requires.includesFaults());
}
+
+ private static boolean isSOAP12()
+ {
+ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+ if (msgContext != null)
+ {
+ EndpointMetaData emd = msgContext.getEndpointMetaData();
+ String bindingId = emd.getBindingId();
+ if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId))
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedAuthenticationException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedAuthenticationException.java 2013-06-15 00:51:26 UTC (rev 17681)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedAuthenticationException.java 2013-06-15 01:07:28 UTC (rev 17682)
@@ -39,6 +39,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public FailedAuthenticationException(Throwable cause)
@@ -46,6 +47,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public FailedAuthenticationException(String message)
@@ -53,6 +55,7 @@
super(message);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
public FailedAuthenticationException(String message, Throwable cause)
@@ -60,5 +63,6 @@
super(message, cause);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java 2013-06-15 00:51:26 UTC (rev 17681)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java 2013-06-15 01:07:28 UTC (rev 17682)
@@ -39,6 +39,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public FailedCheckException(Throwable cause)
@@ -46,6 +47,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public FailedCheckException(String message)
@@ -60,5 +62,6 @@
super(message, cause);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/InvalidSecurityHeaderException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/InvalidSecurityHeaderException.java 2013-06-15 00:51:26 UTC (rev 17681)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/InvalidSecurityHeaderException.java 2013-06-15 01:07:28 UTC (rev 17682)
@@ -39,6 +39,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public InvalidSecurityHeaderException(Throwable cause)
@@ -46,6 +47,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public InvalidSecurityHeaderException(String message)
@@ -53,6 +55,7 @@
super(message);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
public InvalidSecurityHeaderException(String message, Throwable cause)
@@ -60,5 +63,6 @@
super(message, cause);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/InvalidSecurityTokenException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/InvalidSecurityTokenException.java 2013-06-15 00:51:26 UTC (rev 17681)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/InvalidSecurityTokenException.java 2013-06-15 01:07:28 UTC (rev 17682)
@@ -39,6 +39,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public InvalidSecurityTokenException(Throwable cause)
@@ -46,6 +47,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public InvalidSecurityTokenException(String message)
@@ -53,6 +55,7 @@
super(message);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
public InvalidSecurityTokenException(String message, Throwable cause)
@@ -60,5 +63,6 @@
super(message, cause);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/SecurityTokenUnavailableException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/SecurityTokenUnavailableException.java 2013-06-15 00:51:26 UTC (rev 17681)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/SecurityTokenUnavailableException.java 2013-06-15 01:07:28 UTC (rev 17682)
@@ -39,6 +39,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public SecurityTokenUnavailableException(Throwable cause)
@@ -46,6 +47,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public SecurityTokenUnavailableException(String message)
@@ -53,6 +55,7 @@
super(message);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
public SecurityTokenUnavailableException(String message, Throwable cause)
@@ -60,5 +63,6 @@
super(message, cause);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/UnsupportedAlgorithmException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/UnsupportedAlgorithmException.java 2013-06-15 00:51:26 UTC (rev 17681)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/UnsupportedAlgorithmException.java 2013-06-15 01:07:28 UTC (rev 17682)
@@ -39,6 +39,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public UnsupportedAlgorithmException(Throwable cause)
@@ -46,6 +47,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public UnsupportedAlgorithmException(String message)
@@ -53,6 +55,7 @@
super(message);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
public UnsupportedAlgorithmException(String message, Throwable cause)
@@ -60,5 +63,6 @@
super(message, cause);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/UnsupportedSecurityTokenException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/UnsupportedSecurityTokenException.java 2013-06-15 00:51:26 UTC (rev 17681)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/UnsupportedSecurityTokenException.java 2013-06-15 01:07:28 UTC (rev 17682)
@@ -39,6 +39,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public UnsupportedSecurityTokenException(Throwable cause)
@@ -46,6 +47,7 @@
super(faultString);
setFaultCode(faultCode);
setFaultString(faultString);
+ internal = false;
}
public UnsupportedSecurityTokenException(String message)
@@ -53,6 +55,7 @@
super(message);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
public UnsupportedSecurityTokenException(String message, Throwable cause)
@@ -60,5 +63,6 @@
super(message, cause);
setFaultCode(faultCode);
setFaultString(message);
+ internal = false;
}
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java 2013-06-15 00:51:26 UTC (rev 17681)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java 2013-06-15 01:07:28 UTC (rev 17682)
@@ -30,7 +30,7 @@
*/
public class WSSecurityException extends Exception
{
- private boolean internal = false;
+ protected boolean internal = false;
private QName faultCode = new QName(Constants.JBOSS_WSSE_NS, "InternalError", Constants.JBOSS_WSSE_PREFIX);
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/testsuite/native-tests
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests:17030
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/testsuite/native-tests:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/testsuite/native-tests:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests:17030,17378
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/testsuite/native-tests:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/testsuite/native-tests:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
12 years, 4 months
- 1
- 0
JBossWS SVN: r17681 - in stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782: modules/core and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2013-06-14 20:51:26 -0400 (Fri, 14 Jun 2013)
New Revision: 17681
Modified:
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/testsuite/native-tests/
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
Log:
[JBPAPP-10782] security backport
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007:15579
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2:17030
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007:15579
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/core:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/core:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2/modules/core:17030
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/core:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/core:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-06-15 00:36:53 UTC (rev 17680)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-06-15 00:51:26 UTC (rev 17681)
@@ -76,6 +76,8 @@
{
// provide logging
private static Logger log = Logger.getLogger(WSSecurityDispatcher.class);
+
+ private static boolean VERBOSE_EXCEPTION_REPORTING = Boolean.getBoolean("org.jboss.ws.native.security.verbose_exception_reporting");
public void decodeMessage(WSSecurityConfiguration configuration, SOAPMessage message, Config operationConfig) throws SOAPException
{
@@ -88,7 +90,7 @@
if (secHeaderElement == null)
{
if (hasRequirements(config, fault))
- throw convertToFault(new InvalidSecurityHeaderException("This service requires <wsse:Security>, which is missing."));
+ throw convertToFault(new InvalidSecurityHeaderException("This service requires <wsse:Security>, which is missing."), true);
}
try
@@ -263,8 +265,18 @@
private CommonSOAPFaultException convertToFault(WSSecurityException e)
{
- return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
+ return convertToFault(e, VERBOSE_EXCEPTION_REPORTING);
}
+
+ private CommonSOAPFaultException convertToFault(WSSecurityException e, boolean verbose)
+ {
+ if (verbose) {
+ return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
+ } else {
+ QName faultCode = new QName(Constants.JBOSS_WSSE_NS, "GenericError", Constants.JBOSS_WSSE_PREFIX);
+ return new CommonSOAPFaultException(faultCode, "A WS-Security error occurred.");
+ }
+ }
private List<RequireOperation> buildRequireOperations(Config operationConfig, boolean fault)
{
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-06-15 00:36:53 UTC (rev 17680)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-06-15 00:51:26 UTC (rev 17681)
@@ -32,8 +32,10 @@
import org.jboss.ws.extensions.security.Constants;
import org.jboss.ws.extensions.security.KeyResolver;
import org.jboss.ws.extensions.security.Util;
+import org.jboss.ws.extensions.security.exception.FailedCheckException;
import org.jboss.ws.extensions.security.exception.InvalidSecurityHeaderException;
import org.jboss.ws.extensions.security.exception.WSSecurityException;
+import org.jboss.ws.extensions.security.operation.EncryptionOperation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -128,7 +130,16 @@
}
catch (XMLSecurityException e)
{
- throw new WSSecurityException("Could not parse encrypted key: " + e.getMessage(), e);
+ try
+ {
+ this.secretKey = EncryptionOperation.generateSecretKey(alg);
+ }
+ catch (Exception ex)
+ {
+ WSSecurityException exception = new FailedCheckException(e);
+ exception.setInternal(true);
+ throw exception;
+ }
}
this.document = element.getOwnerDocument();
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java 2013-06-15 00:36:53 UTC (rev 17680)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java 2013-06-15 00:51:26 UTC (rev 17681)
@@ -32,7 +32,7 @@
{
public static final QName faultCode = new QName(Constants.WSSE_NS, "FailedCheck", Constants.WSSE_PREFIX);
- public static final String faultString = "The signature or decryption was invlaid.";
+ public static final String faultString = "The signature or decryption was invalid.";
public FailedCheckException()
{
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java 2013-06-15 00:36:53 UTC (rev 17680)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java 2013-06-15 00:51:26 UTC (rev 17681)
@@ -72,4 +72,9 @@
{
return faultString;
}
+
+ public void setInternal(boolean internal)
+ {
+ this.internal = internal;
+ }
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java 2013-06-15 00:36:53 UTC (rev 17680)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java 2013-06-15 00:51:26 UTC (rev 17681)
@@ -107,7 +107,7 @@
}
catch (XMLEncryptionException e)
{
- throw new FailedCheckException("Decryption was invalid.");
+ throw new FailedCheckException(e);
}
catch (Exception e)
{
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java 2013-06-15 00:36:53 UTC (rev 17680)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java 2013-06-15 00:51:26 UTC (rev 17681)
@@ -75,6 +75,7 @@
}
private static HashMap<String, Algorithm> algorithms;
+ private static HashMap<String, String> algorithmsID;
private static final String DEFAULT_ALGORITHM = "aes-128";
@@ -88,6 +89,12 @@
algorithms.put("aes-192-gcm", new Algorithm("AES", XMLCipher.AES_192_GCM, 192));
algorithms.put("aes-256-gcm", new Algorithm("AES", XMLCipher.AES_256_GCM, 256));
algorithms.put("tripledes", new Algorithm("TripleDes", XMLCipher.TRIPLEDES, 168));
+
+ algorithmsID = new HashMap<String, String>(4);
+ algorithmsID.put(XMLCipher.AES_128, "aes-128");
+ algorithmsID.put(XMLCipher.AES_192, "aes-192");
+ algorithmsID.put(XMLCipher.AES_256, "aes-256");
+ algorithmsID.put(XMLCipher.TRIPLEDES, "tripledes");
}
public EncryptionOperation(List<Target> targets, String alias, String algorithm, String wrap, String tokenRefType, String securityDomainAliasLabel)
@@ -130,7 +137,7 @@
}
}
- public SecretKey getSecretKey(String algorithm) throws WSSecurityException
+ private static SecretKey getSecretKey(String algorithm) throws WSSecurityException
{
Algorithm alg = algorithms.get(algorithm);
@@ -146,6 +153,11 @@
}
}
+ public static SecretKey generateSecretKey(String alg) throws WSSecurityException
+ {
+ return getSecretKey(algorithmsID.get(alg));
+ }
+
public void process(Document message, SecurityHeader header, SecurityStore store) throws WSSecurityException
{
if (! algorithms.containsKey(algorithm))
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/testsuite/native-tests
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/testsuite/native-tests:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/testsuite/native-tests:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests:17030
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/testsuite/native-tests:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/testsuite/native-tests:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
Modified: stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2013-06-15 00:36:53 UTC (rev 17680)
+++ stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2013-06-15 00:51:26 UTC (rev 17681)
@@ -33,7 +33,6 @@
import junit.framework.Test;
import org.jboss.ws.core.StubExt;
-import org.jboss.ws.extensions.security.exception.FailedAuthenticationException;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -50,10 +49,8 @@
private final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1999";
- private static final String FAULT_CODE = "wsse:FailedAuthentication";
+ private static final String FAULT_CODE = "jboss-wsse:GenericError";
- private static final String FAULT_STRING = FailedAuthenticationException.faultString;
-
public static Test suite() throws Exception
{
return new JBossWSTestSetup(JBWS1999TestCase.class, "jaxws-jbws1999.war");
@@ -111,8 +108,6 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
- String faultString = fault.getFaultString();
- assertEquals("Fault String", FAULT_STRING, faultString);
}
}
@@ -149,8 +144,6 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
- String faultString = fault.getFaultString();
- assertEquals("Fault Message", FAULT_STRING, faultString);
}
}
@@ -173,8 +166,6 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
- String faultString = fault.getFaultString();
- assertEquals("Fault Message", FAULT_STRING, faultString);
}
}
12 years, 4 months
- 1
- 0
JBossWS SVN: r17680 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2013-06-14 20:36:53 -0400 (Fri, 14 Jun 2013)
New Revision: 17680
Added:
stack/native/branches/jbossws-native-3.1.2.SP15_JBPAPP-10782/
Log:
[JBPAPP-10782] Creating one-off branch
12 years, 4 months
- 1
- 0
JBossWS SVN: r17679 - in stack/native/tags/jbossws-native-3.1.2.SP15: modules/core and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2013-06-14 18:17:07 -0400 (Fri, 14 Jun 2013)
New Revision: 17679
Modified:
stack/native/tags/jbossws-native-3.1.2.SP15/
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests/
stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
stack/native/tags/jbossws-native-3.1.2.SP15/pom.xml
Log:
Sorry, I accidentally committed things to the tag. reverting here
Property changes on: stack/native/tags/jbossws-native-3.1.2.SP15
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2:17030,17321
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007:15579
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007:15579
/stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14157,14160,14181,14183,14842
Property changes on: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2/modules/core:17030,17321
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/core:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/core:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/core:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/core:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -76,8 +76,6 @@
{
// provide logging
private static Logger log = Logger.getLogger(WSSecurityDispatcher.class);
-
- private static boolean VERBOSE_EXCEPTION_REPORTING = Boolean.getBoolean("org.jboss.ws.native.security.verbose_exception_reporting");
public void decodeMessage(WSSecurityConfiguration configuration, SOAPMessage message, Config operationConfig) throws SOAPException
{
@@ -90,7 +88,7 @@
if (secHeaderElement == null)
{
if (hasRequirements(config, fault))
- throw convertToFault(new InvalidSecurityHeaderException("This service requires <wsse:Security>, which is missing."), true);
+ throw convertToFault(new InvalidSecurityHeaderException("This service requires <wsse:Security>, which is missing."));
}
try
@@ -265,18 +263,8 @@
private CommonSOAPFaultException convertToFault(WSSecurityException e)
{
- return convertToFault(e, VERBOSE_EXCEPTION_REPORTING);
+ return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
}
-
- private CommonSOAPFaultException convertToFault(WSSecurityException e, boolean verbose)
- {
- if (verbose) {
- return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
- } else {
- QName faultCode = new QName(Constants.JBOSS_WSSE_NS, "GenericError", Constants.JBOSS_WSSE_PREFIX);
- return new CommonSOAPFaultException(faultCode, "A WS-Security error occurred.");
- }
- }
private List<RequireOperation> buildRequireOperations(Config operationConfig, boolean fault)
{
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -32,10 +32,8 @@
import org.jboss.ws.extensions.security.Constants;
import org.jboss.ws.extensions.security.KeyResolver;
import org.jboss.ws.extensions.security.Util;
-import org.jboss.ws.extensions.security.exception.FailedCheckException;
import org.jboss.ws.extensions.security.exception.InvalidSecurityHeaderException;
import org.jboss.ws.extensions.security.exception.WSSecurityException;
-import org.jboss.ws.extensions.security.operation.EncryptionOperation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -130,16 +128,7 @@
}
catch (XMLSecurityException e)
{
- try
- {
- this.secretKey = EncryptionOperation.generateSecretKey(alg);
- }
- catch (Exception ex)
- {
- WSSecurityException exception = new FailedCheckException(e);
- exception.setInternal(true);
- throw exception;
- }
+ throw new WSSecurityException("Could not parse encrypted key: " + e.getMessage(), e);
}
this.document = element.getOwnerDocument();
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/FailedCheckException.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -32,7 +32,7 @@
{
public static final QName faultCode = new QName(Constants.WSSE_NS, "FailedCheck", Constants.WSSE_PREFIX);
- public static final String faultString = "The signature or decryption was invalid.";
+ public static final String faultString = "The signature or decryption was invlaid.";
public FailedCheckException()
{
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/exception/WSSecurityException.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -72,9 +72,4 @@
{
return faultString;
}
-
- public void setInternal(boolean internal)
- {
- this.internal = internal;
- }
}
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/DecryptionOperation.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -107,7 +107,7 @@
}
catch (XMLEncryptionException e)
{
- throw new FailedCheckException(e);
+ throw new FailedCheckException("Decryption was invalid.");
}
catch (Exception e)
{
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/EncryptionOperation.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -75,7 +75,6 @@
}
private static HashMap<String, Algorithm> algorithms;
- private static HashMap<String, String> algorithmsID;
private static final String DEFAULT_ALGORITHM = "aes-128";
@@ -89,12 +88,6 @@
algorithms.put("aes-192-gcm", new Algorithm("AES", XMLCipher.AES_192_GCM, 192));
algorithms.put("aes-256-gcm", new Algorithm("AES", XMLCipher.AES_256_GCM, 256));
algorithms.put("tripledes", new Algorithm("TripleDes", XMLCipher.TRIPLEDES, 168));
-
- algorithmsID = new HashMap<String, String>(4);
- algorithmsID.put(XMLCipher.AES_128, "aes-128");
- algorithmsID.put(XMLCipher.AES_192, "aes-192");
- algorithmsID.put(XMLCipher.AES_256, "aes-256");
- algorithmsID.put(XMLCipher.TRIPLEDES, "tripledes");
}
public EncryptionOperation(List<Target> targets, String alias, String algorithm, String wrap, String tokenRefType, String securityDomainAliasLabel)
@@ -137,7 +130,7 @@
}
}
- private static SecretKey getSecretKey(String algorithm) throws WSSecurityException
+ public SecretKey getSecretKey(String algorithm) throws WSSecurityException
{
Algorithm alg = algorithms.get(algorithm);
@@ -153,11 +146,6 @@
}
}
- public static SecretKey generateSecretKey(String alg) throws WSSecurityException
- {
- return getSecretKey(algorithmsID.get(alg));
- }
-
public void process(Document message, SecurityHeader header, SecurityStore store) throws WSSecurityException
{
if (! algorithms.containsKey(algorithm))
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -459,18 +459,13 @@
serviceMetaData.setWsdlLocation(wsdlFile.toURL());
}
-
private File computeTempWsdlFile(ServiceMetaData serviceMetaData, File dir, String wsdlName) throws IOException
{
File wsdlFile = null;
try
{
- //JBPAPP-10625 - Use both namespaceURI and deploymentName to create a unique file name for each endpoint.
- String namespaceURI = serviceMetaData.getServiceName().getNamespaceURI();
- String deploymentName = serviceMetaData.getUnifiedMetaData().getDeploymentName();
- byte[] uniqueName = (namespaceURI+deploymentName).getBytes("UTF-8");
-
- String deploymentNameHash = toHexString(MessageDigest.getInstance("MD5").digest(uniqueName));
+ byte[] deploymentName = serviceMetaData.getUnifiedMetaData().getDeploymentName().getBytes("UTF-8");
+ String deploymentNameHash = toHexString(MessageDigest.getInstance("MD5").digest(deploymentName));
wsdlFile = new File(dir + File.separator + wsdlName + "_" + deploymentNameHash + ".wsdl");
}
catch(NoSuchAlgorithmException ex)
Property changes on: stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests:17030,17321
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/testsuite/native-tests:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/testsuite/native-tests:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
+ /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/testsuite/native-tests:15667
/stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908
/stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192
/stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-8007/modules/testsuite/native-tests:15579
/stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2013-06-14 22:17:07 UTC (rev 17679)
@@ -33,6 +33,7 @@
import junit.framework.Test;
import org.jboss.ws.core.StubExt;
+import org.jboss.ws.extensions.security.exception.FailedAuthenticationException;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -49,8 +50,10 @@
private final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1999";
- private static final String FAULT_CODE = "jboss-wsse:GenericError";
+ private static final String FAULT_CODE = "wsse:FailedAuthentication";
+ private static final String FAULT_STRING = FailedAuthenticationException.faultString;
+
public static Test suite() throws Exception
{
return new JBossWSTestSetup(JBWS1999TestCase.class, "jaxws-jbws1999.war");
@@ -108,6 +111,8 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
+ String faultString = fault.getFaultString();
+ assertEquals("Fault String", FAULT_STRING, faultString);
}
}
@@ -144,6 +149,8 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
+ String faultString = fault.getFaultString();
+ assertEquals("Fault Message", FAULT_STRING, faultString);
}
}
@@ -166,6 +173,8 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
+ String faultString = fault.getFaultString();
+ assertEquals("Fault Message", FAULT_STRING, faultString);
}
}
Modified: stack/native/tags/jbossws-native-3.1.2.SP15/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP15/pom.xml 2013-06-14 13:46:58 UTC (rev 17678)
+++ stack/native/tags/jbossws-native-3.1.2.SP15/pom.xml 2013-06-14 22:17:07 UTC (rev 17679)
@@ -74,7 +74,7 @@
<woodstox.version>3.2.9</woodstox.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<xmlsec.version>1.5.1</xmlsec.version>
- <xalan.version>2.7.1-patch-04</xalan.version>
+ <xalan.version>2.7.1-patch-05</xalan.version>
<xerces.version>2.9.1</xerces.version>
</properties>
12 years, 4 months
- 1
- 0
JBossWS SVN: r17678 - in stack/cxf/trunk/modules: client/src/main/java/org/jboss/wsf/stack/cxf/extensions and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-14 09:46:58 -0400 (Fri, 14 Jun 2013)
New Revision: 17678
Added:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/EndpointPolicyAttachments.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicyAttachment.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicyAttachmentStore.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicySetsAnnotationListener.java
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore
stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore
Removed:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
Modified:
stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java
Log:
[JBWS-3648] Package refactoring + moving @PolicySets to jbossws-api
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/EndpointPolicyAttachments.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/EndpointPolicyAttachments.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/EndpointPolicyAttachments.java 2013-06-14 13:46:58 UTC (rev 17678)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.wsf.stack.cxf.extensions.policy;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cxf.annotations.Policy.Placement;
+
+
+/**
+ * A class for collecting policy attachments for a given endpoint
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Jun-2013
+ *
+ */
+public class EndpointPolicyAttachments
+{
+ private Map<Placement, List<PolicyAttachment>> attachmentMap;
+
+ private EndpointPolicyAttachments(Map<Placement, List<PolicyAttachment>> attachmentMap) {
+ this.attachmentMap = attachmentMap;
+ }
+
+ public static EndpointPolicyAttachments newInstance(String[] sets, PolicyAttachmentStore store) {
+ Map<Placement, List<PolicyAttachment>> map = new HashMap<Placement, List<PolicyAttachment>>();
+ for (String set : sets) {
+ List<PolicyAttachment> attachments = store.get(set);
+ for (PolicyAttachment attachment: attachments) {
+ Placement p = attachment.getPlacement();
+ if (map.containsKey(p)) {
+ map.get(p).add(attachment);
+ } else {
+ List<PolicyAttachment> list = new ArrayList<PolicyAttachment>(4);
+ list.add(attachment);
+ map.put(attachment.getPlacement(), list);
+ }
+ }
+ }
+ return new EndpointPolicyAttachments(map);
+ }
+
+ public List<PolicyAttachment> getPolicyAttachments(Placement placement)
+ {
+ List<PolicyAttachment> pal = attachmentMap.get(placement);
+ if (pal == null) {
+ return Collections.emptyList();
+ } else {
+ return pal;
+ }
+ }
+}
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicyAttachment.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicyAttachment.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicyAttachment.java 2013-06-14 13:46:58 UTC (rev 17678)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.wsf.stack.cxf.extensions.policy;
+
+import java.io.InputStream;
+import java.net.URL;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.cxf.annotations.Policy.Placement;
+import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.ws.policy.PolicyConstants;
+import org.jboss.wsf.stack.cxf.Messages;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * A lazy-loaded Policy attachment reference
+ * with the placement point it is meant for.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Jun-2013
+ *
+ */
+public class PolicyAttachment
+{
+ private Placement placement;
+ private String uri;
+
+ public PolicyAttachment(Placement placement, String uri)
+ {
+ this.placement = placement;
+ this.uri = uri;
+ }
+
+ public Placement getPlacement()
+ {
+ return placement;
+ }
+
+ public Element read(String defName)
+ {
+ XMLStreamReader reader = null;
+ InputStream is = null;
+ try
+ {
+ is = new URL(uri).openStream();
+ reader = StaxUtils.createXMLStreamReader(is);
+ Document doc = StaxUtils.read(reader);
+ Element elem = doc.getDocumentElement();
+ String id = elem.getAttributeNS(PolicyConstants.WSU_NAMESPACE_URI, PolicyConstants.WSU_ID_ATTR_NAME);
+ if (StringUtils.isEmpty(id))
+ {
+ Attr att = doc.createAttributeNS(PolicyConstants.WSU_NAMESPACE_URI, "wsu:" + PolicyConstants.WSU_ID_ATTR_NAME);
+ att.setNodeValue(defName);
+ elem.setAttributeNodeNS(att);
+ }
+ return elem;
+ }
+ catch (Exception e)
+ {
+ throw Messages.MESSAGES.errorParsingPolicyAttachment(uri, e);
+ }
+ finally
+ {
+ StaxUtils.close(reader);
+ if (is != null) {
+ try {
+ is.close();
+ } catch (Exception e) {
+ //ignore
+ }
+ }
+ }
+ }
+}
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicyAttachmentStore.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicyAttachmentStore.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicyAttachmentStore.java 2013-06-14 13:46:58 UTC (rev 17678)
@@ -0,0 +1,163 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.wsf.stack.cxf.extensions.policy;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cxf.annotations.Policy.Placement;
+import org.jboss.wsf.stack.cxf.client.ProviderImpl;
+
+
+/**
+ * The store containing pre-defined policy attachments
+ * grouped by set name; lazy loaded on first use.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Jun-2013
+ *
+ */
+public class PolicyAttachmentStore
+{
+ private static final String POLICY_ATTACHMENT_LOCATION = "META-INF/policies/";
+ private final Map<String, List<PolicyAttachment>> attachments;
+ private static PolicyAttachmentStore defaultServerInstance;
+
+ /**
+ * Creates a PolicyAttachmentStore parsing policy sets located
+ * using the provided classloader.
+ *
+ * @param cl
+ */
+ public PolicyAttachmentStore(ClassLoader cl) {
+ Map<String, List<PolicyAttachment>> map = new HashMap<String, List<PolicyAttachment>>();
+ parsePolicyAttachmentResources(cl, map);
+ attachments = map;
+ }
+
+ /**
+ * Get a singleton PolicyAttachmentStore getting policy sets using
+ * the classloader of JBossWS-CXF JAXWS Provider SPI impl.
+ *
+ * @return
+ */
+ public static synchronized PolicyAttachmentStore getDefaultInstance() {
+ if (defaultServerInstance == null) {
+ defaultServerInstance = new PolicyAttachmentStore(ProviderImpl.class.getClassLoader());
+ }
+ return defaultServerInstance;
+ }
+
+ public void merge(PolicyAttachmentStore pas) {
+ this.attachments.putAll(pas.attachments);
+ }
+
+ public List<PolicyAttachment> get(String setName)
+ {
+ List<PolicyAttachment> l = attachments.get(setName);
+ if (l != null && !l.isEmpty()) {
+ return Collections.unmodifiableList(l);
+ } else {
+ return Collections.emptyList();
+ }
+ }
+
+ public boolean isEmpty() {
+ return attachments.isEmpty();
+ }
+
+ private static void parsePolicyAttachmentResources(ClassLoader cl, Map<String, List<PolicyAttachment>> map) {
+ try {
+ Enumeration<URL> urls = getResources(cl, POLICY_ATTACHMENT_LOCATION + PolicyAttachmentStore.class.getName());
+ if (urls != null) {
+ while (urls.hasMoreElements()) {
+ parsePolicyAttachmentStore(urls.nextElement(), map);
+ }
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static void parsePolicyAttachmentStore(URL url, Map<String, List<PolicyAttachment>> map) throws IOException {
+ InputStream storeStream = url.openStream();
+ if (storeStream != null) {
+ String baseUrl = url.toString();
+ baseUrl = baseUrl.substring(0, baseUrl.length() - PolicyAttachmentStore.class.getName().length());
+ BufferedReader br = new BufferedReader(new InputStreamReader(storeStream, "UTF-8"));
+ try {
+ String set;
+ while ((set = br.readLine()) != null) {
+ for (Placement p : Placement.values()) {
+ final String newUrl = baseUrl + set + "-" + p + ".xml";
+ final URL policyAttachmentUrl = new URL(newUrl);
+ InputStream is = null;
+ try {
+ is = policyAttachmentUrl.openStream();
+ if (is != null) {
+ if (map.containsKey(set)) {
+ map.get(set).add(new PolicyAttachment(p, newUrl));
+ } else {
+ List<PolicyAttachment> list = new ArrayList<PolicyAttachment>(4);
+ list.add(new PolicyAttachment(p, newUrl));
+ map.put(set, list);
+ }
+ }
+ } catch (FileNotFoundException fnfe) {
+ //ignore
+ } finally {
+ if (is != null)
+ is.close();
+ }
+ }
+ }
+ } finally {
+ br.close();
+ }
+ }
+ }
+
+ private static Enumeration<URL> getResources(final ClassLoader cl, final String filename) throws Exception {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null) {
+ return cl.getResources(filename);
+ } else {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Enumeration<URL>>() {
+ public Enumeration<URL> run() throws Exception {
+ return cl.getResources(filename);
+ }
+ });
+ }
+ }
+}
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicySetsAnnotationListener.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicySetsAnnotationListener.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/policy/PolicySetsAnnotationListener.java 2013-06-14 13:46:58 UTC (rev 17678)
@@ -0,0 +1,270 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.wsf.stack.cxf.extensions.policy;
+
+import static org.jboss.wsf.stack.cxf.Loggers.ROOT_LOGGER;
+
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.wsdl.extensions.UnknownExtensibilityElement;
+
+import org.apache.cxf.annotations.Policy.Placement;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.service.factory.AbstractServiceFactoryBean;
+import org.apache.cxf.service.factory.FactoryBeanListener;
+import org.apache.cxf.service.model.AbstractPropertiesHolder;
+import org.apache.cxf.service.model.BindingFaultInfo;
+import org.apache.cxf.service.model.BindingInfo;
+import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.cxf.service.model.DescriptionInfo;
+import org.apache.cxf.service.model.FaultInfo;
+import org.apache.cxf.service.model.InterfaceInfo;
+import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.ws.policy.PolicyConstants;
+import org.apache.neethi.Constants;
+import org.jboss.ws.api.annotation.PolicySets;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * A FactoryBeanListener that adds policies according to a given map of EndpointPolicyAttachment
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Jun-2013
+ */
+public class PolicySetsAnnotationListener implements FactoryBeanListener
+{
+ private final Map<Class<?>, EndpointPolicyAttachments> epaMap = new HashMap<Class<?>, EndpointPolicyAttachments>();
+ private PolicyAttachmentStore store;
+
+ public PolicySetsAnnotationListener() {
+ this.store = PolicyAttachmentStore.getDefaultInstance();
+ }
+
+ public PolicySetsAnnotationListener(ClassLoader cl) {
+ this.store = PolicyAttachmentStore.getDefaultInstance();
+ if (cl != null) {
+ PolicyAttachmentStore pas = new PolicyAttachmentStore(cl);
+ if (!pas.isEmpty()) {
+ pas.merge(this.store);
+ this.store = pas;
+ }
+ }
+ }
+
+ public PolicySetsAnnotationListener(PolicyAttachmentStore store) {
+ this.store = store;
+ }
+
+ protected EndpointPolicyAttachments getEndpointPolicyAttachment(Class<?> clazz) {
+ if (epaMap.containsKey(clazz)) {
+ return epaMap.get(clazz);
+ } else {
+ final PolicySets ps = clazz.getAnnotation(PolicySets.class);
+ final EndpointPolicyAttachments epa = (ps != null) ? EndpointPolicyAttachments.newInstance(ps.value(), store) : null;
+ epaMap.put(clazz, epa);
+ return epa;
+ }
+ }
+
+ public void handleEvent(Event ev, AbstractServiceFactoryBean factory, Object... args)
+ {
+ switch (ev)
+ {
+ case ENDPOINT_SELECTED : {
+ Class<?> cls = (Class<?>) args[2];
+ Class<?> implCls = (Class<?>) args[3];
+ Endpoint ep = (Endpoint) args[1];
+ addPolicies(factory, ep, cls, implCls);
+ break;
+ }
+ case BINDING_OPERATION_CREATED :
+ BindingOperationInfo boi = (BindingOperationInfo) args[1];
+ Method m = (Method) args[2];
+ addPolicies(factory, boi.getOperationInfo(), m);
+ break;
+ default :
+ //ignore
+ }
+ }
+
+ private void addPolicies(AbstractServiceFactoryBean factory, OperationInfo inf, Method m)
+ {
+ if (m == null)
+ {
+ return;
+ }
+
+ final Class<?> cls = m.getDeclaringClass();
+ EndpointPolicyAttachments epa = getEndpointPolicyAttachment(cls);
+ if (epa != null)
+ {
+ final ServiceInfo service = inf.getInterface().getService();
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE_OPERATION)) {
+ addPolicy(inf, service, pa, cls, inf.getName().getLocalPart() + "PortTypeOpPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE_OPERATION_INPUT)) {
+ addPolicy(inf.getInput(), service, pa, cls, inf.getName().getLocalPart() + "PortTypeOpInputPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE_OPERATION_OUTPUT)) {
+ addPolicy(inf.getOutput(), service, pa, cls, inf.getName().getLocalPart() + "PortTypeOpOutputPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE_OPERATION_FAULT)) {
+ for (FaultInfo f : inf.getFaults())
+ {
+ addPolicy(f, service, pa, cls, f.getName().getLocalPart() + "PortTypeOpFaultPolicy");
+ }
+ }
+ }
+ }
+
+ private void addPolicies(AbstractServiceFactoryBean factory, Endpoint ep, Class<?> seiCls, Class<?> implCls)
+ {
+ EndpointPolicyAttachments epa = null;
+ Class<?> cls = seiCls;
+ if (ep.getEndpointInfo().getInterface() != null) {
+ epa = getEndpointPolicyAttachment(seiCls);
+ }
+ if (epa == null) {
+ cls = implCls;
+ epa = getEndpointPolicyAttachment(implCls);
+ }
+ if (epa != null) {
+ final BindingInfo binf = ep.getBinding().getBindingInfo();
+ final ServiceInfo si = ep.getService().getServiceInfos().get(0);
+ final InterfaceInfo inf = ep.getEndpointInfo().getInterface();
+
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING)) {
+ addPolicy(binf, si, pa, cls, binf.getName().getLocalPart() + "BindingPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE)) {
+ addPolicy(inf, si, pa, cls, inf.getName().getLocalPart() + "PortTypePolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.SERVICE)) {
+ addPolicy(si, si, pa, cls, si.getName().getLocalPart() + "ServicePolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.SERVICE_PORT)) {
+ addPolicy(ep.getEndpointInfo(), si, pa, cls, ep.getEndpointInfo().getName().getLocalPart()
+ + "PortPolicy");
+ }
+
+ for (BindingOperationInfo binfo : binf.getOperations())
+ {
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING_OPERATION)) {
+ addPolicy(binfo, si, pa, cls, binfo.getName().getLocalPart() + "BindingOpPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING_OPERATION_INPUT)) {
+ addPolicy(binfo.getInput(), si, pa, cls, binfo.getName().getLocalPart()
+ + "BindingOpInputPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING_OPERATION_OUTPUT)) {
+ addPolicy(binfo.getOutput(), si, pa, cls, binfo.getName().getLocalPart()
+ + "BindingOpOutputPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING_OPERATION_FAULT)) {
+ for (BindingFaultInfo f : binfo.getFaults())
+ {
+ addPolicy(f, si, pa, cls, f.getFaultInfo().getName().getLocalPart()
+ + "BindingOpFaultPolicy");
+ }
+ }
+ }
+ }
+ }
+
+ private void addPolicy(AbstractPropertiesHolder place, ServiceInfo service, PolicyAttachment pa, Class<?> cls, String defName)
+ {
+ Element el = addPolicy(service, pa, cls, defName);
+ UnknownExtensibilityElement uee = new UnknownExtensibilityElement();
+ uee.setElement(el);
+ uee.setRequired(true);
+ uee.setElementType(DOMUtils.getElementQName(el));
+ place.addExtensor(uee);
+ }
+
+ private Element addPolicy(ServiceInfo service, PolicyAttachment pa, Class<?> cls, String defName)
+ {
+ Element element = pa.read(defName);
+ String refId = getPolicyId(element);
+ ROOT_LOGGER.addingPolicyAttachment(pa.getPlacement(), refId, cls);
+
+ if (service.getDescription() == null && cls != null)
+ {
+ service.setDescription(new DescriptionInfo());
+ URL u = cls.getResource("/");
+ if (u != null)
+ {
+ service.getDescription().setBaseURI(u.toString());
+ }
+ }
+
+ // if not already added to service add it, otherwise ignore
+ // and just create the policy reference.
+ if (!isExistsPolicy(service, refId))
+ {
+ UnknownExtensibilityElement uee = new UnknownExtensibilityElement();
+ uee.setElement(element);
+ uee.setRequired(true);
+ uee.setElementType(DOMUtils.getElementQName(element));
+ service.getDescription().addExtensor(uee);
+ }
+
+ refId = "#" + refId;
+
+ Document doc = DOMUtils.createDocument();
+ Element el = doc.createElementNS(element.getNamespaceURI(), "wsp:" + Constants.ELEM_POLICY_REF);
+ Attr att = doc.createAttributeNS(null, "URI");
+ att.setValue(refId);
+ el.setAttributeNodeNS(att);
+ return el;
+ }
+
+ private String getPolicyId(Element element)
+ {
+ return element.getAttributeNS(PolicyConstants.WSU_NAMESPACE_URI, PolicyConstants.WSU_ID_ATTR_NAME);
+ }
+
+ private boolean isExistsPolicy(ServiceInfo service, String uri)
+ {
+ Object exts[] = service.getDescription().getExtensors().get();
+ exts = exts == null ? new Object[0] : exts;
+ for (Object o : exts)
+ {
+ if (o instanceof UnknownExtensibilityElement)
+ {
+ UnknownExtensibilityElement uee = (UnknownExtensibilityElement) o;
+ String uri2 = getPolicyId(uee.getElement());
+ if (uri.equals(uri2))
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+}
Added: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore 2013-06-14 13:46:58 UTC (rev 17678)
@@ -0,0 +1,8 @@
+AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens
+AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens
+WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt
+WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt
+WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt
+WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt
+WS-RM_Policy_spec_example
+WS-Addressing
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 13:44:20 UTC (rev 17677)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 13:46:58 UTC (rev 17678)
@@ -1,8 +0,0 @@
-AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens
-AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens
-WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt
-WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt
-WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt
-WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt
-WS-RM_Policy_spec_example
-WS-Addressing
\ No newline at end of file
Modified: stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java
===================================================================
--- stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java 2013-06-14 13:44:20 UTC (rev 17677)
+++ stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java 2013-06-14 13:46:58 UTC (rev 17678)
@@ -26,6 +26,9 @@
import junit.framework.TestCase;
import org.apache.cxf.annotations.Policy.Placement;
+import org.jboss.wsf.stack.cxf.extensions.policy.EndpointPolicyAttachments;
+import org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachment;
+import org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore;
import org.junit.Test;
import org.w3c.dom.Element;
Added: stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore
===================================================================
--- stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore (rev 0)
+++ stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore 2013-06-14 13:46:58 UTC (rev 17678)
@@ -0,0 +1 @@
+WS-SP-EX224
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
===================================================================
--- stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 13:44:20 UTC (rev 17677)
+++ stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 13:46:58 UTC (rev 17678)
@@ -1 +0,0 @@
-WS-SP-EX224
\ No newline at end of file
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-06-14 13:44:20 UTC (rev 17677)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-06-14 13:46:58 UTC (rev 17678)
@@ -53,11 +53,11 @@
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
import org.jboss.wsf.stack.cxf.client.Constants;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
+import org.jboss.wsf.stack.cxf.extensions.policy.PolicySetsAnnotationListener;
import org.jboss.wsf.stack.cxf.interceptor.EnableDecoupledFaultInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.NsCtxSelectorStoreInterceptor;
import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl;
-import org.jboss.wsf.stack.cxf.policy.PolicySetsAnnotationListener;
/**
* A wrapper of the Bus for performing most of the configurations required on it by JBossWS
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java 2013-06-14 13:44:20 UTC (rev 17677)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java 2013-06-14 13:46:58 UTC (rev 17678)
@@ -24,7 +24,7 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import org.jboss.wsf.stack.cxf.policy.PolicySets;
+import org.jboss.ws.api.annotation.PolicySets;
@WebService(name = "EndpointFour", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648")
@SOAPBinding(style = SOAPBinding.Style.RPC)
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java 2013-06-14 13:44:20 UTC (rev 17677)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java 2013-06-14 13:46:58 UTC (rev 17678)
@@ -26,7 +26,7 @@
import javax.jws.soap.SOAPBinding;
import org.jboss.logging.Logger;
-import org.jboss.wsf.stack.cxf.policy.PolicySets;
+import org.jboss.ws.api.annotation.PolicySets;
@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648", serviceName = "ServiceOne")
@SOAPBinding(style = SOAPBinding.Style.RPC)
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java 2013-06-14 13:44:20 UTC (rev 17677)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java 2013-06-14 13:46:58 UTC (rev 17678)
@@ -24,8 +24,9 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import org.jboss.wsf.stack.cxf.policy.PolicySets;
+import org.jboss.ws.api.annotation.PolicySets;
+
@WebService(name = "EndpointThree", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648")
@SOAPBinding(style = SOAPBinding.Style.RPC)
@PolicySets({"AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens", "WS-Addressing"})
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java 2013-06-14 13:44:20 UTC (rev 17677)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java 2013-06-14 13:46:58 UTC (rev 17678)
@@ -24,7 +24,7 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import org.jboss.wsf.stack.cxf.policy.PolicySets;
+import org.jboss.ws.api.annotation.PolicySets;
@WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648")
@SOAPBinding(style = SOAPBinding.Style.RPC)
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java 2013-06-14 13:44:20 UTC (rev 17677)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java 2013-06-14 13:46:58 UTC (rev 17678)
@@ -25,7 +25,7 @@
import org.apache.cxf.annotations.EndpointProperties;
import org.apache.cxf.annotations.EndpointProperty;
-import org.jboss.wsf.stack.cxf.policy.PolicySets;
+import org.jboss.ws.api.annotation.PolicySets;
@WebService(
portName = "AnnotatedSecurityServicePort",
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore 2013-06-14 13:46:58 UTC (rev 17678)
@@ -0,0 +1 @@
+My-WSSE-conf
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 13:44:20 UTC (rev 17677)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 13:46:58 UTC (rev 17678)
@@ -1 +0,0 @@
-My-WSSE-conf
\ No newline at end of file
12 years, 4 months
- 1
- 0
JBossWS SVN: r17677 - api/trunk/src/main/java/org/jboss/ws/api/annotation.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-14 09:44:20 -0400 (Fri, 14 Jun 2013)
New Revision: 17677
Added:
api/trunk/src/main/java/org/jboss/ws/api/annotation/PolicySets.java
Log:
[JBWS-3648] Moving @PolicySets to jbossws-api
Added: api/trunk/src/main/java/org/jboss/ws/api/annotation/PolicySets.java
===================================================================
--- api/trunk/src/main/java/org/jboss/ws/api/annotation/PolicySets.java (rev 0)
+++ api/trunk/src/main/java/org/jboss/ws/api/annotation/PolicySets.java 2013-06-14 13:44:20 UTC (rev 17677)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.api.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * Defines sets of WS policies to be applied to an endpoint interface
+ * (and his WSDL contract).
+ *
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
+ */
+(a)Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE })
+public @interface PolicySets {
+
+ /**
+ * The names of the policy sets to be applied
+ *
+ */
+ String[] value();
+}
12 years, 4 months
- 1
- 0
JBossWS SVN: r17676 - in stack/cxf/trunk/modules: resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-14 09:18:32 -0400 (Fri, 14 Jun 2013)
New Revision: 17676
Added:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/PasswordCallbackHandler.java
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServerUsernamePasswordCallback.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServerUsernamePasswordCallback.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/KeystorePasswordCallback.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServerCallbackHandler.java
Log:
[JBWS-3651] Adding default PasswordCallbackHandler and fixing some tests to use it and avoid explicit dependency on org.apache.ws.security module.
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/PasswordCallbackHandler.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/PasswordCallbackHandler.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/security/PasswordCallbackHandler.java 2013-06-14 13:18:32 UTC (rev 17676)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.wsf.stack.cxf.extensions.security;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import org.apache.ws.security.WSPasswordCallback;
+
+public class PasswordCallbackHandler implements CallbackHandler
+{
+
+ private Map<String, String> passwords = new HashMap<String, String>();
+
+ public PasswordCallbackHandler(Map<String, String> initMap)
+ {
+ passwords.putAll(initMap);
+ }
+
+ /**
+ * It attempts to get the password from the private
+ * alias/passwords map.
+ */
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+ {
+ for (int i = 0; i < callbacks.length; i++)
+ {
+ final Callback c = callbacks[i];
+ if (c != null && c instanceof WSPasswordCallback) {
+ final WSPasswordCallback pc = (WSPasswordCallback)c;
+
+ String pass = passwords.get(pc.getIdentifier());
+ if (pass != null)
+ {
+ pc.setPassword(pass);
+ return;
+ }
+ }
+ }
+ }
+
+ /**
+ * Add an alias/password pair to the callback mechanism.
+ */
+ public void setAliasPassword(String alias, String password)
+ {
+ passwords.put(alias, password);
+ }
+}
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2013-06-14 10:18:14 UTC (rev 17675)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2013-06-14 13:18:32 UTC (rev 17676)
@@ -59,6 +59,7 @@
</module>
<module name="org.apache.log4j" />
<module name="org.apache.neethi" />
+ <module name="org.apache.ws.security" />
<module name="org.jboss.logging" />
<module name="org.springframework.spring" optional="true" />
<module name="javax.wsdl4j.api" />
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml 2013-06-14 10:18:14 UTC (rev 17675)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml 2013-06-14 13:18:32 UTC (rev 17676)
@@ -63,6 +63,7 @@
</module>
<module name="org.apache.log4j" />
<module name="org.apache.neethi" />
+ <module name="org.apache.ws.security" />
<module name="org.jboss.logging" />
<module name="org.springframework.spring" optional="true" />
<module name="javax.wsdl4j.api" />
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml 2013-06-14 10:18:14 UTC (rev 17675)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml 2013-06-14 13:18:32 UTC (rev 17676)
@@ -63,6 +63,7 @@
</module>
<module name="org.apache.log4j" />
<module name="org.apache.neethi" />
+ <module name="org.apache.ws.security" />
<module name="org.jboss.logging" />
<module name="org.springframework.spring" optional="true" />
<module name="javax.wsdl4j.api" />
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2013-06-14 10:18:14 UTC (rev 17675)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2013-06-14 13:18:32 UTC (rev 17676)
@@ -162,7 +162,7 @@
<include name="bob.properties" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</war>
@@ -184,7 +184,7 @@
<include name="bob.properties" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</war>
@@ -206,7 +206,7 @@
<include name="bob.properties" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</war>
@@ -235,7 +235,7 @@
<include name="bob.properties" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</war>
@@ -265,7 +265,7 @@
<include name="bob.properties" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</war>
@@ -292,7 +292,7 @@
<include name="bob.jks" />
</metainf>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</jar>
@@ -314,7 +314,7 @@
<include name="bob.properties" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</war>
@@ -336,7 +336,7 @@
<include name="bob.properties" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</war>
@@ -353,7 +353,7 @@
<include name="bob.properties" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client, org.apache.ws.security"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</war>
@@ -374,7 +374,7 @@
<include name="bob2.properties" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</war>
@@ -400,7 +400,7 @@
<include name="META-INF/jaxws-client-config.xml" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services, org.apache.ws.security"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services"/>
</manifest>
</war>
@@ -431,7 +431,7 @@
<include name="serviceKeystore.properties" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</war>
@@ -452,7 +452,7 @@
<include name="stsKeystore.properties" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf.impl annotations"/> <!-- cxf impl required to extend STS impl -->
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl annotations"/> <!-- cxf impl required to extend STS impl -->
</manifest>
</war>
@@ -481,7 +481,7 @@
<include name="stsKeystore.properties" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf,org.picketlink"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.picketlink"/>
</manifest>
</war>
@@ -503,7 +503,7 @@
<include name="JavaFirstPolicy.xml" />
</zipfileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.cxf,org.apache.ws.security"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</war>
@@ -521,7 +521,7 @@
<include name="wsdl/*"/>
</webinf>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</war>
@@ -540,7 +540,7 @@
<include name="wsdl/*"/>
</webinf>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment -->
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment -->
</manifest>
</war>
@@ -559,7 +559,7 @@
<include name="wsdl/*"/>
</webinf>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment -->
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment -->
</manifest>
</war>
@@ -575,7 +575,7 @@
<include name="jaxws-endpoint-config.xml"/>
</metainf>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
</jar>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.java 2013-06-14 10:18:14 UTC (rev 17675)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.java 2013-06-14 13:18:32 UTC (rev 17676)
@@ -21,51 +21,23 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.basic;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
+import org.jboss.wsf.stack.cxf.extensions.security.PasswordCallbackHandler;
-public class KeystorePasswordCallback implements CallbackHandler
+public class KeystorePasswordCallback extends PasswordCallbackHandler
{
-
- private Map<String, String> passwords = new HashMap<String, String>();
-
public KeystorePasswordCallback()
{
+ super(getInitMap());
+ }
+
+ private static Map<String, String> getInitMap() {
+ Map<String, String> passwords = new HashMap<String, String>();
passwords.put("alice", "password");
passwords.put("bob", "password");
passwords.put("john", "password");
+ return passwords;
}
-
- /**
- * It attempts to get the password from the private
- * alias/passwords map.
- */
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
- {
- for (int i = 0; i < callbacks.length; i++)
- {
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
-
- String pass = passwords.get(pc.getIdentifier());
- if (pass != null)
- {
- pc.setPassword(pass);
- return;
- }
- }
- }
-
- /**
- * Add an alias/password pair to the callback mechanism.
- */
- public void setAliasPassword(String alias, String password)
- {
- passwords.put(alias, password);
- }
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServerUsernamePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServerUsernamePasswordCallback.java 2013-06-14 10:18:14 UTC (rev 17675)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServerUsernamePasswordCallback.java 2013-06-14 13:18:32 UTC (rev 17676)
@@ -21,20 +21,21 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.basic;
-import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
+import org.jboss.wsf.stack.cxf.extensions.security.PasswordCallbackHandler;
-public class ServerUsernamePasswordCallback implements CallbackHandler
+public class ServerUsernamePasswordCallback extends PasswordCallbackHandler
{
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+ public ServerUsernamePasswordCallback()
{
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
- //this CallbackHandler is meant for use with WSS4J 1.6, see http://ws.apache.org/wss4j/wss4j16.html
- if ("kermit".equals(pc.getIdentifier()))
- pc.setPassword("thefrog");
+ super(getInitMap());
}
+
+ private static Map<String, String> getInitMap() {
+ Map<String, String> passwords = new HashMap<String, String>();
+ passwords.put("kermit", "thefrog");
+ return passwords;
+ }
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.java 2013-06-14 10:18:14 UTC (rev 17675)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.java 2013-06-14 13:18:32 UTC (rev 17676)
@@ -21,50 +21,22 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.oasis;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
+import org.jboss.wsf.stack.cxf.extensions.security.PasswordCallbackHandler;
-public class KeystorePasswordCallback implements CallbackHandler
+public class KeystorePasswordCallback extends PasswordCallbackHandler
{
-
- private Map<String, String> passwords = new HashMap<String, String>();
-
public KeystorePasswordCallback()
{
+ super(getInitMap());
+ }
+
+ private static Map<String, String> getInitMap() {
+ Map<String, String> passwords = new HashMap<String, String>();
passwords.put("alice", "password");
passwords.put("bob", "password");
+ return passwords;
}
-
- /**
- * It attempts to get the password from the private
- * alias/passwords map.
- */
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
- {
- for (int i = 0; i < callbacks.length; i++)
- {
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
-
- String pass = passwords.get(pc.getIdentifier());
- if (pass != null)
- {
- pc.setPassword(pass);
- return;
- }
- }
- }
-
- /**
- * Add an alias/password pair to the callback mechanism.
- */
- public void setAliasPassword(String alias, String password)
- {
- passwords.put(alias, password);
- }
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServerUsernamePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServerUsernamePasswordCallback.java 2013-06-14 10:18:14 UTC (rev 17675)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServerUsernamePasswordCallback.java 2013-06-14 13:18:32 UTC (rev 17676)
@@ -21,22 +21,22 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.oasis;
-import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
+import org.jboss.wsf.stack.cxf.extensions.security.PasswordCallbackHandler;
-public class ServerUsernamePasswordCallback implements CallbackHandler
+public class ServerUsernamePasswordCallback extends PasswordCallbackHandler
{
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
- {
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
- final String id = pc.getIdentifier();
- if ("kermit".equals(id))
- pc.setPassword("thefrog");
- else if ("alice".equals(id) || "bob".equals(id))
- pc.setPassword("password");
+ public ServerUsernamePasswordCallback() {
+ super(getInitMap());
}
+
+ private static Map<String, String> getInitMap() {
+ Map<String, String> passwords = new HashMap<String, String>();
+ passwords.put("kermit", "thefrog");
+ passwords.put("alice", "password");
+ passwords.put("bob", "password");
+ return passwords;
+ }
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/KeystorePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/KeystorePasswordCallback.java 2013-06-14 10:18:14 UTC (rev 17675)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/KeystorePasswordCallback.java 2013-06-14 13:18:32 UTC (rev 17676)
@@ -21,51 +21,21 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.secconv;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
-
-public class KeystorePasswordCallback implements CallbackHandler
+public class KeystorePasswordCallback extends org.jboss.wsf.stack.cxf.extensions.security.PasswordCallbackHandler
{
-
- private Map<String, String> passwords = new HashMap<String, String>();
-
public KeystorePasswordCallback()
{
+ super(getInitMap());
+ }
+
+ private static Map<String, String> getInitMap() {
+ Map<String, String> passwords = new HashMap<String, String>();
passwords.put("alice", "password");
passwords.put("bob", "password");
passwords.put("john", "password");
+ return passwords;
}
-
- /**
- * It attempts to get the password from the private
- * alias/passwords map.
- */
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
- {
- for (int i = 0; i < callbacks.length; i++)
- {
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
-
- String pass = passwords.get(pc.getIdentifier());
- if (pass != null)
- {
- pc.setPassword(pass);
- return;
- }
- }
- }
-
- /**
- * Add an alias/password pair to the callback mechanism.
- */
- public void setAliasPassword(String alias, String password)
- {
- passwords.put(alias, password);
- }
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.java 2013-06-14 10:18:14 UTC (rev 17675)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.java 2013-06-14 13:18:32 UTC (rev 17676)
@@ -18,24 +18,22 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
-import java.io.IOException;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
+import java.util.HashMap;
+import java.util.Map;
-public class STSCallbackHandler implements CallbackHandler {
+import org.jboss.wsf.stack.cxf.extensions.security.PasswordCallbackHandler;
- public void handle(Callback[] callbacks) throws IOException,
- UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- if (callbacks[i] instanceof WSPasswordCallback) {
- WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- if ("mystskey".equals(pc.getIdentifier())) {
- pc.setPassword("stskpass");
- break;
- }
- }
- }
- }
+public class STSCallbackHandler extends PasswordCallbackHandler
+{
+ public STSCallbackHandler()
+ {
+ super(getInitMap());
+ }
+
+ private static Map<String, String> getInitMap()
+ {
+ Map<String, String> passwords = new HashMap<String, String>();
+ passwords.put("mystskey", "stskpass");
+ return passwords;
+ }
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServerCallbackHandler.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServerCallbackHandler.java 2013-06-14 10:18:14 UTC (rev 17675)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServerCallbackHandler.java 2013-06-14 13:18:32 UTC (rev 17676)
@@ -18,24 +18,23 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
-import java.io.IOException;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
+import java.util.HashMap;
+import java.util.Map;
-public class ServerCallbackHandler implements CallbackHandler {
+import org.jboss.wsf.stack.cxf.extensions.security.PasswordCallbackHandler;
- public void handle(Callback[] callbacks) throws IOException,
- UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- if (callbacks[i] instanceof WSPasswordCallback) { // CXF
- WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- if ("myservicekey".equals(pc.getIdentifier())) {
- pc.setPassword("skpass");
- break;
- }
- }
- }
- }
+public class ServerCallbackHandler extends PasswordCallbackHandler
+{
+
+ public ServerCallbackHandler()
+ {
+ super(getInitMap());
+ }
+
+ private static Map<String, String> getInitMap()
+ {
+ Map<String, String> passwords = new HashMap<String, String>();
+ passwords.put("myservicekey", "skpass");
+ return passwords;
+ }
}
12 years, 4 months
- 1
- 0
JBossWS SVN: r17675 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-14 06:18:14 -0400 (Fri, 14 Jun 2013)
New Revision: 17675
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java
Log:
Fixing warning due to use of deprecated method
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java 2013-06-14 10:12:04 UTC (rev 17674)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java 2013-06-14 10:18:14 UTC (rev 17675)
@@ -58,7 +58,7 @@
super();
StaticSTSProperties props = new StaticSTSProperties();
- props.setSignaturePropertiesFile("stsKeystore.properties");
+ props.setSignatureCryptoProperties("stsKeystore.properties");
props.setSignatureUsername("mystskey");
props.setCallbackHandlerClass(STSCallbackHandler.class.getName());
props.setIssuer("DoubleItSTSIssuer");
12 years, 4 months
- 1
- 0
JBossWS SVN: r17674 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf: gzip and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-14 06:12:04 -0400 (Fri, 14 Jun 2013)
New Revision: 17674
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
Log:
Misc refactoring of tests to avoid "polluting" buses that might be used by other threads or later by other tests running on the same threads
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java 2013-06-14 09:08:07 UTC (rev 17673)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java 2013-06-14 10:12:04 UTC (rev 17674)
@@ -26,7 +26,6 @@
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import junit.framework.Test;
@@ -50,27 +49,31 @@
public void testInfoset() throws Exception
- {
- ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
- ByteArrayOutputStream in = new java.io.ByteArrayOutputStream();
- LoggingInInterceptor login = new LoggingInInterceptor(new PrintWriter(in));
- LoggingOutInterceptor logout = new LoggingOutInterceptor(new PrintWriter(out));
- Bus bus = BusFactory.getThreadDefaultBus();
- bus.getInInterceptors().add(login);
- bus.getOutInterceptors().add(logout);
-
- URL wsdlURL = new URL(endpointURl + "?wsdl");
- QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/fastinfoset", "HelloWorldService");
- Service service = Service.create(wsdlURL, serviceName);
- QName portQName = new QName("http://org.jboss.ws/jaxws/cxf/fastinfoset", "HelloWorldImplPort");
- HelloWorld port = (HelloWorld) service.getPort(portQName, HelloWorld.class);
- ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:9090/jaxws-cxf-fastinfoset/HelloWorldService/HelloWorldImpl");
- assertEquals("helloworld" , port.echo("helloworld"));
- assertTrue("request is expected fastinfoset", new String(out.toByteArray()).indexOf("application/fastinfoset") > -1);
- assertTrue("response is expected fastinfoset", new String(in.toByteArray()).indexOf("application/fastinfoset") > -1);
- out.close();
- in.close();
-
+ {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ ByteArrayOutputStream in = new ByteArrayOutputStream();
+ PrintWriter pwIn = new PrintWriter(in);
+ PrintWriter pwOut = new PrintWriter(out);
+ Bus bus = BusFactory.newInstance().createBus();
+ BusFactory.setThreadDefaultBus(bus);
+ try {
+ bus.getInInterceptors().add(new LoggingInInterceptor(pwIn));
+ bus.getOutInterceptors().add(new LoggingOutInterceptor(pwOut));
+
+ URL wsdlURL = new URL(endpointURl + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/fastinfoset", "HelloWorldService");
+ Service service = Service.create(wsdlURL, serviceName);
+ QName portQName = new QName("http://org.jboss.ws/jaxws/cxf/fastinfoset", "HelloWorldImplPort");
+ HelloWorld port = (HelloWorld) service.getPort(portQName, HelloWorld.class);
+ assertEquals("helloworld", port.echo("helloworld"));
+ assertTrue("request is expected fastinfoset", out.toString().indexOf("application/fastinfoset") > -1);
+ assertTrue("response is expected fastinfoset", in.toString().indexOf("application/fastinfoset") > -1);
+ } finally {
+ bus.shutdown(true);
+ pwOut.close();
+ pwIn.close();
+ }
+
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java 2013-06-14 09:08:07 UTC (rev 17673)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java 2013-06-14 10:12:04 UTC (rev 17674)
@@ -77,7 +77,7 @@
Client client = ClientProxy.getClient(port);
GZIPFeature gzipFeature = new GZIPFeature();
gzipFeature.setThreshold(0);
- gzipFeature.initialize(client, BusFactory.getThreadDefaultBus());
+ gzipFeature.initialize(client, null); //bus parameter not actually used
return ("foo".equals(port.echo("foo")));
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2013-06-14 09:08:07 UTC (rev 17673)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2013-06-14 10:12:04 UTC (rev 17674)
@@ -56,35 +56,45 @@
public void testClientLifeCycleManager()
{
Bus bus = BusFactory.newInstance().createBus();
- assertNotNull("Cannot find ClientLifeCycleManager impl in current bus", bus.getExtension(ClientLifeCycleManager.class));
- bus.shutdown(true);
+ try {
+ assertNotNull("Cannot find ClientLifeCycleManager impl in current bus", bus.getExtension(ClientLifeCycleManager.class));
+ } finally {
+ bus.shutdown(true);
+ }
}
public void testServerLifeCycleManager()
{
Bus bus = BusFactory.newInstance().createBus();
- assertNotNull("Cannot find ServerLifeCycleManager impl in current bus", bus.getExtension(ServerLifeCycleManager.class));
- bus.shutdown(true);
+ try {
+ assertNotNull("Cannot find ServerLifeCycleManager impl in current bus", bus.getExtension(ServerLifeCycleManager.class));
+ } finally {
+ bus.shutdown(true);
+ }
}
public void testCustomClientLifeCycleListener() throws Exception
{
- URL wsdlOneURL = new URL(endpointOneURL + "?wsdl");
- QName serviceOneName = new QName(targetNS, "ServiceOne");
- Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
- Bus bus = BusFactory.getThreadDefaultBus(false);
- CustomClientLifeCycleListener listener = new CustomClientLifeCycleListener();
- ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class);
+ Bus bus = BusFactory.newInstance().createBus();
+ BusFactory.setThreadDefaultBus(bus);
try {
- mgr.registerListener(listener);
- assertEquals(0, listener.getCount());
- EndpointOne portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
- assertEquals(1, listener.getCount());
- assertEquals("Foo", portOne.echo("Foo"));
+ URL wsdlOneURL = new URL(endpointOneURL + "?wsdl");
+ QName serviceOneName = new QName(targetNS, "ServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ CustomClientLifeCycleListener listener = new CustomClientLifeCycleListener();
+ ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class);
+ try {
+ mgr.registerListener(listener);
+ assertEquals(0, listener.getCount());
+ EndpointOne portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+ assertEquals(1, listener.getCount());
+ assertEquals("Foo", portOne.echo("Foo"));
+ } finally {
+ mgr.unRegisterListener(listener);
+ }
} finally {
- mgr.unRegisterListener(listener);
+ bus.shutdown(true);
}
-
}
private class CustomClientLifeCycleListener implements ClientLifeCycleListener
12 years, 4 months
- 1
- 0
JBossWS SVN: r17673 - in stack/cxf/trunk/modules: client/src/main/java/org/jboss/wsf/stack/cxf/policy and 21 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-14 05:08:07 -0400 (Fri, 14 Jun 2013)
New Revision: 17673
Added:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/EndpointPolicyAttachments.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachment.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachmentStore.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySets.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySetsAnnotationListener.java
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-Addressing-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-RM_Policy_spec_example-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/
stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java
stack/cxf/trunk/modules/client/src/test/resources/
stack/cxf/trunk/modules/client/src/test/resources/META-INF/
stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/
stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING.xml
stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_INPUT.xml
stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_OUTPUT.xml
stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFourImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOne.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThreeImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwoImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceIface.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.jks
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.jks
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/My-WSSE-conf-BINDING.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
Removed:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/EndpointPolicyAttachments.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachment.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachmentStore.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySets.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySetsAnnotationListener.java
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-Addressing-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-RM_Policy_spec_example-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java
stack/cxf/trunk/modules/client/src/test/resources/META-INF/
stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/
stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING.xml
stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_INPUT.xml
stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_OUTPUT.xml
stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFourImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOne.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThreeImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwoImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.jks
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.jks
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/My-WSSE-conf-BINDING.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
Log:
[JBWS-3648] @PolicySets support, misc tests, some predefined set xml
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -200,4 +200,8 @@
@LogMessage(level = DEBUG)
@Message(id = 24091, value = "Could not get WSDL from %s, aborting soap:address rewrite.")
void abortSoapAddressRewrite(String wsdlLocation, @Cause Throwable cause);
+
+ @LogMessage(level = INFO)
+ @Message(id = 24092, value = "Adding %s policy attachment with id='%s' to honor requirement from %s.")
+ void addingPolicyAttachment(Object placement, String refId, Class<?> cls);
}
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -211,4 +211,7 @@
@Message(id = 24090, value = "Could not read from config file: %s")
RuntimeException couldNotReadConfigFile(String file);
+ @Message(id = 24093, value = "Error parsing policy attachment: %s")
+ RuntimeException errorParsingPolicyAttachment(String uri, @Cause Throwable cause);
+
}
Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/EndpointPolicyAttachments.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/EndpointPolicyAttachments.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/EndpointPolicyAttachments.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.wsf.stack.cxf.policy;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.cxf.annotations.Policy.Placement;
-
-
-/**
- * A class for collecting policy attachments for a given endpoint
- *
- * @author alessio.soldano(a)jboss.com
- * @since 03-Jun-2013
- *
- */
-public class EndpointPolicyAttachments
-{
- private Map<Placement, List<PolicyAttachment>> attachmentMap;
-
- private EndpointPolicyAttachments(Map<Placement, List<PolicyAttachment>> attachmentMap) {
- this.attachmentMap = attachmentMap;
- }
-
- public static EndpointPolicyAttachments newInstance(String[] sets, PolicyAttachmentStore store) {
- Map<Placement, List<PolicyAttachment>> map = new HashMap<Placement, List<PolicyAttachment>>();
- for (String set : sets) {
- List<PolicyAttachment> attachments = store.get(set);
- for (PolicyAttachment attachment: attachments) {
- Placement p = attachment.getPlacement();
- if (map.containsKey(p)) {
- map.get(p).add(attachment);
- } else {
- List<PolicyAttachment> list = new ArrayList<PolicyAttachment>(4);
- list.add(attachment);
- map.put(attachment.getPlacement(), list);
- }
- }
- }
- return new EndpointPolicyAttachments(map);
- }
-
- public List<PolicyAttachment> getPolicyAttachments(Placement placement)
- {
- List<PolicyAttachment> pal = attachmentMap.get(placement);
- if (pal == null) {
- return Collections.emptyList();
- } else {
- return pal;
- }
- }
-}
Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/EndpointPolicyAttachments.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/EndpointPolicyAttachments.java)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/EndpointPolicyAttachments.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/EndpointPolicyAttachments.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.wsf.stack.cxf.policy;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cxf.annotations.Policy.Placement;
+
+
+/**
+ * A class for collecting policy attachments for a given endpoint
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Jun-2013
+ *
+ */
+public class EndpointPolicyAttachments
+{
+ private Map<Placement, List<PolicyAttachment>> attachmentMap;
+
+ private EndpointPolicyAttachments(Map<Placement, List<PolicyAttachment>> attachmentMap) {
+ this.attachmentMap = attachmentMap;
+ }
+
+ public static EndpointPolicyAttachments newInstance(String[] sets, PolicyAttachmentStore store) {
+ Map<Placement, List<PolicyAttachment>> map = new HashMap<Placement, List<PolicyAttachment>>();
+ for (String set : sets) {
+ List<PolicyAttachment> attachments = store.get(set);
+ for (PolicyAttachment attachment: attachments) {
+ Placement p = attachment.getPlacement();
+ if (map.containsKey(p)) {
+ map.get(p).add(attachment);
+ } else {
+ List<PolicyAttachment> list = new ArrayList<PolicyAttachment>(4);
+ list.add(attachment);
+ map.put(attachment.getPlacement(), list);
+ }
+ }
+ }
+ return new EndpointPolicyAttachments(map);
+ }
+
+ public List<PolicyAttachment> getPolicyAttachments(Placement placement)
+ {
+ List<PolicyAttachment> pal = attachmentMap.get(placement);
+ if (pal == null) {
+ return Collections.emptyList();
+ } else {
+ return pal;
+ }
+ }
+}
Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachment.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachment.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachment.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,97 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.wsf.stack.cxf.policy;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.cxf.annotations.Policy.Placement;
-import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.staxutils.StaxUtils;
-import org.apache.cxf.ws.policy.PolicyConstants;
-import org.jboss.wsf.stack.cxf.Messages;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * A lazy-loaded Policy attachment reference
- * with the placement point it is meant for.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 03-Jun-2013
- *
- */
-public class PolicyAttachment
-{
- private Placement placement;
- private String uri;
-
- public PolicyAttachment(Placement placement, String uri)
- {
- this.placement = placement;
- this.uri = uri;
- }
-
- public Placement getPlacement()
- {
- return placement;
- }
-
- public Element read(String defName)
- {
- XMLStreamReader reader = null;
- InputStream is = null;
- try
- {
- is = new URL(uri).openStream();
- reader = StaxUtils.createXMLStreamReader(is);
- Document doc = StaxUtils.read(reader);
- Element elem = doc.getDocumentElement();
- String id = elem.getAttributeNS(PolicyConstants.WSU_NAMESPACE_URI, PolicyConstants.WSU_ID_ATTR_NAME);
- if (StringUtils.isEmpty(id))
- {
- Attr att = doc.createAttributeNS(PolicyConstants.WSU_NAMESPACE_URI, "wsu:" + PolicyConstants.WSU_ID_ATTR_NAME);
- att.setNodeValue(defName);
- elem.setAttributeNodeNS(att);
- }
- return elem;
- }
- catch (Exception e)
- {
- throw Messages.MESSAGES.errorParsingPolicyAttachment(uri, e);
- }
- finally
- {
- StaxUtils.close(reader);
- if (is != null) {
- try {
- is.close();
- } catch (Exception e) {
- //ignore
- }
- }
- }
- }
-}
Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachment.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachment.java)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachment.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachment.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.wsf.stack.cxf.policy;
+
+import java.io.InputStream;
+import java.net.URL;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.cxf.annotations.Policy.Placement;
+import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.ws.policy.PolicyConstants;
+import org.jboss.wsf.stack.cxf.Messages;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * A lazy-loaded Policy attachment reference
+ * with the placement point it is meant for.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Jun-2013
+ *
+ */
+public class PolicyAttachment
+{
+ private Placement placement;
+ private String uri;
+
+ public PolicyAttachment(Placement placement, String uri)
+ {
+ this.placement = placement;
+ this.uri = uri;
+ }
+
+ public Placement getPlacement()
+ {
+ return placement;
+ }
+
+ public Element read(String defName)
+ {
+ XMLStreamReader reader = null;
+ InputStream is = null;
+ try
+ {
+ is = new URL(uri).openStream();
+ reader = StaxUtils.createXMLStreamReader(is);
+ Document doc = StaxUtils.read(reader);
+ Element elem = doc.getDocumentElement();
+ String id = elem.getAttributeNS(PolicyConstants.WSU_NAMESPACE_URI, PolicyConstants.WSU_ID_ATTR_NAME);
+ if (StringUtils.isEmpty(id))
+ {
+ Attr att = doc.createAttributeNS(PolicyConstants.WSU_NAMESPACE_URI, "wsu:" + PolicyConstants.WSU_ID_ATTR_NAME);
+ att.setNodeValue(defName);
+ elem.setAttributeNodeNS(att);
+ }
+ return elem;
+ }
+ catch (Exception e)
+ {
+ throw Messages.MESSAGES.errorParsingPolicyAttachment(uri, e);
+ }
+ finally
+ {
+ StaxUtils.close(reader);
+ if (is != null) {
+ try {
+ is.close();
+ } catch (Exception e) {
+ //ignore
+ }
+ }
+ }
+ }
+}
Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachmentStore.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachmentStore.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachmentStore.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,163 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.wsf.stack.cxf.policy;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.cxf.annotations.Policy.Placement;
-import org.jboss.wsf.stack.cxf.client.ProviderImpl;
-
-
-/**
- * The store containing pre-defined policy attachments
- * grouped by set name; lazy loaded on first use.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 03-Jun-2013
- *
- */
-public class PolicyAttachmentStore
-{
- private static final String POLICY_ATTACHMENT_LOCATION = "META-INF/policies/";
- private final Map<String, List<PolicyAttachment>> attachments;
- private static PolicyAttachmentStore defaultServerInstance;
-
- /**
- * Creates a PolicyAttachmentStore parsing policy sets located
- * using the provided classloader.
- *
- * @param cl
- */
- public PolicyAttachmentStore(ClassLoader cl) {
- Map<String, List<PolicyAttachment>> map = new HashMap<String, List<PolicyAttachment>>();
- parsePolicyAttachmentResources(cl, map);
- attachments = map;
- }
-
- /**
- * Get a singleton PolicyAttachmentStore getting policy sets using
- * the classloader of JBossWS-CXF JAXWS Provider SPI impl.
- *
- * @return
- */
- public static synchronized PolicyAttachmentStore getDefaultInstance() {
- if (defaultServerInstance == null) {
- defaultServerInstance = new PolicyAttachmentStore(ProviderImpl.class.getClassLoader());
- }
- return defaultServerInstance;
- }
-
- public void merge(PolicyAttachmentStore pas) {
- this.attachments.putAll(pas.attachments);
- }
-
- public List<PolicyAttachment> get(String setName)
- {
- List<PolicyAttachment> l = attachments.get(setName);
- if (l != null && !l.isEmpty()) {
- return Collections.unmodifiableList(l);
- } else {
- return Collections.emptyList();
- }
- }
-
- public boolean isEmpty() {
- return attachments.isEmpty();
- }
-
- private static void parsePolicyAttachmentResources(ClassLoader cl, Map<String, List<PolicyAttachment>> map) {
- try {
- Enumeration<URL> urls = getResources(cl, POLICY_ATTACHMENT_LOCATION + PolicyAttachmentStore.class.getName());
- if (urls != null) {
- while (urls.hasMoreElements()) {
- parsePolicyAttachmentStore(urls.nextElement(), map);
- }
- }
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- private static void parsePolicyAttachmentStore(URL url, Map<String, List<PolicyAttachment>> map) throws IOException {
- InputStream storeStream = url.openStream();
- if (storeStream != null) {
- String baseUrl = url.toString();
- baseUrl = baseUrl.substring(0, baseUrl.length() - PolicyAttachmentStore.class.getName().length());
- BufferedReader br = new BufferedReader(new InputStreamReader(storeStream, "UTF-8"));
- try {
- String set;
- while ((set = br.readLine()) != null) {
- for (Placement p : Placement.values()) {
- final String newUrl = baseUrl + set + "-" + p + ".xml";
- final URL policyAttachmentUrl = new URL(newUrl);
- InputStream is = null;
- try {
- is = policyAttachmentUrl.openStream();
- if (is != null) {
- if (map.containsKey(set)) {
- map.get(set).add(new PolicyAttachment(p, newUrl));
- } else {
- List<PolicyAttachment> list = new ArrayList<PolicyAttachment>(4);
- list.add(new PolicyAttachment(p, newUrl));
- map.put(set, list);
- }
- }
- } catch (FileNotFoundException fnfe) {
- //ignore
- } finally {
- if (is != null)
- is.close();
- }
- }
- }
- } finally {
- br.close();
- }
- }
- }
-
- private static Enumeration<URL> getResources(final ClassLoader cl, final String filename) throws Exception {
- SecurityManager sm = System.getSecurityManager();
- if (sm == null) {
- return cl.getResources(filename);
- } else {
- return AccessController.doPrivileged(new PrivilegedExceptionAction<Enumeration<URL>>() {
- public Enumeration<URL> run() throws Exception {
- return cl.getResources(filename);
- }
- });
- }
- }
-}
Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachmentStore.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachmentStore.java)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachmentStore.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicyAttachmentStore.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,163 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.wsf.stack.cxf.policy;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cxf.annotations.Policy.Placement;
+import org.jboss.wsf.stack.cxf.client.ProviderImpl;
+
+
+/**
+ * The store containing pre-defined policy attachments
+ * grouped by set name; lazy loaded on first use.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Jun-2013
+ *
+ */
+public class PolicyAttachmentStore
+{
+ private static final String POLICY_ATTACHMENT_LOCATION = "META-INF/policies/";
+ private final Map<String, List<PolicyAttachment>> attachments;
+ private static PolicyAttachmentStore defaultServerInstance;
+
+ /**
+ * Creates a PolicyAttachmentStore parsing policy sets located
+ * using the provided classloader.
+ *
+ * @param cl
+ */
+ public PolicyAttachmentStore(ClassLoader cl) {
+ Map<String, List<PolicyAttachment>> map = new HashMap<String, List<PolicyAttachment>>();
+ parsePolicyAttachmentResources(cl, map);
+ attachments = map;
+ }
+
+ /**
+ * Get a singleton PolicyAttachmentStore getting policy sets using
+ * the classloader of JBossWS-CXF JAXWS Provider SPI impl.
+ *
+ * @return
+ */
+ public static synchronized PolicyAttachmentStore getDefaultInstance() {
+ if (defaultServerInstance == null) {
+ defaultServerInstance = new PolicyAttachmentStore(ProviderImpl.class.getClassLoader());
+ }
+ return defaultServerInstance;
+ }
+
+ public void merge(PolicyAttachmentStore pas) {
+ this.attachments.putAll(pas.attachments);
+ }
+
+ public List<PolicyAttachment> get(String setName)
+ {
+ List<PolicyAttachment> l = attachments.get(setName);
+ if (l != null && !l.isEmpty()) {
+ return Collections.unmodifiableList(l);
+ } else {
+ return Collections.emptyList();
+ }
+ }
+
+ public boolean isEmpty() {
+ return attachments.isEmpty();
+ }
+
+ private static void parsePolicyAttachmentResources(ClassLoader cl, Map<String, List<PolicyAttachment>> map) {
+ try {
+ Enumeration<URL> urls = getResources(cl, POLICY_ATTACHMENT_LOCATION + PolicyAttachmentStore.class.getName());
+ if (urls != null) {
+ while (urls.hasMoreElements()) {
+ parsePolicyAttachmentStore(urls.nextElement(), map);
+ }
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static void parsePolicyAttachmentStore(URL url, Map<String, List<PolicyAttachment>> map) throws IOException {
+ InputStream storeStream = url.openStream();
+ if (storeStream != null) {
+ String baseUrl = url.toString();
+ baseUrl = baseUrl.substring(0, baseUrl.length() - PolicyAttachmentStore.class.getName().length());
+ BufferedReader br = new BufferedReader(new InputStreamReader(storeStream, "UTF-8"));
+ try {
+ String set;
+ while ((set = br.readLine()) != null) {
+ for (Placement p : Placement.values()) {
+ final String newUrl = baseUrl + set + "-" + p + ".xml";
+ final URL policyAttachmentUrl = new URL(newUrl);
+ InputStream is = null;
+ try {
+ is = policyAttachmentUrl.openStream();
+ if (is != null) {
+ if (map.containsKey(set)) {
+ map.get(set).add(new PolicyAttachment(p, newUrl));
+ } else {
+ List<PolicyAttachment> list = new ArrayList<PolicyAttachment>(4);
+ list.add(new PolicyAttachment(p, newUrl));
+ map.put(set, list);
+ }
+ }
+ } catch (FileNotFoundException fnfe) {
+ //ignore
+ } finally {
+ if (is != null)
+ is.close();
+ }
+ }
+ }
+ } finally {
+ br.close();
+ }
+ }
+ }
+
+ private static Enumeration<URL> getResources(final ClassLoader cl, final String filename) throws Exception {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null) {
+ return cl.getResources(filename);
+ } else {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Enumeration<URL>>() {
+ public Enumeration<URL> run() throws Exception {
+ return cl.getResources(filename);
+ }
+ });
+ }
+ }
+}
Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySets.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySets.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySets.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.wsf.stack.cxf.policy;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- *
- * @author alessio.soldano(a)jboss.com
- * @since 04-Jun-2013
- *
- */
-(a)Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE })
-public @interface PolicySets {
- String[] value();
-}
Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySets.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySets.java)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySets.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySets.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.wsf.stack.cxf.policy;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 04-Jun-2013
+ *
+ */
+(a)Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE })
+public @interface PolicySets {
+ String[] value();
+}
Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySetsAnnotationListener.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySetsAnnotationListener.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySetsAnnotationListener.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,269 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.wsf.stack.cxf.policy;
-
-import static org.jboss.wsf.stack.cxf.Loggers.ROOT_LOGGER;
-
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-
-import org.apache.cxf.annotations.Policy.Placement;
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.service.factory.AbstractServiceFactoryBean;
-import org.apache.cxf.service.factory.FactoryBeanListener;
-import org.apache.cxf.service.model.AbstractPropertiesHolder;
-import org.apache.cxf.service.model.BindingFaultInfo;
-import org.apache.cxf.service.model.BindingInfo;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.DescriptionInfo;
-import org.apache.cxf.service.model.FaultInfo;
-import org.apache.cxf.service.model.InterfaceInfo;
-import org.apache.cxf.service.model.OperationInfo;
-import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.ws.policy.PolicyConstants;
-import org.apache.neethi.Constants;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * A FactoryBeanListener that adds policies according to a given map of EndpointPolicyAttachment
- *
- * @author alessio.soldano(a)jboss.com
- * @since 03-Jun-2013
- */
-public class PolicySetsAnnotationListener implements FactoryBeanListener
-{
- private final Map<Class<?>, EndpointPolicyAttachments> epaMap = new HashMap<Class<?>, EndpointPolicyAttachments>();
- private PolicyAttachmentStore store;
-
- public PolicySetsAnnotationListener() {
- this.store = PolicyAttachmentStore.getDefaultInstance();
- }
-
- public PolicySetsAnnotationListener(ClassLoader cl) {
- this.store = PolicyAttachmentStore.getDefaultInstance();
- if (cl != null) {
- PolicyAttachmentStore pas = new PolicyAttachmentStore(cl);
- if (!pas.isEmpty()) {
- pas.merge(this.store);
- this.store = pas;
- }
- }
- }
-
- public PolicySetsAnnotationListener(PolicyAttachmentStore store) {
- this.store = store;
- }
-
- protected EndpointPolicyAttachments getEndpointPolicyAttachment(Class<?> clazz) {
- if (epaMap.containsKey(clazz)) {
- return epaMap.get(clazz);
- } else {
- final PolicySets ps = clazz.getAnnotation(PolicySets.class);
- final EndpointPolicyAttachments epa = (ps != null) ? EndpointPolicyAttachments.newInstance(ps.value(), store) : null;
- epaMap.put(clazz, epa);
- return epa;
- }
- }
-
- public void handleEvent(Event ev, AbstractServiceFactoryBean factory, Object... args)
- {
- switch (ev)
- {
- case ENDPOINT_SELECTED : {
- Class<?> cls = (Class<?>) args[2];
- Class<?> implCls = (Class<?>) args[3];
- Endpoint ep = (Endpoint) args[1];
- addPolicies(factory, ep, cls, implCls);
- break;
- }
- case BINDING_OPERATION_CREATED :
- BindingOperationInfo boi = (BindingOperationInfo) args[1];
- Method m = (Method) args[2];
- addPolicies(factory, boi.getOperationInfo(), m);
- break;
- default :
- //ignore
- }
- }
-
- private void addPolicies(AbstractServiceFactoryBean factory, OperationInfo inf, Method m)
- {
- if (m == null)
- {
- return;
- }
-
- final Class<?> cls = m.getDeclaringClass();
- EndpointPolicyAttachments epa = getEndpointPolicyAttachment(cls);
- if (epa != null)
- {
- final ServiceInfo service = inf.getInterface().getService();
- for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE_OPERATION)) {
- addPolicy(inf, service, pa, cls, inf.getName().getLocalPart() + "PortTypeOpPolicy");
- }
- for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE_OPERATION_INPUT)) {
- addPolicy(inf.getInput(), service, pa, cls, inf.getName().getLocalPart() + "PortTypeOpInputPolicy");
- }
- for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE_OPERATION_OUTPUT)) {
- addPolicy(inf.getOutput(), service, pa, cls, inf.getName().getLocalPart() + "PortTypeOpOutputPolicy");
- }
- for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE_OPERATION_FAULT)) {
- for (FaultInfo f : inf.getFaults())
- {
- addPolicy(f, service, pa, cls, f.getName().getLocalPart() + "PortTypeOpFaultPolicy");
- }
- }
- }
- }
-
- private void addPolicies(AbstractServiceFactoryBean factory, Endpoint ep, Class<?> seiCls, Class<?> implCls)
- {
- EndpointPolicyAttachments epa = null;
- Class<?> cls = seiCls;
- if (ep.getEndpointInfo().getInterface() != null) {
- epa = getEndpointPolicyAttachment(seiCls);
- }
- if (epa == null) {
- cls = implCls;
- epa = getEndpointPolicyAttachment(implCls);
- }
- if (epa != null) {
- final BindingInfo binf = ep.getBinding().getBindingInfo();
- final ServiceInfo si = ep.getService().getServiceInfos().get(0);
- final InterfaceInfo inf = ep.getEndpointInfo().getInterface();
-
- for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING)) {
- addPolicy(binf, si, pa, cls, binf.getName().getLocalPart() + "BindingPolicy");
- }
- for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE)) {
- addPolicy(inf, si, pa, cls, inf.getName().getLocalPart() + "PortTypePolicy");
- }
- for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.SERVICE)) {
- addPolicy(si, si, pa, cls, si.getName().getLocalPart() + "ServicePolicy");
- }
- for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.SERVICE_PORT)) {
- addPolicy(ep.getEndpointInfo(), si, pa, cls, ep.getEndpointInfo().getName().getLocalPart()
- + "PortPolicy");
- }
-
- for (BindingOperationInfo binfo : binf.getOperations())
- {
- for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING_OPERATION)) {
- addPolicy(binfo, si, pa, cls, binfo.getName().getLocalPart() + "BindingOpPolicy");
- }
- for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING_OPERATION_INPUT)) {
- addPolicy(binfo.getInput(), si, pa, cls, binfo.getName().getLocalPart()
- + "BindingOpInputPolicy");
- }
- for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING_OPERATION_OUTPUT)) {
- addPolicy(binfo.getOutput(), si, pa, cls, binfo.getName().getLocalPart()
- + "BindingOpOutputPolicy");
- }
- for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING_OPERATION_FAULT)) {
- for (BindingFaultInfo f : binfo.getFaults())
- {
- addPolicy(f, si, pa, cls, f.getFaultInfo().getName().getLocalPart()
- + "BindingOpFaultPolicy");
- }
- }
- }
- }
- }
-
- private void addPolicy(AbstractPropertiesHolder place, ServiceInfo service, PolicyAttachment pa, Class<?> cls, String defName)
- {
- Element el = addPolicy(service, pa, cls, defName);
- UnknownExtensibilityElement uee = new UnknownExtensibilityElement();
- uee.setElement(el);
- uee.setRequired(true);
- uee.setElementType(DOMUtils.getElementQName(el));
- place.addExtensor(uee);
- }
-
- private Element addPolicy(ServiceInfo service, PolicyAttachment pa, Class<?> cls, String defName)
- {
- Element element = pa.read(defName);
- String refId = getPolicyId(element);
- ROOT_LOGGER.addingPolicyAttachment(pa.getPlacement(), refId, cls);
-
- if (service.getDescription() == null && cls != null)
- {
- service.setDescription(new DescriptionInfo());
- URL u = cls.getResource("/");
- if (u != null)
- {
- service.getDescription().setBaseURI(u.toString());
- }
- }
-
- // if not already added to service add it, otherwise ignore
- // and just create the policy reference.
- if (!isExistsPolicy(service, refId))
- {
- UnknownExtensibilityElement uee = new UnknownExtensibilityElement();
- uee.setElement(element);
- uee.setRequired(true);
- uee.setElementType(DOMUtils.getElementQName(element));
- service.getDescription().addExtensor(uee);
- }
-
- refId = "#" + refId;
-
- Document doc = DOMUtils.createDocument();
- Element el = doc.createElementNS(element.getNamespaceURI(), "wsp:" + Constants.ELEM_POLICY_REF);
- Attr att = doc.createAttributeNS(null, "URI");
- att.setValue(refId);
- el.setAttributeNodeNS(att);
- return el;
- }
-
- private String getPolicyId(Element element)
- {
- return element.getAttributeNS(PolicyConstants.WSU_NAMESPACE_URI, PolicyConstants.WSU_ID_ATTR_NAME);
- }
-
- private boolean isExistsPolicy(ServiceInfo service, String uri)
- {
- Object exts[] = service.getDescription().getExtensors().get();
- exts = exts == null ? new Object[0] : exts;
- for (Object o : exts)
- {
- if (o instanceof UnknownExtensibilityElement)
- {
- UnknownExtensibilityElement uee = (UnknownExtensibilityElement) o;
- String uri2 = getPolicyId(uee.getElement());
- if (uri.equals(uri2))
- {
- return true;
- }
- }
- }
- return false;
- }
-}
Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySetsAnnotationListener.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySetsAnnotationListener.java)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySetsAnnotationListener.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/policy/PolicySetsAnnotationListener.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,269 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.wsf.stack.cxf.policy;
+
+import static org.jboss.wsf.stack.cxf.Loggers.ROOT_LOGGER;
+
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.wsdl.extensions.UnknownExtensibilityElement;
+
+import org.apache.cxf.annotations.Policy.Placement;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.service.factory.AbstractServiceFactoryBean;
+import org.apache.cxf.service.factory.FactoryBeanListener;
+import org.apache.cxf.service.model.AbstractPropertiesHolder;
+import org.apache.cxf.service.model.BindingFaultInfo;
+import org.apache.cxf.service.model.BindingInfo;
+import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.cxf.service.model.DescriptionInfo;
+import org.apache.cxf.service.model.FaultInfo;
+import org.apache.cxf.service.model.InterfaceInfo;
+import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.ws.policy.PolicyConstants;
+import org.apache.neethi.Constants;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * A FactoryBeanListener that adds policies according to a given map of EndpointPolicyAttachment
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Jun-2013
+ */
+public class PolicySetsAnnotationListener implements FactoryBeanListener
+{
+ private final Map<Class<?>, EndpointPolicyAttachments> epaMap = new HashMap<Class<?>, EndpointPolicyAttachments>();
+ private PolicyAttachmentStore store;
+
+ public PolicySetsAnnotationListener() {
+ this.store = PolicyAttachmentStore.getDefaultInstance();
+ }
+
+ public PolicySetsAnnotationListener(ClassLoader cl) {
+ this.store = PolicyAttachmentStore.getDefaultInstance();
+ if (cl != null) {
+ PolicyAttachmentStore pas = new PolicyAttachmentStore(cl);
+ if (!pas.isEmpty()) {
+ pas.merge(this.store);
+ this.store = pas;
+ }
+ }
+ }
+
+ public PolicySetsAnnotationListener(PolicyAttachmentStore store) {
+ this.store = store;
+ }
+
+ protected EndpointPolicyAttachments getEndpointPolicyAttachment(Class<?> clazz) {
+ if (epaMap.containsKey(clazz)) {
+ return epaMap.get(clazz);
+ } else {
+ final PolicySets ps = clazz.getAnnotation(PolicySets.class);
+ final EndpointPolicyAttachments epa = (ps != null) ? EndpointPolicyAttachments.newInstance(ps.value(), store) : null;
+ epaMap.put(clazz, epa);
+ return epa;
+ }
+ }
+
+ public void handleEvent(Event ev, AbstractServiceFactoryBean factory, Object... args)
+ {
+ switch (ev)
+ {
+ case ENDPOINT_SELECTED : {
+ Class<?> cls = (Class<?>) args[2];
+ Class<?> implCls = (Class<?>) args[3];
+ Endpoint ep = (Endpoint) args[1];
+ addPolicies(factory, ep, cls, implCls);
+ break;
+ }
+ case BINDING_OPERATION_CREATED :
+ BindingOperationInfo boi = (BindingOperationInfo) args[1];
+ Method m = (Method) args[2];
+ addPolicies(factory, boi.getOperationInfo(), m);
+ break;
+ default :
+ //ignore
+ }
+ }
+
+ private void addPolicies(AbstractServiceFactoryBean factory, OperationInfo inf, Method m)
+ {
+ if (m == null)
+ {
+ return;
+ }
+
+ final Class<?> cls = m.getDeclaringClass();
+ EndpointPolicyAttachments epa = getEndpointPolicyAttachment(cls);
+ if (epa != null)
+ {
+ final ServiceInfo service = inf.getInterface().getService();
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE_OPERATION)) {
+ addPolicy(inf, service, pa, cls, inf.getName().getLocalPart() + "PortTypeOpPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE_OPERATION_INPUT)) {
+ addPolicy(inf.getInput(), service, pa, cls, inf.getName().getLocalPart() + "PortTypeOpInputPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE_OPERATION_OUTPUT)) {
+ addPolicy(inf.getOutput(), service, pa, cls, inf.getName().getLocalPart() + "PortTypeOpOutputPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE_OPERATION_FAULT)) {
+ for (FaultInfo f : inf.getFaults())
+ {
+ addPolicy(f, service, pa, cls, f.getName().getLocalPart() + "PortTypeOpFaultPolicy");
+ }
+ }
+ }
+ }
+
+ private void addPolicies(AbstractServiceFactoryBean factory, Endpoint ep, Class<?> seiCls, Class<?> implCls)
+ {
+ EndpointPolicyAttachments epa = null;
+ Class<?> cls = seiCls;
+ if (ep.getEndpointInfo().getInterface() != null) {
+ epa = getEndpointPolicyAttachment(seiCls);
+ }
+ if (epa == null) {
+ cls = implCls;
+ epa = getEndpointPolicyAttachment(implCls);
+ }
+ if (epa != null) {
+ final BindingInfo binf = ep.getBinding().getBindingInfo();
+ final ServiceInfo si = ep.getService().getServiceInfos().get(0);
+ final InterfaceInfo inf = ep.getEndpointInfo().getInterface();
+
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING)) {
+ addPolicy(binf, si, pa, cls, binf.getName().getLocalPart() + "BindingPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.PORT_TYPE)) {
+ addPolicy(inf, si, pa, cls, inf.getName().getLocalPart() + "PortTypePolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.SERVICE)) {
+ addPolicy(si, si, pa, cls, si.getName().getLocalPart() + "ServicePolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.SERVICE_PORT)) {
+ addPolicy(ep.getEndpointInfo(), si, pa, cls, ep.getEndpointInfo().getName().getLocalPart()
+ + "PortPolicy");
+ }
+
+ for (BindingOperationInfo binfo : binf.getOperations())
+ {
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING_OPERATION)) {
+ addPolicy(binfo, si, pa, cls, binfo.getName().getLocalPart() + "BindingOpPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING_OPERATION_INPUT)) {
+ addPolicy(binfo.getInput(), si, pa, cls, binfo.getName().getLocalPart()
+ + "BindingOpInputPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING_OPERATION_OUTPUT)) {
+ addPolicy(binfo.getOutput(), si, pa, cls, binfo.getName().getLocalPart()
+ + "BindingOpOutputPolicy");
+ }
+ for (PolicyAttachment pa : epa.getPolicyAttachments(Placement.BINDING_OPERATION_FAULT)) {
+ for (BindingFaultInfo f : binfo.getFaults())
+ {
+ addPolicy(f, si, pa, cls, f.getFaultInfo().getName().getLocalPart()
+ + "BindingOpFaultPolicy");
+ }
+ }
+ }
+ }
+ }
+
+ private void addPolicy(AbstractPropertiesHolder place, ServiceInfo service, PolicyAttachment pa, Class<?> cls, String defName)
+ {
+ Element el = addPolicy(service, pa, cls, defName);
+ UnknownExtensibilityElement uee = new UnknownExtensibilityElement();
+ uee.setElement(el);
+ uee.setRequired(true);
+ uee.setElementType(DOMUtils.getElementQName(el));
+ place.addExtensor(uee);
+ }
+
+ private Element addPolicy(ServiceInfo service, PolicyAttachment pa, Class<?> cls, String defName)
+ {
+ Element element = pa.read(defName);
+ String refId = getPolicyId(element);
+ ROOT_LOGGER.addingPolicyAttachment(pa.getPlacement(), refId, cls);
+
+ if (service.getDescription() == null && cls != null)
+ {
+ service.setDescription(new DescriptionInfo());
+ URL u = cls.getResource("/");
+ if (u != null)
+ {
+ service.getDescription().setBaseURI(u.toString());
+ }
+ }
+
+ // if not already added to service add it, otherwise ignore
+ // and just create the policy reference.
+ if (!isExistsPolicy(service, refId))
+ {
+ UnknownExtensibilityElement uee = new UnknownExtensibilityElement();
+ uee.setElement(element);
+ uee.setRequired(true);
+ uee.setElementType(DOMUtils.getElementQName(element));
+ service.getDescription().addExtensor(uee);
+ }
+
+ refId = "#" + refId;
+
+ Document doc = DOMUtils.createDocument();
+ Element el = doc.createElementNS(element.getNamespaceURI(), "wsp:" + Constants.ELEM_POLICY_REF);
+ Attr att = doc.createAttributeNS(null, "URI");
+ att.setValue(refId);
+ el.setAttributeNodeNS(att);
+ return el;
+ }
+
+ private String getPolicyId(Element element)
+ {
+ return element.getAttributeNS(PolicyConstants.WSU_NAMESPACE_URI, PolicyConstants.WSU_ID_ATTR_NAME);
+ }
+
+ private boolean isExistsPolicy(ServiceInfo service, String uri)
+ {
+ Object exts[] = service.getDescription().getExtensors().get();
+ exts = exts == null ? new Object[0] : exts;
+ for (Object o : exts)
+ {
+ if (o instanceof UnknownExtensibilityElement)
+ {
+ UnknownExtensibilityElement uee = (UnknownExtensibilityElement) o;
+ String uri2 = getPolicyId(uee.getElement());
+ if (uri.equals(uri2))
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+}
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens_binding_policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:AsymmetricBinding>
- <wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
- <wsp:Policy>
- <sp:WssX509V1Token11/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V1Token11/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:Layout>
- <wsp:Policy>
- <sp:Lax/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:ProtectTokens/>
- <sp:OnlySignEntireHeadersAndBody/>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp-cxf:Basic192GCM xmlns:sp-cxf="http://cxf.apache.org/custom/security-policy"/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- </wsp:Policy>
- </sp:AsymmetricBinding>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:Wss10>
- <wsp:Policy>
- <sp:MustSupportRefIssuerSerial/>
- </wsp:Policy>
- </sp:Wss10>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens_binding_policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding>
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:WssX509V1Token11/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V1Token11/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:ProtectTokens/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp-cxf:Basic192GCM xmlns:sp-cxf="http://cxf.apache.org/custom/security-policy"/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:Wss10>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ </wsp:Policy>
+ </sp:Wss10>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens-BINDING.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens-BINDING.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens_binding_policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:AsymmetricBinding>
- <wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
- <wsp:Policy>
- <sp:WssX509V1Token11/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V1Token11/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:TripleDesRsa15/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:ProtectTokens/>
- <sp:OnlySignEntireHeadersAndBody/>
- <sp:EncryptBeforeSigning/>
- </wsp:Policy>
- </sp:AsymmetricBinding>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:Wss10>
- <wsp:Policy>
- <sp:MustSupportRefIssuerSerial/>
- </wsp:Policy>
- </sp:Wss10>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens-BINDING.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens-BINDING.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens-BINDING.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens_binding_policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding>
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:WssX509V1Token11/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V1Token11/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:TripleDesRsa15/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:ProtectTokens/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:EncryptBeforeSigning/>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:Wss10>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ </wsp:Policy>
+ </sp:Wss10>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-Addressing-BINDING.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-Addressing-BINDING.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-Addressing-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-Addressing_binding_policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
- xmlns:wsp="http://www.w3.org/ns/ws-policy">
- <wsam:Addressing>
- <wsp:Policy/>
- </wsam:Addressing>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-Addressing-BINDING.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-Addressing-BINDING.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-Addressing-BINDING.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-Addressing-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-Addressing_binding_policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy">
+ <wsam:Addressing>
+ <wsp:Policy/>
+ </wsam:Addressing>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-RM_Policy_spec_example-BINDING.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-RM_Policy_spec_example-BINDING.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-RM_Policy_spec_example-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-RM_Policy_spec_example_binding_policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy">
- <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy">
- <wsrmp:InactivityTimeout Milliseconds="600000"/>
- <wsrmp:BaseRetransmissionInterval Milliseconds="3000"/>
- <wsrmp:ExponentialBackoff/>
- <wsrmp:AcknowledgementInterval Milliseconds="200"/>
- </wsrmp:RMAssertion>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-RM_Policy_spec_example-BINDING.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-RM_Policy_spec_example-BINDING.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-RM_Policy_spec_example-BINDING.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-RM_Policy_spec_example-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-RM_Policy_spec_example_binding_policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy">
+ <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy">
+ <wsrmp:InactivityTimeout Milliseconds="600000"/>
+ <wsrmp:BaseRetransmissionInterval Milliseconds="3000"/>
+ <wsrmp:ExponentialBackoff/>
+ <wsrmp:AcknowledgementInterval Milliseconds="200"/>
+ </wsrmp:RMAssertion>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX221_binding_policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:AsymmetricBinding>
- <wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic256/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:OnlySignEntireHeadersAndBody/>
- </wsp:Policy>
- </sp:AsymmetricBinding>
- <sp:Wss10>
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- </wsp:Policy>
- </sp:Wss10>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX221_binding_policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding>
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss10>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ </wsp:Policy>
+ </sp:Wss10>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX221_Binding_Operation_Input_Policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX221_Binding_Operation_Input_Policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX221_Binding_Operation_Output_Policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX221_Binding_Operation_Output_Policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX222_binding_policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:AsymmetricBinding>
- <wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic256/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:ProtectTokens/>
- <sp:OnlySignEntireHeadersAndBody/>
- </wsp:Policy>
- </sp:AsymmetricBinding>
- <sp:Wss10>
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- </wsp:Policy>
- </sp:Wss10>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX222_binding_policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding>
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:ProtectTokens/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss10>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ </wsp:Policy>
+ </sp:Wss10>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX222_Binding_Operation_Input_Policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX222_Binding_Operation_Input_Policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX222_Binding_Operation_Output_Policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX222_Binding_Operation_Output_Policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX223_binding_policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SymmetricBinding>
- <wsp:Policy>
- <sp:ProtectionToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
- <wsp:Policy>
- <sp:RequireDerivedKeys/>
- <sp:RequireThumbprintReference/>
- <sp:WssX509V3Token11/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:ProtectionToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic256/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:OnlySignEntireHeadersAndBody/>
- </wsp:Policy>
- </sp:SymmetricBinding>
- <sp:Wss11>
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- <sp:MustSupportRefThumbprint/>
- <sp:MustSupportRefEncryptedKey/>
- <sp:RequireSignatureConfirmation/>
- </wsp:Policy>
- </sp:Wss11>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX223_binding_policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:RequireDerivedKeys/>
+ <sp:RequireThumbprintReference/>
+ <sp:WssX509V3Token11/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ <sp:RequireSignatureConfirmation/>
+ </wsp:Policy>
+ </sp:Wss11>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX223_Binding_Operation_Input_Policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX223_Binding_Operation_Input_Policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX223_Binding_Operation_Output_Policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX223_Binding_Operation_Output_Policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX224_binding_policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SymmetricBinding>
- <wsp:Policy>
- <sp:ProtectionToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
- <wsp:Policy>
- <sp:RequireDerivedKeys/>
- <sp:RequireThumbprintReference/>
- <sp:WssX509V3Token11/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:ProtectionToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic256/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:OnlySignEntireHeadersAndBody/>
- </wsp:Policy>
- </sp:SymmetricBinding>
- <sp:EndorsingSupportingTokens>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
- <wsp:Policy>
- <sp:RequireThumbprintReference/>
- <sp:WssX509V3Token11/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:EndorsingSupportingTokens>
- <sp:Wss11>
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- <sp:MustSupportRefThumbprint/>
- <sp:MustSupportRefEncryptedKey/>
- <sp:RequireSignatureConfirmation/>
- </wsp:Policy>
- </sp:Wss11>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX224_binding_policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:RequireDerivedKeys/>
+ <sp:RequireThumbprintReference/>
+ <sp:WssX509V3Token11/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:EndorsingSupportingTokens>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:RequireThumbprintReference/>
+ <sp:WssX509V3Token11/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:EndorsingSupportingTokens>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ <sp:RequireSignatureConfirmation/>
+ </wsp:Policy>
+ </sp:Wss11>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX224_Binding_Operation_Input_Policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_INPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX224_Binding_Operation_Input_Policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX224_Binding_Operation_Output_Policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt-BINDING_OPERATION_OUTPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX224_Binding_Operation_Output_Policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,8 +0,0 @@
-AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens
-AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens
-WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt
-WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt
-WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt
-WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt
-WS-RM_Policy_spec_example
-WS-Addressing
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore)
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,8 @@
+AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens
+AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens
+WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt
+WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt
+WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt
+WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt
+WS-RM_Policy_spec_example
+WS-Addressing
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.wsf.stack.cxf.policy;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.cxf.annotations.Policy.Placement;
-import org.junit.Test;
-import org.w3c.dom.Element;
-
-
-/**
- * A test case of basic policy sets parsing
- *
- * @author alessio.soldano(a)jboss.com
- * @since 04-Jun-2013
- *
- */
-public class PolicySetsTest extends TestCase
-{
- @Test
- public void testStore() throws Exception {
- PolicyAttachmentStore paStore = new PolicyAttachmentStore(PolicySetsTest.class.getClassLoader());
- List<PolicyAttachment> pas = paStore.get("WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt");
- assertNotNull(pas);
- assertEquals(3, pas.size());
- pas = paStore.get("Foo");
- assertNotNull(pas);
- assertEquals(0, pas.size());
- }
-
- @Test
- public void testPolicyAttachmentRead() throws Exception {
- PolicyAttachmentStore paStore = new PolicyAttachmentStore(PolicySetsTest.class.getClassLoader());
- List<PolicyAttachment> pas = paStore.get("WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt");
- assertNotNull(pas);
- for (PolicyAttachment pa : pas) {
- Element el = pa.read("foo");
- assertEquals("Policy", el.getLocalName());
- assertEquals("http://www.w3.org/ns/ws-policy", el.getNamespaceURI());
- }
- }
-
- @Test
- public void testEndpointPolicyAttachments() throws Exception {
- PolicyAttachmentStore store = new PolicyAttachmentStore(PolicySetsTest.class.getClassLoader());
- EndpointPolicyAttachments epa = EndpointPolicyAttachments.newInstance(new String[]{""}, store);
- for (Placement p : Placement.values()) {
- assertEquals(0, epa.getPolicyAttachments(p).size());
- }
- epa = EndpointPolicyAttachments.newInstance(new String[]{"fafds"}, store);
- for (Placement p : Placement.values()) {
- assertEquals(0, epa.getPolicyAttachments(p).size());
- }
- epa = EndpointPolicyAttachments.newInstance(new String[]{"Foooo", "WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt"}, store);
- for (Placement p : Placement.values()) {
- if (p == Placement.BINDING || p == Placement.BINDING_OPERATION_INPUT || p == Placement.BINDING_OPERATION_OUTPUT) {
- List<PolicyAttachment> pas = epa.getPolicyAttachments(p);
- assertNotNull(pas);
- assertEquals(1, pas.size());
- assertNotNull(pas.iterator().next().read(""));
- } else {
- assertEquals(0, epa.getPolicyAttachments(p).size());
- }
- }
- }
-}
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java)
===================================================================
--- stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/test/java/org/jboss/wsf/stack/cxf/policy/PolicySetsTest.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.wsf.stack.cxf.policy;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.apache.cxf.annotations.Policy.Placement;
+import org.junit.Test;
+import org.w3c.dom.Element;
+
+
+/**
+ * A test case of basic policy sets parsing
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 04-Jun-2013
+ *
+ */
+public class PolicySetsTest extends TestCase
+{
+ @Test
+ public void testStore() throws Exception {
+ PolicyAttachmentStore paStore = new PolicyAttachmentStore(PolicySetsTest.class.getClassLoader());
+ List<PolicyAttachment> pas = paStore.get("WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt");
+ assertNotNull(pas);
+ assertEquals(3, pas.size());
+ pas = paStore.get("Foo");
+ assertNotNull(pas);
+ assertEquals(0, pas.size());
+ }
+
+ @Test
+ public void testPolicyAttachmentRead() throws Exception {
+ PolicyAttachmentStore paStore = new PolicyAttachmentStore(PolicySetsTest.class.getClassLoader());
+ List<PolicyAttachment> pas = paStore.get("WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt");
+ assertNotNull(pas);
+ for (PolicyAttachment pa : pas) {
+ Element el = pa.read("foo");
+ assertEquals("Policy", el.getLocalName());
+ assertEquals("http://www.w3.org/ns/ws-policy", el.getNamespaceURI());
+ }
+ }
+
+ @Test
+ public void testEndpointPolicyAttachments() throws Exception {
+ PolicyAttachmentStore store = new PolicyAttachmentStore(PolicySetsTest.class.getClassLoader());
+ EndpointPolicyAttachments epa = EndpointPolicyAttachments.newInstance(new String[]{""}, store);
+ for (Placement p : Placement.values()) {
+ assertEquals(0, epa.getPolicyAttachments(p).size());
+ }
+ epa = EndpointPolicyAttachments.newInstance(new String[]{"fafds"}, store);
+ for (Placement p : Placement.values()) {
+ assertEquals(0, epa.getPolicyAttachments(p).size());
+ }
+ epa = EndpointPolicyAttachments.newInstance(new String[]{"Foooo", "WS-SP-EX224_WSS11_Mutual_Auth_X509_Sign_Encrypt"}, store);
+ for (Placement p : Placement.values()) {
+ if (p == Placement.BINDING || p == Placement.BINDING_OPERATION_INPUT || p == Placement.BINDING_OPERATION_OUTPUT) {
+ List<PolicyAttachment> pas = epa.getPolicyAttachments(p);
+ assertNotNull(pas);
+ assertEquals(1, pas.size());
+ assertNotNull(pas.iterator().next().read(""));
+ } else {
+ assertEquals(0, epa.getPolicyAttachments(p).size());
+ }
+ }
+ }
+}
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX224_binding_policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SymmetricBinding>
- <wsp:Policy>
- <sp:ProtectionToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
- <wsp:Policy>
- <sp:RequireDerivedKeys/>
- <sp:RequireThumbprintReference/>
- <sp:WssX509V3Token11/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:ProtectionToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic256/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:OnlySignEntireHeadersAndBody/>
- </wsp:Policy>
- </sp:SymmetricBinding>
- <sp:EndorsingSupportingTokens>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
- <wsp:Policy>
- <sp:RequireThumbprintReference/>
- <sp:WssX509V3Token11/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:EndorsingSupportingTokens>
- <sp:Wss11>
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- <sp:MustSupportRefThumbprint/>
- <sp:MustSupportRefEncryptedKey/>
- <sp:RequireSignatureConfirmation/>
- </wsp:Policy>
- </sp:Wss11>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX224_binding_policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:RequireDerivedKeys/>
+ <sp:RequireThumbprintReference/>
+ <sp:WssX509V3Token11/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:EndorsingSupportingTokens>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:RequireThumbprintReference/>
+ <sp:WssX509V3Token11/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:EndorsingSupportingTokens>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ <sp:RequireSignatureConfirmation/>
+ </wsp:Policy>
+ </sp:Wss11>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_INPUT.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_INPUT.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_INPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX224_Binding_Operation_Input_Policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_INPUT.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_INPUT.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_INPUT.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_INPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX224_Binding_Operation_Input_Policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_OUTPUT.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_OUTPUT.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_OUTPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="WS-SP-EX224_Binding_Operation_Output_Policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_OUTPUT.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_OUTPUT.xml)
===================================================================
--- stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_OUTPUT.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/WS-SP-EX224-BINDING_OPERATION_OUTPUT.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="WS-SP-EX224_Binding_Operation_Output_Policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1 +0,0 @@
-WS-SP-EX224
\ No newline at end of file
Copied: stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore (from rev 17672, stack/cxf/branches/JBWS-3648/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore)
===================================================================
--- stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore (rev 0)
+++ stack/cxf/trunk/modules/client/src/test/resources/META-INF/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1 @@
+WS-SP-EX224
\ No newline at end of file
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -38,6 +38,8 @@
import org.apache.cxf.management.interceptor.ResponseTimeMessageOutInterceptor;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
+import org.apache.cxf.service.factory.FactoryBeanListener;
+import org.apache.cxf.service.factory.FactoryBeanListenerManager;
import org.apache.cxf.workqueue.AutomaticWorkQueue;
import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
import org.apache.cxf.workqueue.WorkQueueManager;
@@ -55,6 +57,7 @@
import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.NsCtxSelectorStoreInterceptor;
import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl;
+import org.jboss.wsf.stack.cxf.policy.PolicySetsAnnotationListener;
/**
* A wrapper of the Bus for performing most of the configurations required on it by JBossWS
@@ -70,6 +73,7 @@
protected Bus bus;
protected BusHolderLifeCycleListener busHolderListener;
+ protected FactoryBeanListener policySetsListener;
public BusHolder()
{
@@ -88,8 +92,9 @@
* @param resolver The ResourceResolver to configure, if any
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
* @param wsmd The current JBossWebservicesMetaData, if any
+ * @param depRuntimeClassLoader The current deployment classloader
*/
- public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd)
+ public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, ClassLoader depRuntimeClassLoader)
{
bus.setProperty(org.jboss.wsf.stack.cxf.client.Constants.DEPLOYMENT_BUS, true);
busHolderListener = new BusHolderLifeCycleListener();
@@ -111,6 +116,9 @@
setCXFManagement(bus, props); //*first* enabled cxf management if required, *then* add anything else which could be manageable (e.g. work queues)
setAdditionalWorkQueues(bus, props);
setWSDiscovery(bus, props);
+
+ policySetsListener = new PolicySetsAnnotationListener(depRuntimeClassLoader);
+ bus.getExtension(FactoryBeanListenerManager.class).addListener(policySetsListener);
}
@@ -126,6 +134,8 @@
bus.shutdown(true);
}
busHolderListener = null;
+ bus.getExtension(FactoryBeanListenerManager.class).removeListener(policySetsListener);
+ policySetsListener = null;
}
/**
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -79,15 +79,16 @@
* @param resolver The ResourceResolver to configure, if any
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
* @param wsmd The current JBossWebservicesMetaData, if any
+ * @param depRuntimeClassLoader The current deployment classloader
*/
@Override
- public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd)
+ public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, ClassLoader depRuntimeClassLoader)
{
if (configured)
{
throw Messages.MESSAGES.busAlreadyConfigured(bus);
}
- super.configure(resolver, configurer, wsmd);
+ super.configure(resolver, configurer, wsmd, depRuntimeClassLoader);
for (DDEndpoint dde : metadata.getEndpoints())
{
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -122,15 +122,16 @@
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
* @param dep The current JBossWS-SPI Deployment
* @param wsmd The current JBossWebservicesMetaData, if any
+ * @param depRuntimeClassLoader The current deployment classloader
*/
@Override
- public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd)
+ public void configure(ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd, ClassLoader depRuntimeClassLoader)
{
if (configured)
{
throw MESSAGES.busAlreadyConfigured(ctx);
}
- super.configure(resolver, configurer, wsmd);
+ super.configure(resolver, configurer, wsmd, depRuntimeClassLoader);
GenericApplicationContext jbosswsCxfContext = null;
//load stuff from provided jbossws-cxf.xml DD
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -126,7 +126,7 @@
Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),
new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile(), epConfigName, epConfigFile);
- holder.configure(resolver, configurer, wsmd);
+ holder.configure(resolver, configurer, wsmd, dep.getRuntimeClassLoader());
dep.addAttachment(BusHolder.class, holder);
}
finally
Modified: stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java
===================================================================
--- stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -64,7 +64,7 @@
}
BusHolder holder = new NonSpringBusHolder(new DDBeans());
try {
- holder.configure(null, null, wsmd);
+ holder.configure(null, null, wsmd, null);
return holder.getBus().getExtension(PolicyEngine.class).getAlternativeSelector().getClass().getName();
} finally {
holder.close();
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -343,6 +343,41 @@
</manifest>
</jar>
+ <!-- jaxws-cxf-jbws3648 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3648.war" needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo*.class"/>
+ </classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
+ </manifest>
+ </war>
+
+ <!-- jaxws-cxf-jbws3648-b -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3648-b.war" needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour*.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree*.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.class"/>
+ </classes>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3648-b/WEB-INF" prefix="WEB-INF/classes">
+ <include name="bob.jks" />
+ <include name="bob.properties" />
+ </zipfileset>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3648-b/policies"
+ prefix="WEB-INF/classes/META-INF/policies"/>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client, org.apache.ws.security"/>
+ </manifest>
+ </war>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3648-b-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3648-b/META-INF">
+ <include name="alice.properties" />
+ <include name="alice.jks" />
+ </metainf>
+ </jar>
+
<!-- jaxws-cxf-logging -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-logging.jar">
<fileset dir="${tests.output.dir}/test-classes">
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -340,6 +340,23 @@
</manifest>
</war>
+ <!-- jaxws-samples-wsse-policy-sign-encrypt-gcm-code-first -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-gcm-code-first.war" needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedService*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/KeystorePasswordCallback.class"/>
+ </classes>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF" prefix="WEB-INF/classes">
+ <include name="bob.jks" />
+ <include name="bob.properties" />
+ </zipfileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client, org.apache.ws.security"/>
+ </manifest>
+ </war>
+
<!-- jaxws-samples-wsse-policy-sign-encrypt-mc -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-mc.war" needxmlfile='false'>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -63,7 +63,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null);
+ holder.configure(null, null, null, null);
holder.close();
assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: "
+ listener.getCount(), 1, listener.getCount());
@@ -74,7 +74,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null);
+ holder.configure(null, null, null, null);
bus.shutdown(true);
holder.close();
assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: "
@@ -86,7 +86,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null);
+ holder.configure(null, null, null, null);
assertEquals("preShutdown method on listener shouldn't be called before holder is closed: number of actual calls: "
+ listener.getCount(), 0, listener.getCount());
holder.close();
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.cxf.jbws3648;
-
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.jboss.wsf.stack.cxf.policy.PolicySets;
-
-@WebService(name = "EndpointFour", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-@PolicySets({"My-WSSE-conf", "WS-Addressing"})
-public interface EndpointFour
-{
- String echo(String input);
-}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.cxf.jbws3648;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.wsf.stack.cxf.policy.PolicySets;
+
+@WebService(name = "EndpointFour", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@PolicySets({"My-WSSE-conf", "WS-Addressing"})
+public interface EndpointFour
+{
+ String echo(String input);
+}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFourImpl.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFourImpl.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFourImpl.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.cxf.jbws3648;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.apache.cxf.annotations.EndpointProperties;
-import org.apache.cxf.annotations.EndpointProperty;
-import org.jboss.logging.Logger;
-
-@WebService(name = "EndpointFour",
- targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648",
- serviceName = "ServiceFour",
- endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointFour")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-@EndpointProperties(value = {
- @EndpointProperty(key = "ws-security.signature.properties", value = "bob.properties"),
- @EndpointProperty(key = "ws-security.encryption.properties", value = "bob.properties"),
- @EndpointProperty(key = "ws-security.signature.username", value = "bob"),
- @EndpointProperty(key = "ws-security.encryption.username", value = "alice"),
- @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.cxf.jbws3648.KeystorePasswordCallback")
- }
-)
-public class EndpointFourImpl implements EndpointThree
-{
- @WebMethod
- public String echo(String input)
- {
- Logger.getLogger(this.getClass()).info("echo: " + input);
- return input;
- }
-}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFourImpl.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFourImpl.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFourImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFourImpl.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.cxf.jbws3648;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.apache.cxf.annotations.EndpointProperties;
+import org.apache.cxf.annotations.EndpointProperty;
+import org.jboss.logging.Logger;
+
+@WebService(name = "EndpointFour",
+ targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648",
+ serviceName = "ServiceFour",
+ endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointFour")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@EndpointProperties(value = {
+ @EndpointProperty(key = "ws-security.signature.properties", value = "bob.properties"),
+ @EndpointProperty(key = "ws-security.encryption.properties", value = "bob.properties"),
+ @EndpointProperty(key = "ws-security.signature.username", value = "bob"),
+ @EndpointProperty(key = "ws-security.encryption.username", value = "alice"),
+ @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.cxf.jbws3648.KeystorePasswordCallback")
+ }
+)
+public class EndpointFourImpl implements EndpointThree
+{
+ @WebMethod
+ public String echo(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ return input;
+ }
+}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOne.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOne.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOne.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.cxf.jbws3648;
-
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648", serviceName = "ServiceOne")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-public interface EndpointOne
-{
- String echo(String input);
-}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOne.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOne.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOne.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOne.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.cxf.jbws3648;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointOne
+{
+ String echo(String input);
+}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.cxf.jbws3648;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.stack.cxf.policy.PolicySets;
-
-@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648", serviceName = "ServiceOne")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-@PolicySets({"WS-RM_Policy_spec_example", "WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt", "WS-Addressing"})
-public class EndpointOneImpl
-{
- @WebMethod
- public String echo(String input)
- {
- Logger.getLogger(this.getClass()).info("echo: " + input);
- return input;
- }
-}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.cxf.jbws3648;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.stack.cxf.policy.PolicySets;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@PolicySets({"WS-RM_Policy_spec_example", "WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt", "WS-Addressing"})
+public class EndpointOneImpl
+{
+ @WebMethod
+ public String echo(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ return input;
+ }
+}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.cxf.jbws3648;
-
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.jboss.wsf.stack.cxf.policy.PolicySets;
-
-@WebService(name = "EndpointThree", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-@PolicySets({"AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens", "WS-Addressing"})
-public interface EndpointThree
-{
- String echo(String input);
-}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.cxf.jbws3648;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.wsf.stack.cxf.policy.PolicySets;
+
+@WebService(name = "EndpointThree", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@PolicySets({"AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens", "WS-Addressing"})
+public interface EndpointThree
+{
+ String echo(String input);
+}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThreeImpl.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThreeImpl.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThreeImpl.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.cxf.jbws3648;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.apache.cxf.annotations.EndpointProperties;
-import org.apache.cxf.annotations.EndpointProperty;
-import org.jboss.logging.Logger;
-
-@WebService(name = "EndpointThree",
- targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648",
- serviceName = "ServiceThree",
- endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointThree")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-@EndpointProperties(value = {
- @EndpointProperty(key = "ws-security.signature.properties", value = "bob.properties"),
- @EndpointProperty(key = "ws-security.encryption.properties", value = "bob.properties"),
- @EndpointProperty(key = "ws-security.signature.username", value = "bob"),
- @EndpointProperty(key = "ws-security.encryption.username", value = "alice"),
- @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.cxf.jbws3648.KeystorePasswordCallback")
- }
-)
-public class EndpointThreeImpl implements EndpointThree
-{
- @WebMethod
- public String echo(String input)
- {
- Logger.getLogger(this.getClass()).info("echo: " + input);
- return input;
- }
-}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThreeImpl.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThreeImpl.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThreeImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThreeImpl.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.cxf.jbws3648;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.apache.cxf.annotations.EndpointProperties;
+import org.apache.cxf.annotations.EndpointProperty;
+import org.jboss.logging.Logger;
+
+@WebService(name = "EndpointThree",
+ targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648",
+ serviceName = "ServiceThree",
+ endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointThree")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@EndpointProperties(value = {
+ @EndpointProperty(key = "ws-security.signature.properties", value = "bob.properties"),
+ @EndpointProperty(key = "ws-security.encryption.properties", value = "bob.properties"),
+ @EndpointProperty(key = "ws-security.signature.username", value = "bob"),
+ @EndpointProperty(key = "ws-security.encryption.username", value = "alice"),
+ @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.cxf.jbws3648.KeystorePasswordCallback")
+ }
+)
+public class EndpointThreeImpl implements EndpointThree
+{
+ @WebMethod
+ public String echo(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ return input;
+ }
+}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.cxf.jbws3648;
-
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.jboss.wsf.stack.cxf.policy.PolicySets;
-
-@WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-@PolicySets({"WS-RM_Policy_spec_example", "WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt", "WS-Addressing"})
-public interface EndpointTwo
-{
- String echo(String input);
-}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.cxf.jbws3648;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.wsf.stack.cxf.policy.PolicySets;
+
+@WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@PolicySets({"WS-RM_Policy_spec_example", "WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt", "WS-Addressing"})
+public interface EndpointTwo
+{
+ String echo(String input);
+}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwoImpl.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwoImpl.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwoImpl.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.cxf.jbws3648;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.jboss.logging.Logger;
-
-@WebService(name = "EndpointTwo",
- targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648",
- serviceName = "ServiceTwo",
- endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointTwo")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-public class EndpointTwoImpl implements EndpointTwo
-{
- @WebMethod
- public String echo(String input)
- {
- Logger.getLogger(this.getClass()).info("echo: " + input);
- return input;
- }
-}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwoImpl.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwoImpl.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwoImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwoImpl.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.cxf.jbws3648;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+
+@WebService(name = "EndpointTwo",
+ targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3648",
+ serviceName = "ServiceTwo",
+ endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointTwo")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public class EndpointTwoImpl implements EndpointTwo
+{
+ @WebMethod
+ public String echo(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ return input;
+ }
+}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.cxf.jbws3648;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
-
-public class KeystorePasswordCallback implements CallbackHandler
-{
-
- private Map<String, String> passwords = new HashMap<String, String>();
-
- public KeystorePasswordCallback()
- {
- passwords.put("alice", "password");
- passwords.put("bob", "password");
- passwords.put("john", "password");
- }
-
- /**
- * It attempts to get the password from the private
- * alias/passwords map.
- */
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
- {
- for (int i = 0; i < callbacks.length; i++)
- {
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
-
- String pass = passwords.get(pc.getIdentifier());
- if (pass != null)
- {
- pc.setPassword(pass);
- return;
- }
- }
- }
-
- /**
- * Add an alias/password pair to the callback mechanism.
- */
- public void setAliasPassword(String alias, String password)
- {
- passwords.put(alias, password);
- }
-}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.cxf.jbws3648;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import org.apache.ws.security.WSPasswordCallback;
+
+public class KeystorePasswordCallback implements CallbackHandler
+{
+
+ private Map<String, String> passwords = new HashMap<String, String>();
+
+ public KeystorePasswordCallback()
+ {
+ passwords.put("alice", "password");
+ passwords.put("bob", "password");
+ passwords.put("john", "password");
+ }
+
+ /**
+ * It attempts to get the password from the private
+ * alias/passwords map.
+ */
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+ {
+ for (int i = 0; i < callbacks.length; i++)
+ {
+ WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+
+ String pass = passwords.get(pc.getIdentifier());
+ if (pass != null)
+ {
+ pc.setPassword(pass);
+ return;
+ }
+ }
+ }
+
+ /**
+ * Add an alias/password pair to the callback mechanism.
+ */
+ public void setAliasPassword(String alias, String password)
+ {
+ passwords.put(alias, password);
+ }
+}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,112 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.cxf.jbws3648;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.ws.security.SecurityConstants;
-import org.jboss.wsf.test.JBossWSCXFTestSetup;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- *
- *
- * @author alessio.soldano(a)jboss.com
- * @since 13-Jun-2013
- */
-public class PolicyAttachmentTestCase extends JBossWSTest
-{
- public static Test suite()
- {
- return new JBossWSCXFTestSetup(PolicyAttachmentTestCase.class, "jaxws-cxf-jbws3648-b.war, jaxws-cxf-jbws3648-b-client.jar");
- }
-
- public void testEndpointWithWSSEAndWSA() throws Exception {
- Bus bus = BusFactory.newInstance().createBus();
- BusFactory.setThreadDefaultBus(bus);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- PrintWriter pw = new PrintWriter(bos);
- try {
- bus.getInInterceptors().add(new LoggingInInterceptor(pw));
-
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648-b/ServiceThree" + "?wsdl");
- QName serviceName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3648", "ServiceThree");
- Service service = Service.create(wsdlURL, serviceName);
- EndpointThree proxy = (EndpointThree)service.getPort(EndpointThree.class);
- setupWsse((BindingProvider)proxy);
-
- assertEquals("Foo3", proxy.echo("Foo3"));
- final String m = bos.toString();
- assertTrue("WS-Addressing was not enabled!", m.contains("http://www.w3.org/2005/08/addressing") && m.contains("http://www.w3.org/2005/08/addressing/anonymous"));
- assertTrue("WS-Security was not enabled!", m.contains("http://www.w3.org/2001/04/xmlenc#rsa-1_5") && m.contains("http://www.w3.org/2001/04/xmlenc#tripledes-cbc"));
- } finally {
- bus.shutdown(true);
- pw.close();
- bos.close();
- }
- }
-
- public void testEndpointWithCustomWSSEAndWSA() throws Exception {
- Bus bus = BusFactory.newInstance().createBus();
- BusFactory.setThreadDefaultBus(bus);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- PrintWriter pw = new PrintWriter(bos);
- try {
- bus.getInInterceptors().add(new LoggingInInterceptor(pw));
-
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648-b/ServiceFour" + "?wsdl");
- QName serviceName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3648", "ServiceFour");
- Service service = Service.create(wsdlURL, serviceName);
- EndpointFour proxy = (EndpointFour)service.getPort(EndpointFour.class);
- setupWsse((BindingProvider)proxy);
-
- assertEquals("Foo4", proxy.echo("Foo4"));
- final String m = bos.toString();
- assertTrue("WS-Addressing was not enabled!", m.contains("http://www.w3.org/2005/08/addressing") && m.contains("http://www.w3.org/2005/08/addressing/anonymous"));
- assertTrue("WS-Security was not enabled!", m.contains("http://www.w3.org/2001/04/xmlenc#rsa-1_5") && m.contains("http://www.w3.org/2001/04/xmlenc#aes256-cbc"));
- } finally {
- bus.shutdown(true);
- pw.close();
- bos.close();
- }
- }
-
- private void setupWsse(BindingProvider proxy)
- {
- proxy.getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
- proxy.getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
- proxy.getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
- proxy.getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
- proxy.getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
- }
-}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,112 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.cxf.jbws3648;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ *
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 13-Jun-2013
+ */
+public class PolicyAttachmentTestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(PolicyAttachmentTestCase.class, "jaxws-cxf-jbws3648-b.war, jaxws-cxf-jbws3648-b-client.jar");
+ }
+
+ public void testEndpointWithWSSEAndWSA() throws Exception {
+ Bus bus = BusFactory.newInstance().createBus();
+ BusFactory.setThreadDefaultBus(bus);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ PrintWriter pw = new PrintWriter(bos);
+ try {
+ bus.getInInterceptors().add(new LoggingInInterceptor(pw));
+
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648-b/ServiceThree" + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3648", "ServiceThree");
+ Service service = Service.create(wsdlURL, serviceName);
+ EndpointThree proxy = (EndpointThree)service.getPort(EndpointThree.class);
+ setupWsse((BindingProvider)proxy);
+
+ assertEquals("Foo3", proxy.echo("Foo3"));
+ final String m = bos.toString();
+ assertTrue("WS-Addressing was not enabled!", m.contains("http://www.w3.org/2005/08/addressing") && m.contains("http://www.w3.org/2005/08/addressing/anonymous"));
+ assertTrue("WS-Security was not enabled!", m.contains("http://www.w3.org/2001/04/xmlenc#rsa-1_5") && m.contains("http://www.w3.org/2001/04/xmlenc#tripledes-cbc"));
+ } finally {
+ bus.shutdown(true);
+ pw.close();
+ bos.close();
+ }
+ }
+
+ public void testEndpointWithCustomWSSEAndWSA() throws Exception {
+ Bus bus = BusFactory.newInstance().createBus();
+ BusFactory.setThreadDefaultBus(bus);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ PrintWriter pw = new PrintWriter(bos);
+ try {
+ bus.getInInterceptors().add(new LoggingInInterceptor(pw));
+
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648-b/ServiceFour" + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3648", "ServiceFour");
+ Service service = Service.create(wsdlURL, serviceName);
+ EndpointFour proxy = (EndpointFour)service.getPort(EndpointFour.class);
+ setupWsse((BindingProvider)proxy);
+
+ assertEquals("Foo4", proxy.echo("Foo4"));
+ final String m = bos.toString();
+ assertTrue("WS-Addressing was not enabled!", m.contains("http://www.w3.org/2005/08/addressing") && m.contains("http://www.w3.org/2005/08/addressing/anonymous"));
+ assertTrue("WS-Security was not enabled!", m.contains("http://www.w3.org/2001/04/xmlenc#rsa-1_5") && m.contains("http://www.w3.org/2001/04/xmlenc#aes256-cbc"));
+ } finally {
+ bus.shutdown(true);
+ pw.close();
+ bos.close();
+ }
+ }
+
+ private void setupWsse(BindingProvider proxy)
+ {
+ proxy.getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
+ proxy.getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
+ proxy.getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
+ proxy.getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
+ proxy.getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
+ }
+}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,82 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * 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.cxf.jbws3648;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSCXFTestSetup;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- *
- *
- * @author alessio.soldano(a)jboss.com
- * @since 06-Jun-2013
- */
-public class PolicyAttachmentWSDLTestCase extends JBossWSTest
-{
- public static Test suite()
- {
- return new JBossWSCXFTestSetup(PolicyAttachmentWSDLTestCase.class, "jaxws-cxf-jbws3648.war");
- }
-
- public void testEndpointOneWSDL() throws Exception {
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648/ServiceOne" + "?wsdl");
- checkPolicyAttachments(wsdlURL, new String[]{"WS-RM_Policy_spec_example",
- "WS-SP-EX223_binding_policy",
- "WS-SP-EX223_Binding_Operation_Input_Policy",
- "WS-SP-EX223_Binding_Operation_Output_Policy",
- "WS-Addressing_binding_policy"});
- }
-
- public void testEndpointTwoWSDL() throws Exception
- {
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648/ServiceTwo" + "?wsdl");
- checkPolicyAttachments(wsdlURL, new String[]{"WS-RM_Policy_spec_example",
- "WS-SP-EX223_binding_policy",
- "WS-SP-EX223_Binding_Operation_Input_Policy",
- "WS-SP-EX223_Binding_Operation_Output_Policy",
- "WS-Addressing_binding_policy"});
- }
-
- private void checkPolicyAttachments(URL wsdlURL, String[] refIds) throws Exception {
- BufferedReader br = new BufferedReader(new InputStreamReader(wsdlURL.openStream(), "UTF-8"));
- StringBuilder sb = new StringBuilder();
- try {
- String s;
- while ((s = br.readLine()) != null) {
- sb.append(s);
- }
- } finally {
- br.close();
- }
- String wsdl = sb.toString();
- for (String refId : refIds) {
- assertTrue("WSDL does not contain '" + refId + "'", wsdl.contains(refId));
- }
- }
-
-}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.cxf.jbws3648;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ *
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 06-Jun-2013
+ */
+public class PolicyAttachmentWSDLTestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(PolicyAttachmentWSDLTestCase.class, "jaxws-cxf-jbws3648.war");
+ }
+
+ public void testEndpointOneWSDL() throws Exception {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648/ServiceOne" + "?wsdl");
+ checkPolicyAttachments(wsdlURL, new String[]{"WS-RM_Policy_spec_example",
+ "WS-SP-EX223_binding_policy",
+ "WS-SP-EX223_Binding_Operation_Input_Policy",
+ "WS-SP-EX223_Binding_Operation_Output_Policy",
+ "WS-Addressing_binding_policy"});
+ }
+
+ public void testEndpointTwoWSDL() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648/ServiceTwo" + "?wsdl");
+ checkPolicyAttachments(wsdlURL, new String[]{"WS-RM_Policy_spec_example",
+ "WS-SP-EX223_binding_policy",
+ "WS-SP-EX223_Binding_Operation_Input_Policy",
+ "WS-SP-EX223_Binding_Operation_Output_Policy",
+ "WS-Addressing_binding_policy"});
+ }
+
+ private void checkPolicyAttachments(URL wsdlURL, String[] refIds) throws Exception {
+ BufferedReader br = new BufferedReader(new InputStreamReader(wsdlURL.openStream(), "UTF-8"));
+ StringBuilder sb = new StringBuilder();
+ try {
+ String s;
+ while ((s = br.readLine()) != null) {
+ sb.append(s);
+ }
+ } finally {
+ br.close();
+ }
+ String wsdl = sb.toString();
+ for (String refId : refIds) {
+ assertTrue("WSDL does not contain '" + refId + "'", wsdl.contains(refId));
+ }
+ }
+
+}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceIface.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceIface.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceIface.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceIface.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.samples.wsse.policy.basic;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy"
+)
+public interface AnnotatedServiceIface
+{
+ @WebMethod
+ String sayHello();
+}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.samples.wsse.policy.basic;
+
+import javax.jws.WebService;
+
+import org.apache.cxf.annotations.EndpointProperties;
+import org.apache.cxf.annotations.EndpointProperty;
+import org.jboss.wsf.stack.cxf.policy.PolicySets;
+
+@WebService(
+ portName = "AnnotatedSecurityServicePort",
+ serviceName = "AnnotatedSecurityService",
+ name = "AnnotatedServiceIface",
+ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.basic.AnnotatedServiceIface",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy"
+)
+@EndpointProperties(value = {
+ @EndpointProperty(key = "ws-security.signature.properties", value = "bob.properties"),
+ @EndpointProperty(key = "ws-security.encryption.properties", value = "bob.properties"),
+ @EndpointProperty(key = "ws-security.signature.username", value = "bob"),
+ @EndpointProperty(key = "ws-security.encryption.username", value = "alice"),
+ @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback")
+ }
+)
+@PolicySets("AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens")
+public class AnnotatedServiceImpl implements AnnotatedServiceIface
+{
+ public String sayHello()
+ {
+ return "Secure Hello World!";
+ }
+}
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.samples.wsse.policy.basic;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * WS-SecurityPolicy code first dev test
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 05-Jun-2013
+ */
+public final class AnnotatedSignEncryptTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-gcm-code-first/AnnotatedSecurityService";
+
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(AnnotatedSignEncryptTestCase.class, "jaxws-samples-wsse-policy-sign-encrypt-gcm-code-first.war jaxws-samples-wsse-policy-sign-encrypt-client.jar");
+ }
+
+ public void testWsdl() throws Exception
+ {
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ BufferedReader br = new BufferedReader(new InputStreamReader(wsdlURL.openStream(), "UTF-8"));
+ StringBuilder sb = new StringBuilder();
+ try {
+ String s;
+ while ((s = br.readLine()) != null) {
+ sb.append(s);
+ }
+ } finally {
+ br.close();
+ }
+ String wsdl = sb.toString();
+ assertTrue(wsdl.contains("AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens_binding_policy"));
+ }
+
+ public void test() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "AnnotatedSecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ AnnotatedServiceIface proxy = (AnnotatedServiceIface)service.getPort(AnnotatedServiceIface.class);
+ setupWsse(proxy);
+ assertEquals("Secure Hello World!", proxy.sayHello());
+ }
+
+ private void setupWsse(AnnotatedServiceIface proxy)
+ {
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
+ }
+}
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.jks
===================================================================
(Binary files differ)
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.jks (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.jks)
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.properties
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.properties 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.properties 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,5 +0,0 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=alice
-org.apache.ws.security.crypto.merlin.file=META-INF/alice.jks
\ No newline at end of file
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.properties (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.properties)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/META-INF/alice.properties 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=alice
+org.apache.ws.security.crypto.merlin.file=META-INF/alice.jks
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.jks
===================================================================
(Binary files differ)
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.jks (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.jks)
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.properties
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.properties 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.properties 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,5 +0,0 @@
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=bob
-org.apache.ws.security.crypto.merlin.file=bob.jks
\ No newline at end of file
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.properties (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.properties)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/WEB-INF/bob.properties 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=bob
+org.apache.ws.security.crypto.merlin.file=bob.jks
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/My-WSSE-conf-BINDING.xml
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/My-WSSE-conf-BINDING.xml 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/My-WSSE-conf-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy wsu:Id="My-WSSE-conf_binding_policy"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
- xmlns:wsp="http://www.w3.org/ns/ws-policy"
- xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:AsymmetricBinding>
- <wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
- <wsp:Policy>
- <sp:WssX509V1Token11/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V1Token11/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic256Rsa15/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:ProtectTokens/>
- <sp:OnlySignEntireHeadersAndBody/>
- <sp:EncryptBeforeSigning/>
- </wsp:Policy>
- </sp:AsymmetricBinding>
- <sp:SignedParts>
- <sp:Body/>
- </sp:SignedParts>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:Wss10>
- <wsp:Policy>
- <sp:MustSupportRefIssuerSerial/>
- </wsp:Policy>
- </sp:Wss10>
- </wsp:All>
- </wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/My-WSSE-conf-BINDING.xml (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/My-WSSE-conf-BINDING.xml)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/My-WSSE-conf-BINDING.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/My-WSSE-conf-BINDING.xml 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="My-WSSE-conf_binding_policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding>
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:WssX509V1Token11/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V1Token11/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256Rsa15/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:ProtectTokens/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:EncryptBeforeSigning/>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:Wss10>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ </wsp:Policy>
+ </sp:Wss10>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore
===================================================================
--- stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 07:48:59 UTC (rev 17672)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 09:08:07 UTC (rev 17673)
@@ -1 +0,0 @@
-My-WSSE-conf
\ No newline at end of file
Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore (from rev 17672, stack/cxf/branches/JBWS-3648/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore)
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.policy.PolicyAttachmentStore 2013-06-14 09:08:07 UTC (rev 17673)
@@ -0,0 +1 @@
+My-WSSE-conf
\ No newline at end of file
12 years, 4 months
- 1
- 0