You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by na...@apache.org on 2008/02/12 08:18:22 UTC
svn commit: r620715 - in /webservices/rampart/trunk/java/modules:
rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
rampart-policy/src/main/java/org/apache/ws/secpolicy/WSSPolicyException.java
Author: nandana
Date: Mon Feb 11 23:18:21 2008
New Revision: 620715
URL: http://svn.apache.org/viewvc?rev=620715&view=rev
Log:
Fixing the issue http://issues.apache.org/jira/browse/RAMPART-139.
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/WSSPolicyException.java
Modified: webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java?rev=620715&r1=620714&r2=620715&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java Mon Feb 11 23:18:21 2008
@@ -314,7 +314,8 @@
token = binding.getEncryptionToken();
Assertion token1 = binding.getSignatureToken();
if (token == null && token1 == null) {
- // this is an error - throw something
+ throw new WSSPolicyException("Symmetric binding should have a Protection token or" +
+ " both Signature and Encryption tokens defined");
}
rpd.setEncryptionToken(
((EncryptionToken) token).getEncryptionToken());
@@ -335,7 +336,8 @@
TokenWrapper tokWrapper = binding.getRecipientToken();
TokenWrapper tokWrapper1 = binding.getInitiatorToken();
if (tokWrapper == null && tokWrapper1 == null) {
- // this is an error - throw something
+ throw new WSSPolicyException("Asymmetric binding should have both Initiator and " +
+ "Recipient tokens defined");
}
rpd.setRecipientToken(((RecipientToken) tokWrapper).getReceipientToken());
rpd.setInitiatorToken(((InitiatorToken) tokWrapper1).getInitiatorToken());
Modified: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/WSSPolicyException.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/WSSPolicyException.java?rev=620715&r1=620714&r2=620715&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/WSSPolicyException.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/WSSPolicyException.java Mon Feb 11 23:18:21 2008
@@ -19,7 +19,7 @@
public class WSSPolicyException extends Exception {
private static final long serialVersionUID = 5904800255533588133L;
-
+
public WSSPolicyException(String message, Throwable e) {
super(message, e);
}