svn commit: r1485265 - in /cxf/trunk/services/xkms/xkms-service/src/main/java/org/apache/cxf/xkms/service: XKMSResponseFactory.java XKMSService.java

[ashakirin]

Author: ashakirin
Date: Wed May 22 16:09:35 2013
New Revision: 1485265

URL: http://svn.apache.org/r1485265
Log:
Fixed [CXF-5029]. XKMS: id and RequestId attributes are not schema compatible

Modified:
    
cxf/trunk/services/xkms/xkms-service/src/main/java/org/apache/cxf/xkms/service/XKMSResponseFactory.java
    
cxf/trunk/services/xkms/xkms-service/src/main/java/org/apache/cxf/xkms/service/XKMSService.java

Modified: 
cxf/trunk/services/xkms/xkms-service/src/main/java/org/apache/cxf/xkms/service/XKMSResponseFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-service/src/main/java/org/apache/cxf/xkms/service/XKMSResponseFactory.java?rev=1485265&r1=1485264&r2=1485265&view=diff
==============================================================================
--- 
cxf/trunk/services/xkms/xkms-service/src/main/java/org/apache/cxf/xkms/service/XKMSResponseFactory.java
 (original)
+++ 
cxf/trunk/services/xkms/xkms-service/src/main/java/org/apache/cxf/xkms/service/XKMSResponseFactory.java
 Wed May 22 16:09:35 2013
@@ -103,7 +103,7 @@ public final class XKMSResponseFactory {
      * @return Returns generated random UUID
      */
     public static String generateUniqueID() {
-        return UUID.randomUUID().toString();
+        return "I" + UUID.randomUUID().getMostSignificantBits();
     }
 
 }

Modified: 
cxf/trunk/services/xkms/xkms-service/src/main/java/org/apache/cxf/xkms/service/XKMSService.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-service/src/main/java/org/apache/cxf/xkms/service/XKMSService.java?rev=1485265&r1=1485264&r2=1485265&view=diff
==============================================================================
--- 
cxf/trunk/services/xkms/xkms-service/src/main/java/org/apache/cxf/xkms/service/XKMSService.java
 (original)
+++ 
cxf/trunk/services/xkms/xkms-service/src/main/java/org/apache/cxf/xkms/service/XKMSService.java
 Wed May 22 16:09:35 2013
@@ -21,7 +21,6 @@ package org.apache.cxf.xkms.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -241,7 +240,7 @@ public class XKMSService implements XKMS
     // TODO refactoring into factory class?
     public static KeyBindingType createKeyBinding(ValidateResultType result) {
         KeyBindingType binding = new KeyBindingType();
-        binding.setId(UUID.randomUUID().toString());
+        binding.setId(XKMSResponseFactory.generateUniqueID());
         result.getKeyBinding().add(binding);
 
         StatusType status = new StatusType();