Author: ruchithf
Date: Tue Sep 26 05:59:39 2006
New Revision: 450037
URL: http://svn.apache.org/viewvc?view=rev&rev=450037
Log:
Added a key in ConverstionConstants to hold the map of services and context ids
Fixed getProcessor method to return null when the processor is not found - this
used to return the last processor of which the id was compared
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/WSDocInfo.java
webservices/wss4j/trunk/src/org/apache/ws/security/conversation/ConversationConstants.java
webservices/wss4j/trunk/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/WSDocInfo.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/WSDocInfo.java?view=diff&rev=450037&r1=450036&r2=450037
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/WSDocInfo.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/WSDocInfo.java Tue Sep
26 05:59:39 2006
@@ -96,21 +96,21 @@
*/
public Processor getProcessor(String id) {
- if (id == null) {
- return null;
- }
+ if (id == null) {
+ return null;
+ }
- Processor p = null;
+ Processor p = null;
if (processors != null) {
for (Enumeration e = processors.elements(); e.hasMoreElements();) {
p = (Processor) e.nextElement();
String cId = p.getId();
if (id.equals(cId)) {
- break;
+ return p;
}
}
}
- return p;
+ return null;
}
/**
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/conversation/ConversationConstants.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/conversation/ConversationConstants.java?view=diff&rev=450037&r1=450036&r2=450037
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/conversation/ConversationConstants.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/conversation/ConversationConstants.java
Tue Sep 26 05:59:39 2006
@@ -126,6 +126,13 @@
public final static String DEFAULT_LABEL = "WS-SecureConversation";
+ /**
+ * Key to hod the map of security context identifiers against the
+ * service epr addresses (service scope) or wsa:Action values (operation
+ * scope).
+ */
+ public final static String KEY_CONTEXT_MAP = "contextMap";
+
public interface DerivationAlgorithm {
public final static String P_SHA_1 =
"http://schemas.xmlsoap.org/ws/2005/02/sc/dk/p_sha1";;
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java?view=diff&rev=450037&r1=450036&r2=450037
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java
Tue Sep 26 05:59:39 2006
@@ -120,8 +120,7 @@
if(processor == null) {
//Now use the callback and get it
this.secret = this.getSecret(cb, uri.substring(1));
- }
- if (processor instanceof EncryptedKeyProcessor) {
+ }else if (processor instanceof EncryptedKeyProcessor) {
this.secret = ((EncryptedKeyProcessor) processor)
.getDecryptedBytes();
} else if (processor instanceof SecurityContextTokenProcessor) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
