svn commit: r1501314 - in /cxf/trunk/services/xkms: README.txt xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java xkms-service/src/main/java/org/apache/cxf/xkms/service/XKMSService.java

[co...@apache.org]

Author: coheigea
Date: Tue Jul  9 15:06:14 2013
New Revision: 1501314

URL: http://svn.apache.org/r1501314
Log:
Some minor XKMS cleanup

Modified:
    cxf/trunk/services/xkms/README.txt
    cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java
    cxf/trunk/services/xkms/xkms-service/src/main/java/org/apache/cxf/xkms/service/XKMSService.java

Modified: cxf/trunk/services/xkms/README.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/README.txt?rev=1501314&r1=1501313&r2=1501314&view=diff
==============================================================================
--- cxf/trunk/services/xkms/README.txt (original)
+++ cxf/trunk/services/xkms/README.txt Tue Jul  9 15:06:14 2013
@@ -1,14 +1,14 @@
 
-This folder contains the XKMS (XML key Management Service) implementation of 
+This folder contains the XKMS (XML Key Management Service) implementation of 
 Apache CXF. It contains:
 
 
 xkms-client - The XKMS client and invoker implementations
-xkms--common - Common functionality, XML schemas, generated code
+xkms-common - Common functionality, XML schemas, generated code
 xkms-service - The XKMS core service implementation
 xkms-x509-handlers - The implementation of pluggable commands for X509 keys.
 xkms-features - Karaf features for XKMS client and service
-xkms-itests - Intergation tests
+xkms-itests - Integration tests
 xkms-osgi - OSGi blueprint configuration for OSGi deployment
 xkms-war - Web spring configuration for Web depoyment
 

Modified: cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java?rev=1501314&r1=1501313&r2=1501314&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java (original)
+++ cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java Tue Jul  9 15:06:14 2013
@@ -25,6 +25,7 @@ import java.security.cert.CertificateExc
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
@@ -76,8 +77,7 @@ public class XKMSInvoker {
     }
     
     public X509Certificate getCertificateForId(Applications application, String id) {
-        List<X509AppId> ids = new ArrayList<X509AppId>();
-        ids.add(new X509AppId(application, id));
+        List<X509AppId> ids = Collections.singletonList(new X509AppId(application, id));
         return getCertificate(ids);
     }
     

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=1501314&r1=1501313&r2=1501314&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 Tue Jul  9 15:06:14 2013
@@ -291,11 +291,11 @@ public class XKMSService implements XKMS
     }
 
     /**
-     * Sets encryption, signature and exchang as key usage for provided keyBinding.
+     * Sets encryption, signature and exchange as key usage for provided keyBinding.
      *
      * @param keyBinding KeyBinding to set KeyUsage within
      */
-    protected void setKeyUssageAll(KeyBindingAbstractType keyBinding) {
+    protected void setKeyUsageAll(KeyBindingAbstractType keyBinding) {
         keyBinding.getKeyUsage().add(KeyUsageEnum.HTTP_WWW_W_3_ORG_2002_03_XKMS_ENCRYPTION);
         keyBinding.getKeyUsage().add(KeyUsageEnum.HTTP_WWW_W_3_ORG_2002_03_XKMS_SIGNATURE);
         keyBinding.getKeyUsage().add(KeyUsageEnum.HTTP_WWW_W_3_ORG_2002_03_XKMS_EXCHANGE);