[jboss-cvs] Picketbox SVN: r192 - in trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security: auth/certs and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2011-04-15 15:20:31 -0400 (Fri, 15 Apr 2011)
New Revision: 192

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/CertificatePrincipal.java
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SerialNumberIssuerDNMapping.java
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SubjectCNMapping.java
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SubjectDNMapping.java
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SubjectX500Principal.java
Log:
fixing method name

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/CertificatePrincipal.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/CertificatePrincipal.java	2011-04-15 19:19:42 UTC (rev 191)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/CertificatePrincipal.java	2011-04-15 19:20:31 UTC (rev 192)
@@ -37,6 +37,16 @@
     *
     * @param certs Array of client certificates, with the first one in
     * the array being the certificate of the client itself.
+    * @deprecated method kept for backward compatibility. Use toPrincipal(X509Certificate[]) instead.
     */
    public Principal toPrinicipal(X509Certificate[] certs);
+   
+   /**
+    * Return the Principal associated with the specified chain of X509
+    * client certificates.  If there is none, return <code>null</code>.
+    *
+    * @param certs Array of client certificates, with the first one in
+    * the array being the certificate of the client itself.
+    */
+   public Principal toPrincipal(X509Certificate[] certs);
 }

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SerialNumberIssuerDNMapping.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SerialNumberIssuerDNMapping.java	2011-04-15 19:19:42 UTC (rev 191)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SerialNumberIssuerDNMapping.java	2011-04-15 19:20:31 UTC (rev 192)
@@ -43,11 +43,16 @@
     * @param certs Array of client certificates, with the first one in
     * the array being the certificate of the client itself.
     */
-   public Principal toPrinicipal(X509Certificate[] certs)
+   public Principal toPrincipal(X509Certificate[] certs)
    {
       BigInteger serialNumber = certs[0].getSerialNumber();
       Principal issuer = certs[0].getIssuerDN();
       SimplePrincipal principal = new SimplePrincipal(serialNumber+" "+issuer);
       return principal;
    }
+   
+   public Principal toPrinicipal(X509Certificate[] certs)
+   {
+      return toPrincipal(certs);
+   }
 }

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SubjectCNMapping.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SubjectCNMapping.java	2011-04-15 19:19:42 UTC (rev 191)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SubjectCNMapping.java	2011-04-15 19:20:31 UTC (rev 192)
@@ -42,7 +42,7 @@
     * @param certs Array of client certificates, with the first one in
     * the array being the certificate of the client itself.
     */
-   public Principal toPrinicipal(X509Certificate[] certs)
+   public Principal toPrincipal(X509Certificate[] certs)
    {
       Principal cn = null;
       Principal subject = certs[0].getSubjectDN();
@@ -64,4 +64,9 @@
       }
       return cn;
    }
+   
+   public Principal toPrinicipal(X509Certificate[] certs)
+   {
+      return toPrincipal(certs);
+   }
 }

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SubjectDNMapping.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SubjectDNMapping.java	2011-04-15 19:19:42 UTC (rev 191)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SubjectDNMapping.java	2011-04-15 19:20:31 UTC (rev 192)
@@ -42,7 +42,7 @@
     * @param certs Array of client certificates, with the first one in
     * the array being the certificate of the client itself.
     */
-   public Principal toPrinicipal(X509Certificate[] certs)
+   public Principal toPrincipal(X509Certificate[] certs)
    {
       Principal subject = certs[0].getSubjectDN();
       // Convert to a serializable principal
@@ -54,4 +54,9 @@
 
       return subject;
    }
+   
+   public Principal toPrinicipal(X509Certificate[] certs)
+   {
+      return toPrincipal(certs);
+   }
 }

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SubjectX500Principal.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SubjectX500Principal.java	2011-04-15 19:19:42 UTC (rev 191)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/certs/SubjectX500Principal.java	2011-04-15 19:20:31 UTC (rev 192)
@@ -40,9 +40,14 @@
     * @param certs Array of client certificates, with the first one in
     * the array being the certificate of the client itself.
     */
-   public Principal toPrinicipal(X509Certificate[] certs)
+   public Principal toPrincipal(X509Certificate[] certs)
    {
       Principal subject = certs[0].getSubjectX500Principal();
       return subject;
    }
+   
+   public Principal toPrinicipal(X509Certificate[] certs)
+   {
+      return toPrincipal(certs);
+   }
 }