directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r499172 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core: interceptor/ jndi/ partition/
Date Tue, 23 Jan 2007 22:48:27 GMT
Author: elecharny
Date: Tue Jan 23 14:48:25 2007
New Revision: 499172

URL: http://svn.apache.org/viewvc?view=rev&rev=499172
Log:
Using generics to remove some warnings. Added some newlines

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?view=diff&rev=499172&r1=499171&r2=499172
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
Tue Jan 23 14:48:25 2007
@@ -202,7 +202,7 @@
         }
 
 
-        public void bind( NextInterceptor next, LdapDN bindDn, byte[] credentials, List mechanisms,
String saslAuthId )
+        public void bind( NextInterceptor next, LdapDN bindDn, byte[] credentials, List<String>
mechanisms, String saslAuthId )
             throws NamingException
         {
             nexus.bind( bindDn, credentials, mechanisms, saslAuthId );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java?view=diff&rev=499172&r1=499171&r2=499172
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java
Tue Jan 23 14:48:25 2007
@@ -49,7 +49,7 @@
     private LdapDN bindDn;
     private String saslAuthId;
     private AuthenticationLevel level;
-    private List mechanisms = new ArrayList();
+    private List<String> mechanisms = new ArrayList<String>();
     private byte[] credentials;
 
 
@@ -291,7 +291,7 @@
     }
 
 
-    public List getAuthenticationMechanisms()
+    public List<String> getAuthenticationMechanisms()
     {
         return Collections.unmodifiableList( mechanisms );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=499172&r1=499171&r2=499172
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
Tue Jan 23 14:48:25 2007
@@ -278,9 +278,10 @@
             }
             
             // add all attribute oids of index configs to a hashset
-            Set indices = systemCfg.getIndexedAttributes();
+            Set<String> indices = systemCfg.getIndexedAttributes();
             Set<String> indexOids = new HashSet<String>();
             OidRegistry registry = factoryCfg.getRegistries().getOidRegistry();
+            
             for ( Object index : indices )
             {
                 indexOids.add( registry.getOid( index.toString() ) );
@@ -290,26 +291,32 @@
             {
                 indices.add( Oid.ALIAS );
             }
+            
             if ( ! indexOids.contains( Oid.EXISTANCE ) )
             {
                 indices.add( Oid.EXISTANCE );
             }
+            
             if ( ! indexOids.contains( Oid.HIERARCHY ) )
             {
                 indices.add( Oid.HIERARCHY );
             }
+            
             if ( ! indexOids.contains( Oid.NDN ) )
             {
                 indices.add( Oid.NDN );
             }
+            
             if ( ! indexOids.contains( Oid.ONEALIAS ) )
             {
                 indices.add( Oid.ONEALIAS );
             }
+            
             if ( ! indexOids.contains( Oid.SUBALIAS ) )
             {
                 indices.add( Oid.SUBALIAS );
             }
+            
             if ( ! indexOids.contains( Oid.UPDN ) )
             {
                 indices.add( Oid.UPDN );
@@ -652,7 +659,7 @@
     // DirectoryPartition Interface Method Implementations
     // ------------------------------------------------------------------------
 
-    public void bind( LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId
) throws NamingException
+    public void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms, String
saslAuthId ) throws NamingException
     {
         Partition partition = getBackend( bindDn );
         partition.bind( bindDn, credentials, mechanisms, saslAuthId );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/Partition.java?view=diff&rev=499172&r1=499171&r2=499172
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
Tue Jan 23 14:48:25 2007
@@ -296,7 +296,7 @@
      * @param saslAuthId the SASL authentication (may be null)
      * @throws NamingException if something goes wrong
      */
-    void bind( LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId ) throws
NamingException;
+    void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms, String saslAuthId
) throws NamingException;
 
 
     /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?view=diff&rev=499172&r1=499171&r2=499172
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
Tue Jan 23 14:48:25 2007
@@ -49,14 +49,19 @@
 {
     /** the default user principal or DN */
     public final static String ADMIN_PRINCIPAL = "uid=admin,ou=system";
+    
     /** the normalized user principal or DN */
     public final static String ADMIN_PRINCIPAL_NORMALIZED = "0.9.2342.19200300.100.1.1=admin,2.5.4.11=system";
+    
     /** the admin super user uid */
     public final static String ADMIN_UID = "admin";
+    
     /** the initial admin passwd set on startup */
     public static final String ADMIN_PASSWORD = "secret";
+    
     /** the base dn under which all users reside */
     public final static String USERS_BASE_NAME = "ou=users,ou=system";
+    
     /** the base dn under which all groups reside */
     public final static String GROUPS_BASE_NAME = "ou=groups,ou=system";
 
@@ -81,6 +86,7 @@
 
     /**
      * Gets the DN for the admin user.
+     * 
      * @return the admin user DN
      */
     public static final LdapDN getAdminName()

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java?view=diff&rev=499172&r1=499171&r2=499172
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
Tue Jan 23 14:48:25 2007
@@ -71,18 +71,25 @@
 {
     /** safe to use set of bypass instructions to lookup raw entries */
     public static final Collection LOOKUP_BYPASS;
+    
     /** safe to use set of bypass instructions to getMatchedDn */
     public static final Collection GETMATCHEDDN_BYPASS;
+    
     /** safe to use set of bypass instructions to lookup raw entries excluding operational
attributes */
     public static final Collection LOOKUP_EXCLUDING_OPR_ATTRS_BYPASS;
+    
     /** Bypass String to use when ALL interceptors should be skipped */
     public static final String BYPASS_ALL = "*";
+    
     /** Bypass String to use when ALL interceptors should be skipped */
     public static final Collection BYPASS_ALL_COLLECTION = Collections.singleton( BYPASS_ALL
);
+    
     /** Integer const for DirContext.ADD_ATTRIBUTE */
     private static final Integer ADD_MODOP = new Integer( DirContext.ADD_ATTRIBUTE );
+    
     /** Integer const for DirContext.REMOVE_ATTRIBUTE */
     private static final Integer REMOVE_MODOP = new Integer( DirContext.REMOVE_ATTRIBUTE
);
+    
     /** Integer const for DirContext.REPLACE_ATTRIBUTE */
     private static final Integer REPLACE_MODOP = new Integer( DirContext.REPLACE_ATTRIBUTE
);
 
@@ -664,14 +671,16 @@
      * @param bypass
      * @throws NamingException
      */
-    public void bind( LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId,
Collection bypass )
+    public void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms, String
saslAuthId, Collection bypass )
         throws NamingException
     {
         ensureStarted();
         InvocationStack stack = InvocationStack.getInstance();
         Object[] args = new Object[]
             { bindDn, credentials, mechanisms, saslAuthId };
+        
         stack.push( new Invocation( this, caller, "bind", args, bypass ) );
+        
         try
         {
             this.configuration.getInterceptorChain().bind( bindDn, credentials, mechanisms,
saslAuthId );
@@ -701,7 +710,7 @@
     }
 
 
-    public void bind( LdapDN bindDn, byte[] credentials, List mechanisms, String saslAuthId
) throws NamingException
+    public void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms, String
saslAuthId ) throws NamingException
     {
         bind( bindDn, credentials, mechanisms, saslAuthId, null );
     }



Mime
View raw message