directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r993020 - in /directory/shared/trunk: i18n/src/main/java/org/apache/directory/shared/i18n/ i18n/src/main/resources/org/apache/directory/shared/i18n/ ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/
Date Mon, 06 Sep 2010 13:19:20 GMT
Author: elecharny
Date: Mon Sep  6 13:19:20 2010
New Revision: 993020

URL: http://svn.apache.org/viewvc?rev=993020&view=rev
Log:
Reviewed the ldap-constants classes

Modified:
    directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
    directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/AuthenticationLevel.java
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/JndiPropertyConstants.java
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/LdapSecurityConstants.java
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/Loggers.java
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/PasswordPolicySchemaConstants.java
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SaslQoP.java
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SupportedSaslMechanisms.java

Modified: directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java?rev=993020&r1=993019&r2=993020&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java (original)
+++ directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java Mon
Sep  6 13:19:20 2010
@@ -623,7 +623,7 @@ public enum I18n
     ERR_04486_VALUE_ALREADY_EXISTS( "ERR_04486_VALUE_ALREADY_EXISTS" ),
     
     // ldap-constants
-    ERR_05001( "ERR_05001" ),
+    ERR_05001_UNKNOWN_AUTHENT_LEVEL( "ERR_05001_UNKNOWN_AUTHENT_LEVEL" ),
 
     // ldap-converter
     ERR_06001( "ERR_06001" ),

Modified: directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties?rev=993020&r1=993019&r2=993020&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
(original)
+++ directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
Mon Sep  6 13:19:20 2010
@@ -611,7 +611,7 @@ ERR_04485_COLLECTIVE_NOT_ALLOWED_IN_MAY=
 ERR_04486_VALUE_ALREADY_EXISTS=The value ''{0}'' already exists in the attribute ({1})
 
 # ldap-constants
-ERR_05001=Unknown AuthenticationLevel {0}
+ERR_05001_UNKNOWN_AUTHENT_LEVEL=Unknown AuthenticationLevel {0}
 
 # ldap-converter
 ERR_06001=The schemaObject is either null or is empty!

Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/AuthenticationLevel.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/AuthenticationLevel.java?rev=993020&r1=993019&r2=993020&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/AuthenticationLevel.java
(original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/AuthenticationLevel.java
Mon Sep  6 13:19:20 2010
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.constants;
 
+
 import org.apache.directory.shared.i18n.I18n;
 
 
@@ -30,6 +31,7 @@ import org.apache.directory.shared.i18n.
  * <li>SIMPLE : Simple authentication</li>
  * <li>STRONG : SASL or external authentication</li>
  * <li>UNAUTHENT>A special case when just doing some auditing</li>
+ * </ul>
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -38,37 +40,45 @@ public enum AuthenticationLevel
     /**
      * No authentication (anonymous access)
      */
-    NONE( 0, "none" ),
+    NONE(0, "none"),
 
     /**
      * Simple authentication (bound with plain-text credentials)
      */
-    SIMPLE( 1, "simple" ),
+    SIMPLE(1, "simple"),
 
     /**
      * Strong authentication (bound with encrypted credentials)
      */
-    STRONG( 2, "strong" ),
-    
+    STRONG(2, "strong"),
+
     /**
      * Unauthentication, if the BIND contains a DN but no credentials
      */
-    UNAUTHENT( 3, "unauthent" );
-    
+    UNAUTHENT(3, "unauthent");
+
     /** The internal numeric value */
     private int level;
-    
+
     /** The level name */
     private final String name;
 
+
+    /**
+     * Creates a new instance of AuthenticationLevel.
+     *
+     * @param level The level
+     * @param name The associated name
+     */
     private AuthenticationLevel( int level, String name )
     {
         this.level = level;
         this.name = name;
     }
 
+
     /**
-     * Returns the integer value of this level (greater value, stronger level).
+     * @return the integer value of this level (greater value, stronger level).
      */
     public int getLevel()
     {
@@ -77,7 +87,7 @@ public enum AuthenticationLevel
 
 
     /**
-     * Returns the name of this level.
+     * @return the name of this level.
      */
     public String getName()
     {
@@ -103,18 +113,22 @@ public enum AuthenticationLevel
      */
     public static AuthenticationLevel getLevel( int val )
     {
-        switch( val )
+        switch ( val )
         {
-            case 0: return NONE;
-            
-            case 1: return SIMPLE;
-            
-            case 2: return STRONG;
-            
-            case 3: return UNAUTHENT;
-            
+            case 0:
+                return NONE;
+
+            case 1:
+                return SIMPLE;
+
+            case 2:
+                return STRONG;
+
+            case 3:
+                return UNAUTHENT;
+
             default:
-                throw new IllegalArgumentException( I18n.err(I18n.ERR_05001, val ) );
+                throw new IllegalArgumentException( I18n.err( I18n.ERR_05001_UNKNOWN_AUTHENT_LEVEL,
val ) );
         }
     }
 }

Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/JndiPropertyConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/JndiPropertyConstants.java?rev=993020&r1=993019&r2=993020&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/JndiPropertyConstants.java
(original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/JndiPropertyConstants.java
Mon Sep  6 13:19:20 2010
@@ -20,51 +20,117 @@
 
 package org.apache.directory.shared.ldap.constants;
 
+
 /**
  * This class contains all the Ldap specific properties described in the JNDI API.
  * See http://java.sun.com/j2se/1.5.0/docs/guide/jndi/jndi-ldap-gl.html
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class JndiPropertyConstants
+public interface JndiPropertyConstants
 {
     // Pure JNDI properties
-    public static final String JNDI_BATCHSIZE = "java.naming.batchsize";
-    public static final String JNDI_FACTORY_CONTROL = "java.naming.factory.control";
-    public static final String JNDI_FACTORY_INITIAL = "java.naming.factory.initial";
-    public static final String JNDI_FACTORY_OBJECT = "java.naming.factory.object";
-    public static final String JNDI_FACTORY_STATE = "java.naming.factory.state";
-    public static final String JNDI_LANGUAGE = "java.naming.language";
-    public static final String JNDI_PROVIDER_URL = "java.naming.provider.url";
-    public static final String JNDI_REFERRAL = "java.naming.referral";
-    public static final String JNDI_SECURITY_AUTHENTICATION = "java.naming.security.authentication";
-    public static final String JNDI_SECURITY_CREDENTIALS = "java.naming.security.credentials";
-    public static final String JNDI_SECURITY_PRINCIPAL = "java.naming.security.principal";
-    public static final String JNDI_SECURITY_PROTOCOL = "java.naming.security.protocol";
-    
+    /** Batch size of search results returned */
+    String JNDI_BATCHSIZE = "java.naming.batchsize";
+
+    /** List of FQCNs of the control factory classes */
+    String JNDI_FACTORY_CONTROL = "java.naming.factory.control";
+
+    /** FQCN of the factory creating the InitialContext */
+    String JNDI_FACTORY_INITIAL = "java.naming.factory.initial";
+
+    /** List of FQCNs of the Object factory */
+    String JNDI_FACTORY_OBJECT = "java.naming.factory.object";
+
+    /** List of FQCNs of the state factory */
+    String JNDI_FACTORY_STATE = "java.naming.factory.state";
+
+    /** The Language to use */
+    String JNDI_LANGUAGE = "java.naming.language";
+
+    /** The list of URL pointing to a LDAP server */
+    String JNDI_PROVIDER_URL = "java.naming.provider.url";
+
+    /** Tells how the referral should be handled */
+    String JNDI_REFERRAL = "java.naming.referral";
+
+    /** The Authentication mechanism */
+    String JNDI_SECURITY_AUTHENTICATION = "java.naming.security.authentication";
+
+    /** The credentials */
+    String JNDI_SECURITY_CREDENTIALS = "java.naming.security.credentials";
+
+    /** The Principal */
+    String JNDI_SECURITY_PRINCIPAL = "java.naming.security.principal";
+
+    /** The security protocol to use */
+    String JNDI_SECURITY_PROTOCOL = "java.naming.security.protocol";
+
     // Ldap specific properties
-    public static final String JNDI_LDAP_ATTRIBUTES_BINARY = "java.naming.ldap.attributes.binary";
-    public static final String JNDI_LDAP_CONTROL_CONNECT = "java.naming.ldap.control.connect";
-    public static final String JNDI_LDAP_DELETE_RDN = "java.naming.ldap.deleteRDN";
-    public static final String JNDI_LDAP_DAP_DEREF_ALIASES = "java.naming.ldap.derefAliases";
-    public static final String JNDI_FACTORY_SOCKET = "java.naming.ldap.factory.socket";
-    public static final String JNDI_LDAP_REF_SEPARATOR = "java.naming.ldap.ref.separator";
-    public static final String JNDI_LDAP_REFERRAL_LIMIT = "java.naming.ldap.referral.limit";
-    public static final String JNDI_LDAP_TYPES_ONLY = "java.naming.ldap.typesOnly";
-    public static final String JNDI_LDAP_VERSION = "java.naming.ldap.version";
-    
+    /** The list of binary attributes */
+    String JNDI_LDAP_ATTRIBUTES_BINARY = "java.naming.ldap.attributes.binary";
+
+    /** The controls to send when connectiong */
+    String JNDI_LDAP_CONTROL_CONNECT = "java.naming.ldap.control.connect";
+
+    /** Tells if the old RDN must be deleted when doing a MODDN */
+    String JNDI_LDAP_DELETE_RDN = "java.naming.ldap.deleteRDN";
+
+    /** Tells if and how we dereference aliases */
+    String JNDI_LDAP_DAP_DEREF_ALIASES = "java.naming.ldap.derefAliases";
+
+    /** The FQCN of the socket factory to use to connect to the server */
+    String JNDI_FACTORY_SOCKET = "java.naming.ldap.factory.socket";
+
+    /** The separator to use when dealing with RefAddr */
+    String JNDI_LDAP_REF_SEPARATOR = "java.naming.ldap.ref.separator";
+
+    /** The maximum number of referral to follow in a chain of referrals */
+    String JNDI_LDAP_REFERRAL_LIMIT = "java.naming.ldap.referral.limit";
+
+    /** tells that we want the attributeTypes only to be returned */
+    String JNDI_LDAP_TYPES_ONLY = "java.naming.ldap.typesOnly";
+
+    /** Specifies the LDAP version to use */
+    String JNDI_LDAP_VERSION = "java.naming.ldap.version";
+
     // SASL properties
-    public static final String JNDI_SASL_AUTHORIZATION_ID = "java.naming.security.sasl.authorizationId";
-    public static final String JNDI_SASL_REALM = "java.naming.security.sasl.realm";
-    public static final String JNDI_SASL_CALLBACK = "java.naming.security.sasl.callback";
-    public static final String JNDI_SASL_QOP = "javax.security.sasl.qop";
-    public static final String JNDI_SASL_STRENGTH = "javax.security.sasl.strength";
-    public static final String JNDI_SASL_MAX_BUFFER = "javax.security.sasl.maxbuffer";
-    public static final String JNDI_SASL_AUTHENTICATION = "javax.security.sasl.server.authentication";
-    public static final String JNDI_SASL_POLICY_FORWARD = "javax.security.sasl.policy.forward";
-    public static final String JNDI_SASL_POLICY_CREDENTIALS = "javax.security.sasl.policy.credentials";
-    public static final String JNDI_SASL_POLICY_NO_PLAIN_TEXT = "javax.security.sasl.policy.noplaintext";
-    public static final String JNDI_SASL_POLICY_NO_ACTIVE = "javax.security.sasl.policy.noactive";
-    public static final String JNDI_SASL_POLICY_NO_DICTIONARY = "javax.security.sasl.policy.nodictionary";
-    public static final String JNDI_SASL_POLICY_NO_ANONYMOUS = "javax.security.sasl.policy.noanonymous";
+    /** The SASL authorization ID */
+    String JNDI_SASL_AUTHORIZATION_ID = "java.naming.security.sasl.authorizationId";
+
+    /** The SASL Realm */
+    String JNDI_SASL_REALM = "java.naming.security.sasl.realm";
+
+    /** An instance of CallbackHandler to use when required */
+    String JNDI_SASL_CALLBACK = "java.naming.security.sasl.callback";
+
+    /** The SASL Quality Of Protection value */
+    String JNDI_SASL_QOP = "javax.security.sasl.qop";
+
+    /** The cipher strength */
+    String JNDI_SASL_STRENGTH = "javax.security.sasl.strength";
+
+    /** The maximum size of the receive buffer */
+    String JNDI_SASL_MAX_BUFFER = "javax.security.sasl.maxbuffer";
+
+    /** Tells if the the server must authenticate the client */
+    String JNDI_SASL_AUTHENTICATION = "javax.security.sasl.server.authentication";
+
+    /** Tells if the server must support forward secrecy */
+    String JNDI_SASL_POLICY_FORWARD = "javax.security.sasl.policy.forward";
+
+    /** Tells if the server must require some credentials */
+    String JNDI_SASL_POLICY_CREDENTIALS = "javax.security.sasl.policy.credentials";
+
+    /** Tells if the server allow Plain text mechanism */
+    String JNDI_SASL_POLICY_NO_PLAIN_TEXT = "javax.security.sasl.policy.noplaintext";
+
+    /** Tells if the SASL mechanism is protected against active attacks */
+    String JNDI_SASL_POLICY_NO_ACTIVE = "javax.security.sasl.policy.noactive";
+
+    /** Tells if the SASL mechanism is protected against dictionary attacks */
+    String JNDI_SASL_POLICY_NO_DICTIONARY = "javax.security.sasl.policy.nodictionary";
+
+    /** Tells if the SASL mechanism accept or not anonymous connections */
+    String JNDI_SASL_POLICY_NO_ANONYMOUS = "javax.security.sasl.policy.noanonymous";
 }

Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/LdapSecurityConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/LdapSecurityConstants.java?rev=993020&r1=993019&r2=993020&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/LdapSecurityConstants.java
(original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/LdapSecurityConstants.java
Mon Sep  6 13:19:20 2010
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.constants;
 
+
 /**
  * An enum to store all the security constants used in the server
  *
@@ -26,37 +27,48 @@ package org.apache.directory.shared.ldap
  */
 public enum LdapSecurityConstants
 {
-    HASH_METHOD_SHA( "sha" ),
+    /** The SHA encryption method */
+    HASH_METHOD_SHA("sha"),
+
+    /** The Salted SHA encryption method */
+    HASH_METHOD_SSHA("ssha"),
 
-    HASH_METHOD_SSHA( "ssha" ),
+    /** The MD5 encryption method */
+    HASH_METHOD_MD5("md5"),
 
-    HASH_METHOD_MD5( "md5" ),
+    /** The Salter MD5 encryption method */
+    HASH_METHOD_SMD5("smd5"),
 
-    HASH_METHOD_SMD5( "smd5" ),
+    /** The crypt encryption method */
+    HASH_METHOD_CRYPT("crypt"),
 
-    HASH_METHOD_CRYPT( "crypt" ),
+    /** The SHA-256 encryption method */
+    HASH_METHOD_SHA256("sha-256");
 
-    HASH_METHOD_SHA256( "sha-256" );
-    
+    /** The associated name */
     private String name;
-    
+
+
     /**
      * Creates a new instance of LdapSecurityConstants.
+     * 
+     * @param name the associated name
      */
     private LdapSecurityConstants( String name )
     {
         this.name = name;
     }
 
+
     /**
-     * Return the name associated with the constant.
+     * @return the name associated with the constant.
      */
     public String getName()
     {
         return name;
     }
-    
-    
+
+
     /**
      * Get the associated constant from a string
      *
@@ -65,8 +77,13 @@ public enum LdapSecurityConstants
      */
     public static LdapSecurityConstants getAlgorithm( String name )
     {
-        String algorithm = ( name == null ? "" : name.toLowerCase() );
-        
+        String algorithm = "";
+
+        if ( name != null )
+        {
+            algorithm = name.toLowerCase();
+        }
+
         if ( HASH_METHOD_SHA.getName().equalsIgnoreCase( algorithm ) )
         {
             return HASH_METHOD_SHA;
@@ -86,17 +103,17 @@ public enum LdapSecurityConstants
         {
             return HASH_METHOD_SMD5;
         }
-        
+
         if ( HASH_METHOD_CRYPT.getName().equalsIgnoreCase( algorithm ) )
         {
             return HASH_METHOD_CRYPT;
         }
-        
+
         if ( HASH_METHOD_SHA256.getName().equalsIgnoreCase( algorithm ) )
         {
             return HASH_METHOD_SHA256;
         }
-        
+
         return null;
     }
 }

Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/Loggers.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/Loggers.java?rev=993020&r1=993019&r2=993020&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/Loggers.java
(original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/Loggers.java
Mon Sep  6 13:19:20 2010
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.constants;
 
+
 /**
  * An enum defining a list of dedicated loggers, used for debugging
  * purpose :
@@ -26,30 +27,31 @@ package org.apache.directory.shared.ldap
  * - (more to come)
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$, $Date$
  */
 public enum Loggers
 {
-    ACI_LOG( "aci-logger" );
+    /** The dedicated logger for ACIs */
+    ACI_LOG("aci-logger");
 
+    /** The associated name */
     private String name;
-    
+
+
     /**
      * Creates a new instance of LdapSecurityConstants.
+     * @param name the associated name
      */
     private Loggers( String name )
     {
         this.name = name;
     }
-    
-    
+
+
     /**
-     * Return the name associated with the constant.
+     * eturn the name associated with the constant.
      */
     public String getName()
     {
         return name;
     }
-    
-    
 }

Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java?rev=993020&r1=993019&r2=993020&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java
(original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java
Mon Sep  6 13:19:20 2010
@@ -26,14 +26,12 @@ package org.apache.directory.shared.ldap
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 //This will suppress PMD.AvoidUsingHardCodedIP warnings in this class
-@SuppressWarnings("PMD.AvoidUsingHardCodedIP")
 public interface MetaSchemaConstants
 {
     String SCHEMA_NAME = "apachemeta";
     String SCHEMA_OTHER = "other";
 
     // -- objectClass names --
-    
     String META_TOP_OC                      = "metaTop";
     String META_TOP_OC_OID                  = "1.3.6.1.4.1.18060.0.4.0.3.1";
     

Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/PasswordPolicySchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/PasswordPolicySchemaConstants.java?rev=993020&r1=993019&r2=993020&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/PasswordPolicySchemaConstants.java
(original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/PasswordPolicySchemaConstants.java
Mon Sep  6 13:19:20 2010
@@ -21,7 +21,7 @@
 package org.apache.directory.shared.ldap.constants;
 
 /**
- *  PasswordPolicySchemaConstants.
+ * PasswordPolicySchemaConstants.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SaslQoP.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SaslQoP.java?rev=993020&r1=993019&r2=993020&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SaslQoP.java
(original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SaslQoP.java
Mon Sep  6 13:19:20 2010
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.constants;
 
+
 /**
  * Contains constants used for populating the SASL QoP 
  * in the RootDSE.
@@ -27,9 +28,15 @@ package org.apache.directory.shared.ldap
  */
 public interface SaslQoP
 {
+    /** The supported QOP attribute */
     String ATTRIBUTE = "supportedQoP";
 
+    /** Authentication only */
     String QOP_AUTH      = "auth" ;
+
+    /** Authentication with integrity protection */
     String QOP_AUTH_INT  = "auth-int" ;
+
+    /** Authentication with integrity and privacy protection */
     String QOP_AUTH_CONF = "auth-conf" ;
 }

Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java?rev=993020&r1=993019&r2=993020&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
(original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
Mon Sep  6 13:19:20 2010
@@ -27,8 +27,6 @@ package org.apache.directory.shared.ldap
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// This will suppress PMD.AvoidUsingHardCodedIP warnings in this class
-@SuppressWarnings("PMD.AvoidUsingHardCodedIP")
 public interface SchemaConstants
 {
     // SchemaEntity names

Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SupportedSaslMechanisms.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SupportedSaslMechanisms.java?rev=993020&r1=993019&r2=993020&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SupportedSaslMechanisms.java
(original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SupportedSaslMechanisms.java
Mon Sep  6 13:19:20 2010
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.constants;
 
+
 /**
  * Contains constants used for populating the supportedSASLMechanisms 
  * in the RootDSE.
@@ -27,13 +28,21 @@ package org.apache.directory.shared.ldap
  */
 public interface SupportedSaslMechanisms
 {
+    /** CRAM-MD5 mechanism */
     String CRAM_MD5 = "CRAM-MD5";
+
+    /** DIGEST_MD5-MD5 mechanism */
     String DIGEST_MD5 = "DIGEST-MD5";
+
+    /** GSSAPI mechanism */
     String GSSAPI = "GSSAPI";
+
+    /** PLAIN mechanism */
     String PLAIN = "PLAIN";
 
     /** Not a SASL JDK supported mechanism */
     String NTLM = "NTLM";
+
     /** Not a SASL JDK supported mechanism */
     String GSS_SPNEGO = "GSS-SPNEGO";
 }



Mime
View raw message