svn commit: r1445275 - in /webservices/wss4j/trunk: ws-security-dom/src/main/java/org/apache/ws/security/dom/ ws-security-stax/src/test/java/org/apache/ws/security/stax/test/

[coheigea]

Author: coheigea
Date: Tue Feb 12 17:13:37 2013
New Revision: 1445275

URL: http://svn.apache.org/r1445275
Log:
Updating WSS4J's IdAllocator

Modified:
    
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/WSSConfig.java
    
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/AbstractTestBase.java
    
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/SignatureCRLTest.java

Modified: 
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/WSSConfig.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/WSSConfig.java?rev=1445275&r1=1445274&r2=1445275&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/WSSConfig.java
 (original)
+++ 
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/WSSConfig.java
 Tue Feb 12 17:13:37 2013
@@ -312,8 +312,9 @@ public class WSSConfig {
         }
         public String createId(String prefix, Object o) {
             if (prefix == null) {
-                return next();
+                return "_" + next();
             }
+            
             return prefix + next();
         }
 

Modified: 
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/AbstractTestBase.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/AbstractTestBase.java?rev=1445275&r1=1445274&r2=1445275&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/AbstractTestBase.java
 (original)
+++ 
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/AbstractTestBase.java
 Tue Feb 12 17:13:37 2013
@@ -193,25 +193,8 @@ public abstract class AbstractTestBase {
         requestData.setMsgContext(messageContext);
         requestData.setNoSerialization(true);
         requestData.setCallbackHandler(new WSS4JCallbackHandlerImpl());
-        //we have to set a custom IDAllocator until WSS4J-DOM is fixed. WSS4J 
generates invalid id's. (wsu:id's must start with a letter)
         requestData.setWssConfig(WSSConfig.getNewInstance());
-        requestData.getWssConfig().setIdAllocator(new WsuIdAllocator() {
-            @Override
-            public String createId(String prefix, Object o) {
-                return createSecureId(prefix, o);
-            }
-
-            @Override
-            public String createSecureId(String prefix, Object o) {
-                String id = UUID.randomUUID().toString();
-                if (prefix != null) {
-                    return prefix + id;
-                } else {
-                    return "G" + id;
-                }
-            }
-        });
-
+  
         wss4JHandler.doSender(messageContext, requestData, true);
 
         return messageContext;

Modified: 
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/SignatureCRLTest.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/SignatureCRLTest.java?rev=1445275&r1=1445274&r2=1445275&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/SignatureCRLTest.java
 (original)
+++ 
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/SignatureCRLTest.java
 Tue Feb 12 17:13:37 2013
@@ -162,24 +162,6 @@ public class SignatureCRLTest extends Ab
         requestData.setMsgContext(messageContext);
         requestData.setNoSerialization(true);
         requestData.setCallbackHandler(new WSS4JCallbackHandlerImpl());
-        //we have to set a custom IDAllocator until WSS4J-DOM is fixed. WSS4J 
generates invalid id's. (wsu:id's must start with a letter)
-        requestData.setWssConfig(WSSConfig.getNewInstance());
-        requestData.getWssConfig().setIdAllocator(new WsuIdAllocator() {
-            @Override
-            public String createId(String prefix, Object o) {
-                return createSecureId(prefix, o);
-            }
-
-            @Override
-            public String createSecureId(String prefix, Object o) {
-                String id = UUID.randomUUID().toString();
-                if (prefix != null) {
-                    return prefix + id;
-                } else {
-                    return "G" + id;
-                }
-            }
-        });
 
         wss4JHandler.doSender(messageContext, requestData, true);