directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r556238 [7/8] - in /directory: apacheds/trunk-with-dependencies/ sandbox/ccustine/new_installers/apacheds/ sandbox/ccustine/new_installers/apacheds/benchmarks/ sandbox/ccustine/new_installers/apacheds/bootstrap-extract/ sandbox/ccustine/new...
Date Sat, 14 Jul 2007 07:55:59 GMT
Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java Sat Jul 14 00:55:44 2007
@@ -74,8 +74,7 @@
         {
             if ( log.isDebugEnabled() )
             {
-                log.debug( "entry for client principal " + clientName
-                    + " has no SAM type: proceeding with standard pre-authentication" );
+                log.debug( "Entry for client principal {} has no SAM type.  Proceeding with standard pre-authentication.", clientName );
             }
 
             EncryptionType encryptionType = authContext.getEncryptionType();
@@ -144,10 +143,11 @@
         }
 
         authContext.setClientKey( clientKey );
+        authContext.setPreAuthenticated( true );
 
         if ( log.isDebugEnabled() )
         {
-            log.debug( "Pre-authentication by encrypted timestamp successful for " + clientName + "." );
+            log.debug( "Pre-authentication by encrypted timestamp successful for {}.", clientName );
         }
 
         next.execute( session, message );

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java Sat Jul 14 00:55:44 2007
@@ -51,7 +51,7 @@
 
     static
     {
-        log.debug( "Initializing SAM subsystem" );
+        log.debug( "Initializing SAM subsystem." );
         SamSubsystem.getInstance().setIntegrityChecker( new TimestampChecker() );
     }
 
@@ -72,8 +72,7 @@
         {
             if ( log.isDebugEnabled() )
             {
-                log.debug( "entry for client principal " + clientName
-                    + " has a valid SAM type: invoking SAM subsystem for pre-authentication" );
+                log.debug( "Entry for client principal {} has a valid SAM type.  Invoking SAM subsystem for pre-authentication.", clientName );
             }
 
             PreAuthenticationData[] preAuthData = request.getPreAuthData();
@@ -103,10 +102,11 @@
             }
 
             authContext.setClientKey( clientKey );
+            authContext.setPreAuthenticated( true );
 
             if ( log.isDebugEnabled() )
             {
-                log.debug( "Pre-authentication using SAM subsystem successful for " + clientName + "." );
+                log.debug( "Pre-authentication using SAM subsystem successful for {}.", clientName );
             }
         }
 

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/BuildReply.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/BuildReply.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/BuildReply.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/BuildReply.java Sat Jul 14 00:55:44 2007
@@ -23,7 +23,6 @@
 import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
 import org.apache.directory.server.kerberos.shared.messages.TicketGrantReply;
 import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
-import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
 import org.apache.directory.server.kerberos.shared.messages.value.LastRequest;
 import org.apache.directory.server.kerberos.shared.messages.value.TicketFlags;
 import org.apache.mina.common.IoSession;
@@ -38,18 +37,18 @@
 {
     private String contextKey = "context";
 
+
     public void execute( NextCommand next, IoSession session, Object message ) throws Exception
     {
         TicketGrantingContext tgsContext = ( TicketGrantingContext ) session.getAttribute( getContextKey() );
         KdcRequest request = tgsContext.getRequest();
         Ticket tgt = tgsContext.getTgt();
         Ticket newTicket = tgsContext.getNewTicket();
-        EncryptionKey sessionKey = tgsContext.getSessionKey();
 
         TicketGrantReply reply = new TicketGrantReply();
         reply.setClientPrincipal( tgt.getClientPrincipal() );
         reply.setTicket( newTicket );
-        reply.setKey( sessionKey );
+        reply.setKey( newTicket.getSessionKey() );
         reply.setNonce( request.getNonce() );
         // TODO - resp.last-req := fetch_last_request_info(client); requires store
         reply.setLastRequest( new LastRequest() );

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java Sat Jul 14 00:55:44 2007
@@ -30,6 +30,7 @@
 import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
+import org.apache.directory.server.kerberos.shared.crypto.encryption.RandomKeyFactory;
 import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
 import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
 import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
@@ -70,7 +71,6 @@
         EncryptionKey serverKey = tgsContext.getRequestPrincipalEntry().getKeyMap().get( encryptionType );
 
         KdcConfiguration config = tgsContext.getConfig();
-        EncryptionKey sessionKey = tgsContext.getSessionKey();
 
         EncTicketPartModifier newTicketBody = new EncTicketPartModifier();
 
@@ -78,7 +78,9 @@
 
         processFlags( config, request, tgt, newTicketBody );
 
+        EncryptionKey sessionKey = RandomKeyFactory.getRandomKey( tgsContext.getEncryptionType() );
         newTicketBody.setSessionKey( sessionKey );
+
         newTicketBody.setClientPrincipal( tgt.getClientPrincipal() );
 
         if ( request.getEncAuthorizationData() != null )
@@ -125,6 +127,11 @@
     private void processFlags( KdcConfiguration config, KdcRequest request, Ticket tgt,
         EncTicketPartModifier newTicketBody ) throws KerberosException
     {
+        if ( tgt.getFlag( TicketFlags.PRE_AUTHENT ) )
+        {
+            newTicketBody.setFlag( TicketFlags.PRE_AUTHENT );
+        }
+
         if ( request.getOption( KdcOptions.FORWARDABLE ) )
         {
             if ( !tgt.getFlag( TicketFlags.FORWARDABLE ) )

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java Sat Jul 14 00:55:44 2007
@@ -24,7 +24,6 @@
 import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
 import org.apache.directory.server.kerberos.shared.messages.components.Authenticator;
 import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
-import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
 import org.apache.directory.server.kerberos.shared.replay.ReplayCache;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
 
@@ -40,7 +39,6 @@
     private ApplicationRequest authHeader;
     private Ticket tgt;
     private Ticket newTicket;
-    private EncryptionKey sessionKey;
     private Authenticator authenticator;
     private ReplayCache replayCache;
 
@@ -135,24 +133,6 @@
     public void setNewTicket( Ticket newTicket )
     {
         this.newTicket = newTicket;
-    }
-
-
-    /**
-     * @return Returns the sessionKey.
-     */
-    public EncryptionKey getSessionKey()
-    {
-        return sessionKey;
-    }
-
-
-    /**
-     * @param sessionKey The sessionKey to set.
-     */
-    public void setSessionKey( EncryptionKey sessionKey )
-    {
-        this.sessionKey = sessionKey;
     }
 
 

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingServiceChain.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingServiceChain.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingServiceChain.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingServiceChain.java Sat Jul 14 00:55:44 2007
@@ -58,7 +58,6 @@
         addLast( "verifyTgtAuthHeader", new VerifyTgtAuthHeader() );
         addLast( "verifyBodyChecksum", new VerifyBodyChecksum() );
         addLast( "getRequestPrincipalEntry", new GetRequestPrincipalEntry() );
-        addLast( "getSessionKey", new GetSessionKey() );
         addLast( "generateTicket", new GenerateTicket() );
         addLast( "buildReply", new BuildReply() );
 

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java Sat Jul 14 00:55:44 2007
@@ -22,6 +22,8 @@
 
 import org.apache.directory.server.kerberos.shared.crypto.checksum.ChecksumHandler;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
+import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
+import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
 import org.apache.directory.server.kerberos.shared.messages.value.Checksum;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.handler.chain.IoHandlerCommand;
@@ -48,7 +50,13 @@
         byte[] bodyBytes = tgsContext.getRequest().getBodyBytes();
         Checksum authenticatorChecksum = tgsContext.getAuthenticator().getChecksum();
 
-        log.debug( "Verifying body checksum type '" + authenticatorChecksum.getChecksumType() + "'." );
+        if ( authenticatorChecksum == null || authenticatorChecksum.getChecksumType() == null
+            || authenticatorChecksum.getChecksumValue() == null )
+        {
+            throw new KerberosException( ErrorType.KRB_AP_ERR_INAPP_CKSUM );
+        }
+
+        log.debug( "Verifying body checksum type '{}'.", authenticatorChecksum.getChecksumType() );
 
         checksumHandler.verifyChecksum( authenticatorChecksum, bodyBytes, null, KeyUsage.NUMBER8 );
 

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java Sat Jul 14 00:55:44 2007
@@ -85,7 +85,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " CREATED : " + session.getTransportType() );
+            log.debug( "{} CREATED:  {}", session.getRemoteAddress(), session.getTransportType() );
         }
 
         if ( session.getTransportType() == TransportType.DATAGRAM )
@@ -105,7 +105,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " OPENED" );
+            log.debug( "{} OPENED", session.getRemoteAddress() );
         }
     }
 
@@ -114,7 +114,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " CLOSED" );
+            log.debug( "{} CLOSED", session.getRemoteAddress() );
         }
     }
 
@@ -123,7 +123,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " IDLE(" + status + ")" );
+            log.debug( "{} IDLE ({})", session.getRemoteAddress(), status );
         }
     }
 
@@ -139,7 +139,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " RCVD: " + message );
+            log.debug( "{} RCVD:  {}", session.getRemoteAddress(), message );
         }
 
         InetAddress clientAddress = ( ( InetSocketAddress ) session.getRemoteAddress() ).getAddress();
@@ -212,7 +212,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " SENT: " + message );
+            log.debug( "{} SENT:  {}", session.getRemoteAddress(), message );
         }
     }
 

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/pom.xml?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/pom.xml (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/pom.xml Sat Jul 14 00:55:44 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-ldap</artifactId>
@@ -17,15 +17,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-asn1-codec</artifactId>
-      <version>0.9.6-SNAPSHOT</version>
+      <version>0.9.7-SNAPSHOT</version>
     </dependency>
 
     <dependency>

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AbandonHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AbandonHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AbandonHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AbandonHandler.java Sat Jul 14 00:55:44 2007
@@ -84,7 +84,7 @@
         {
             if ( IS_DEBUG )
             {
-                log.debug( "Abandoned request: " + req );
+                log.debug( "Abandoned request:  ", req );
             }
         }
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java Sat Jul 14 00:55:44 2007
@@ -62,7 +62,7 @@
 
         if ( IS_DEBUG )
         {
-            log.debug( "Received a Add message : " + req.toString() );
+            log.debug( "Received an Add message:  {}", req.toString() );
         }
 
         try

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java Sat Jul 14 00:55:44 2007
@@ -254,13 +254,12 @@
         {
             if ( bindRequest.isSimple() )
             {
-                log.debug( "Simple authentication" );
+                log.debug( "Using simple authentication." );
                 
             }
             else
             {
-                log.debug( "SASL authentication" );
-                log.debug( "SASL mechanism:  {}", bindRequest.getSaslMechanism() );
+                log.debug( "Using SASL authentication with mechanism:  {}", bindRequest.getSaslMechanism() );
             }
         }
         

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java Sat Jul 14 00:55:44 2007
@@ -79,7 +79,7 @@
 
         if ( IS_DEBUG )
         {
-            log.debug( "req.getName() == [" + req.getName() + "]" );
+            log.debug( "req.getName() == [{}]", req.getName() );
         }
 
         if ( req.getName().isEmpty() )

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java Sat Jul 14 00:55:44 2007
@@ -152,7 +152,7 @@
 
     	if ( IS_DEBUG )
     	{
-    		log.debug( "Message received : " + request.toString() );
+    		log.debug( "Message received:  {}", request.toString() );
     	}
 
     	ServerLdapContext ctx;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java Sat Jul 14 00:55:44 2007
@@ -125,20 +125,23 @@
         {
             Callback callback = callbacks[i];
 
-            log.debug( "Processing callback " + ( i + 1 ) + " of " + callbacks.length + ":  "
-                + callback.getClass().toString() );
+            if ( log.isDebugEnabled() )
+            {
+                log.debug( "Processing callback " + ( i + 1 ) + " of " + callbacks.length + ":  "
+                        + callback.getClass().toString() );
+            }
 
             if ( callback instanceof NameCallback )
             {
                 NameCallback nameCB = ( NameCallback ) callback;
-                log.debug( "NameCallback default name   " + nameCB.getDefaultName() );
+                log.debug( "NameCallback default name:  {}", nameCB.getDefaultName() );
 
                 username = nameCB.getDefaultName();
             }
             else if ( callback instanceof RealmCallback )
             {
                 RealmCallback realmCB = ( RealmCallback ) callback;
-                log.debug( "RealmCallback default text  " + realmCB.getDefaultText() );
+                log.debug( "RealmCallback default text:  {}", realmCB.getDefaultText() );
 
                 realm = realmCB.getDefaultText();
             }
@@ -158,17 +161,17 @@
 
                 // hnelson (CRAM-MD5, DIGEST-MD5)
                 // hnelson@EXAMPLE.COM (GSSAPI)
-                log.debug( "AuthorizeCallback authnID      " + authorizeCB.getAuthenticationID() );
+                log.debug( "AuthorizeCallback authnID:  {}", authorizeCB.getAuthenticationID() );
 
                 // hnelson (CRAM-MD5, DIGEST-MD5)
                 // hnelson@EXAMPLE.COM (GSSAPI)
-                log.debug( "AuthorizeCallback authzID      " + authorizeCB.getAuthorizationID() );
+                log.debug( "AuthorizeCallback authzID:  {}", authorizeCB.getAuthorizationID() );
 
                 // null (CRAM-MD5, DIGEST-MD5, GSSAPI)
-                log.debug( "AuthorizeCallback authorizedID " + authorizeCB.getAuthorizedID() );
+                log.debug( "AuthorizeCallback authorizedID:  {}", authorizeCB.getAuthorizedID() );
 
                 // false (CRAM-MD5, DIGEST-MD5, GSSAPI)
-                log.debug( "AuthorizeCallback isAuthorized " + authorizeCB.isAuthorized() );
+                log.debug( "AuthorizeCallback isAuthorized:  {}", authorizeCB.isAuthorized() );
 
                 authorize( authorizeCB );
             }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/CramMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/CramMd5CallbackHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/CramMd5CallbackHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/CramMd5CallbackHandler.java Sat Jul 14 00:55:44 2007
@@ -78,7 +78,11 @@
 
     protected void authorize( AuthorizeCallback authorizeCB )
     {
-        log.debug( "Converted username " + getUsername() + " to DN " + bindDn + " with password " + userPassword );
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( "Converted username " + getUsername() + " to DN " + bindDn + " with password " + userPassword );
+        }
+
         session.setAttribute( Context.SECURITY_PRINCIPAL, bindDn );
 
         authorizeCB.setAuthorizedID( bindDn );

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/DigestMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/DigestMd5CallbackHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/DigestMd5CallbackHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/DigestMd5CallbackHandler.java Sat Jul 14 00:55:44 2007
@@ -80,7 +80,11 @@
 
     protected void authorize( AuthorizeCallback authorizeCB )
     {
-        log.debug( "Converted username " + getUsername() + " to DN " + bindDn + " with password " + userPassword );
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( "Converted username " + getUsername() + " to DN " + bindDn + " with password " + userPassword + "." );
+        }
+
         session.setAttribute( Context.SECURITY_PRINCIPAL, bindDn );
 
         authorizeCB.setAuthorizedID( bindDn );

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GetLdapContext.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GetLdapContext.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GetLdapContext.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GetLdapContext.java Sat Jul 14 00:55:44 2007
@@ -135,9 +135,9 @@
         String sessionMechanism = ( String ) session.getAttribute( "sessionMechanism" );
         String authenticationLevel = getAuthenticationLevel( sessionMechanism );
 
-        log.debug( Context.SECURITY_PRINCIPAL + " " + principal );
-        log.debug( Context.SECURITY_CREDENTIALS + " " + credentials );
-        log.debug( Context.SECURITY_AUTHENTICATION + " " + authenticationLevel );
+        log.debug( "{} {}", Context.SECURITY_PRINCIPAL, principal );
+        log.debug( "{} {}", Context.SECURITY_CREDENTIALS, credentials );
+        log.debug( "{} {}", Context.SECURITY_AUTHENTICATION, authenticationLevel );
 
         // clone the environment first then add the required security settings
         Hashtable<String, Object> env = SessionRegistry.getSingleton().getEnvironmentByCopy();

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GssapiCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GssapiCallbackHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GssapiCallbackHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GssapiCallbackHandler.java Sat Jul 14 00:55:44 2007
@@ -80,7 +80,7 @@
         PrincipalStoreEntry entry = ( PrincipalStoreEntry ) getPrincipal.execute( ctx, null );
         String bindDn = entry.getDistinguishedName();
 
-        log.debug( "Converted username " + username + " to DN " + bindDn + "." );
+        log.debug( "Converted username {} to DN {}.", username, bindDn );
         session.setAttribute( Context.SECURITY_PRINCIPAL, bindDn );
 
         authorizeCB.setAuthorizedID( bindDn );

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/SaslFilter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/SaslFilter.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/SaslFilter.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/SaslFilter.java Sat Jul 14 00:55:44 2007
@@ -81,7 +81,7 @@
 
     public void messageReceived( NextFilter nextFilter, IoSession session, Object message ) throws SaslException
     {
-        log.debug( "Message received:  " + message );
+        log.debug( "Message received:  {}", message );
 
         /*
          * Unwrap the data for mechanisms that support QoP (DIGEST-MD5, GSSAPI).
@@ -99,7 +99,7 @@
             byte[] bufferBytes = new byte[bufferLength];
             buf.get( bufferBytes );
 
-            log.debug( "Will use SASL to unwrap received message of length:  " + bufferLength );
+            log.debug( "Will use SASL to unwrap received message of length:  {}", bufferLength );
             byte[] token = context.unwrap( bufferBytes, 0, bufferBytes.length );
             nextFilter.messageReceived( session, ByteBuffer.wrap( token ) );
         }
@@ -113,7 +113,7 @@
 
     public void filterWrite( NextFilter nextFilter, IoSession session, WriteRequest writeRequest ) throws SaslException
     {
-        log.debug( "Filtering write request:  " + writeRequest );
+        log.debug( "Filtering write request:  {}", writeRequest );
 
         /*
          * Check if security layer processing should be disabled once.
@@ -145,7 +145,7 @@
             byte[] bufferBytes = new byte[bufferLength];
             buf.get( bufferBytes );
 
-            log.debug( "Will use SASL to wrap message of length:  " + bufferLength );
+            log.debug( "Will use SASL to wrap message of length:  {}", bufferLength );
 
             byte[] saslLayer = context.wrap( bufferBytes, 0, bufferBytes.length );
 
@@ -158,7 +158,7 @@
             saslLayerBuffer.position( 0 );
             saslLayerBuffer.limit( 4 + saslLayer.length );
 
-            log.debug( "Sending encrypted token of length " + saslLayerBuffer.limit() );
+            log.debug( "Sending encrypted token of length {}.", saslLayerBuffer.limit() );
             nextFilter.filterWrite( session, new WriteRequest( saslLayerBuffer, writeRequest.getFuture() ) );
         }
         else

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ntp/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ntp/pom.xml?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ntp/pom.xml (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ntp/pom.xml Sat Jul 14 00:55:44 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-ntp</artifactId>
@@ -16,12 +16,6 @@
   <packaging>jar</packaging>  
 
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java Sat Jul 14 00:55:44 2007
@@ -69,7 +69,7 @@
 
             acceptor.bind( new InetSocketAddress( port ), handler, serviceConfig );
 
-            log.debug( name + " listening on port " + port );
+            log.debug( "{} listening on port {}.", name, port );
         }
         catch ( IOException ioe )
         {
@@ -100,6 +100,6 @@
         acceptor = null;
         handler = null;
 
-        log.debug( config.getServiceName() + " has stopped listening on port " + config.getIpPort() );
+        log.debug( "{} has stopped listening on port {}.", config.getServiceName(), config.getIpPort() );
     }
 }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java Sat Jul 14 00:55:44 2007
@@ -48,7 +48,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " CREATED" );
+            log.debug( "{} CREATED", session.getRemoteAddress() );
         }
 
         session.getFilterChain().addFirst( "codec", new ProtocolCodecFilter( NtpProtocolCodecFactory.getInstance() ) );
@@ -59,7 +59,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " OPENED" );
+            log.debug( "{} OPENED", session.getRemoteAddress() );
         }
     }
 
@@ -68,7 +68,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " CLOSED" );
+            log.debug( "{} CLOSED", session.getRemoteAddress() );
         }
     }
 
@@ -77,7 +77,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " IDLE(" + status + ")" );
+            log.debug( "{} IDLE ({})", session.getRemoteAddress(), status );
         }
     }
 
@@ -93,7 +93,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " RCVD: " + message );
+            log.debug( "{} RCVD:  {}", session.getRemoteAddress(), message );
         }
 
         NtpMessage reply = ntpService.getReplyFor( ( NtpMessage ) message );
@@ -106,7 +106,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " SENT: " + message );
+            log.debug( "{} SENT:  {}", session.getRemoteAddress(), message );
         }
     }
 }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/pom.xml?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/pom.xml (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/pom.xml Sat Jul 14 00:55:44 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.directory.server</groupId>
@@ -15,13 +15,5 @@
 
   <name>ApacheDS Protocol Shared</name>
   <packaging>jar</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
 
 </project>

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java Sat Jul 14 00:55:44 2007
@@ -164,7 +164,7 @@
      * @param config
      * @return Whether the configuration is different.
      */
-    public boolean isDifferent( Dictionary config )
+    public boolean isDifferent( Dictionary<String, Object> config )
     {
         int port = getIpPort();
 

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java Sat Jul 14 00:55:44 2007
@@ -59,13 +59,13 @@
 
         String filter = "(objectClass=" + ENTRY + ")";
 
-        NamingEnumeration list = ctx.search( "", filter, controls );
+        NamingEnumeration<SearchResult> list = ctx.search( "", filter, controls );
 
         Map<String, String> catalog = new HashMap<String, String>();
 
         while ( list.hasMore() )
         {
-            SearchResult result = ( SearchResult ) list.next();
+            SearchResult result = list.next();
 
             Attributes attrs = result.getAttributes();
             Attribute attr;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/kerberos-apache.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/kerberos-apache.ldif?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/kerberos-apache.ldif (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/kerberos-apache.ldif Sat Jul 14 00:55:44 2007
@@ -1,137 +1,137 @@
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License. 
-#  
-#   EXAMPLE.COM is reserved for testing according to this RFC:
-#
-#   http://www.rfc-editor.org/rfc/rfc2606.txt
-#
-
-dn: ou=users,dc=apache,dc=org
-objectclass: top
-objectclass: organizationalunit
-ou: users
-
-dn: uid=akarasulu,ou=users,dc=apache,dc=org
-cn: Alex Karasulu
-sn: Karasulu
-givenname: Alex
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: krb5Principal
-objectclass: krb5KDCEntry
-ou: Directory
-ou: users
-l: Jacksonville
-uid: akarasulu
-krb5PrincipalName: akarasulu@APACHE.ORG
-krb5KeyVersionNumber: 0
-mail: akarasulu@apache.org
-telephonenumber: +1 904 982 6882
-facsimiletelephonenumber: +1 904 982 6883
-roomnumber: 666
-userpassword: maxwell
-
-dn: uid=erodriguez,ou=users,dc=apache,dc=org
-cn: Enrique Rodriguez
-sn: Rodriguez
-givenname: Enrique
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: krb5Principal
-objectclass: krb5KDCEntry
-ou: Directory
-ou: users
-l: Boston
-uid: erodriguez
-krb5PrincipalName: erodriguez@APACHE.ORG
-krb5KeyVersionNumber: 0
-mail: erodriguez@apache.org
-telephonenumber: +1 408 555 9187
-facsimiletelephonenumber: +1 408 555 8473
-roomnumber: 667
-userpassword: kerby
-
-dn: uid=krbtgt,ou=users,dc=apache,dc=org
-cn: Kerberos Server
-sn: Server
-givenname: Kerberos
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: krb5Principal
-objectclass: krb5KDCEntry
-ou: Directory
-ou: users
-l: Boston
-uid: krbtgt
-krb5PrincipalName: krbtgt/APACHE.ORG@APACHE.ORG
-krb5KeyVersionNumber: 0
-mail: erodriguez@apache.org
-telephonenumber: +1 408 555 9187
-facsimiletelephonenumber: +1 408 555 8473
-roomnumber: 667
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License. 
+#  
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
+dn: ou=users,dc=apache,dc=org
+objectclass: top
+objectclass: organizationalunit
+ou: users
+
+dn: uid=akarasulu,ou=users,dc=apache,dc=org
+cn: Alex Karasulu
+sn: Karasulu
+givenname: Alex
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: krb5Principal
+objectclass: krb5KDCEntry
+ou: Directory
+ou: users
+l: Jacksonville
+uid: akarasulu
+krb5PrincipalName: akarasulu@APACHE.ORG
+krb5KeyVersionNumber: 0
+mail: akarasulu@apache.org
+telephonenumber: +1 904 982 6882
+facsimiletelephonenumber: +1 904 982 6883
+roomnumber: 666
+userpassword: maxwell
+
+dn: uid=erodriguez,ou=users,dc=apache,dc=org
+cn: Enrique Rodriguez
+sn: Rodriguez
+givenname: Enrique
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: krb5Principal
+objectclass: krb5KDCEntry
+ou: Directory
+ou: users
+l: Boston
+uid: erodriguez
+krb5PrincipalName: erodriguez@APACHE.ORG
+krb5KeyVersionNumber: 0
+mail: erodriguez@apache.org
+telephonenumber: +1 408 555 9187
+facsimiletelephonenumber: +1 408 555 8473
+roomnumber: 667
+userpassword: kerby
+
+dn: uid=krbtgt,ou=users,dc=apache,dc=org
+cn: Kerberos Server
+sn: Server
+givenname: Kerberos
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: krb5Principal
+objectclass: krb5KDCEntry
+ou: Directory
+ou: users
+l: Boston
+uid: krbtgt
+krb5PrincipalName: krbtgt/APACHE.ORG@APACHE.ORG
+krb5KeyVersionNumber: 0
+mail: erodriguez@apache.org
+telephonenumber: +1 408 555 9187
+facsimiletelephonenumber: +1 408 555 8473
+roomnumber: 667
 userpassword: kahuna
 
-dn: uid=hostssh,ou=users,dc=apache,dc=org
-cn: SSH Service
-sn: Service
-givenname: SSH
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: krb5Principal
-objectclass: krb5KDCEntry
-ou: Directory
-ou: users
-l: Boston
-uid: hostssh
-krb5PrincipalName: host/www.apache.org@APACHE.ORG
-krb5KeyVersionNumber: 0
-mail: erodriguez@apache.org
-telephonenumber: +1 408 555 9187
-facsimiletelephonenumber: +1 408 555 8473
-roomnumber: 667
+dn: uid=hostssh,ou=users,dc=apache,dc=org
+cn: SSH Service
+sn: Service
+givenname: SSH
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: krb5Principal
+objectclass: krb5KDCEntry
+ou: Directory
+ou: users
+l: Boston
+uid: hostssh
+krb5PrincipalName: host/www.apache.org@APACHE.ORG
+krb5KeyVersionNumber: 0
+mail: erodriguez@apache.org
+telephonenumber: +1 408 555 9187
+facsimiletelephonenumber: +1 408 555 8473
+roomnumber: 667
 userpassword: randall
 
-dn: uid=kadmin,ou=users,dc=apache,dc=org
-cn: Changepw Server
-sn: Server
-givenname: Changepw
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: krb5Principal
-objectclass: krb5KDCEntry
-ou: Directory
-ou: users
-l: Boston
-uid: kadmin
-krb5PrincipalName: kadmin/changepw@APACHE.ORG
-krb5KeyVersionNumber: 0
-mail: erodriguez@apache.org
-telephonenumber: +1 408 555 9187
-facsimiletelephonenumber: +1 408 555 8473
-roomnumber: 667
+dn: uid=kadmin,ou=users,dc=apache,dc=org
+cn: Changepw Server
+sn: Server
+givenname: Changepw
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: krb5Principal
+objectclass: krb5KDCEntry
+ou: Directory
+ou: users
+l: Boston
+uid: kadmin
+krb5PrincipalName: kadmin/changepw@APACHE.ORG
+krb5KeyVersionNumber: 0
+mail: erodriguez@apache.org
+telephonenumber: +1 408 555 9187
+facsimiletelephonenumber: +1 408 555 8473
+roomnumber: 667
 userpassword: kahuna

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/kerberos-example.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/kerberos-example.ldif?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/kerberos-example.ldif (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/kerberos-example.ldif Sat Jul 14 00:55:44 2007
@@ -1,159 +1,159 @@
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License. 
-#  
-#   EXAMPLE.COM is reserved for testing according to this RFC:
-#
-#   http://www.rfc-editor.org/rfc/rfc2606.txt
-#
-
-dn: ou=users,dc=example,dc=com
-objectclass: top
-objectclass: organizationalunit
-ou: users
-
-dn: uid=akarasulu,ou=users,dc=example,dc=com
-cn: Alex Karasulu
-sn: Karasulu
-givenname: Alex
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: krb5Principal
-objectclass: krb5KDCEntry
-ou: Directory
-ou: users
-l: Jacksonville
-uid: akarasulu
-krb5PrincipalName: akarasulu@EXAMPLE.COM
-krb5KeyVersionNumber: 0
-mail: akarasulu@example.com
-telephonenumber: +1 904 982 6882
-facsimiletelephonenumber: +1 904 982 6883
-roomnumber: 666
-userpassword: maxwell
-
-dn: uid=erodriguez,ou=users,dc=example,dc=com
-cn: Enrique Rodriguez
-sn: Rodriguez
-givenname: Enrique
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: krb5Principal
-objectclass: krb5KDCEntry
-ou: Directory
-ou: users
-l: Boston
-uid: erodriguez
-krb5PrincipalName: erodriguez@EXAMPLE.COM
-krb5KeyVersionNumber: 0
-mail: erodriguez@example.com
-telephonenumber: +1 408 555 9187
-facsimiletelephonenumber: +1 408 555 8473
-roomnumber: 667
-userpassword: kerby
-
-dn: uid=krbtgt,ou=users,dc=example,dc=com
-cn: Kerberos Server
-sn: Server
-givenname: Kerberos
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: krb5Principal
-objectclass: krb5KDCEntry
-ou: Directory
-ou: users
-l: Boston
-uid: krbtgt
-krb5PrincipalName: krbtgt/EXAMPLE.COM@EXAMPLE.COM
-krb5KeyVersionNumber: 0
-mail: erodriguez@example.com
-telephonenumber: +1 408 555 9187
-facsimiletelephonenumber: +1 408 555 8473
-roomnumber: 667
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License. 
+#  
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
+dn: ou=users,dc=example,dc=com
+objectclass: top
+objectclass: organizationalunit
+ou: users
+
+dn: uid=akarasulu,ou=users,dc=example,dc=com
+cn: Alex Karasulu
+sn: Karasulu
+givenname: Alex
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: krb5Principal
+objectclass: krb5KDCEntry
+ou: Directory
+ou: users
+l: Jacksonville
+uid: akarasulu
+krb5PrincipalName: akarasulu@EXAMPLE.COM
+krb5KeyVersionNumber: 0
+mail: akarasulu@example.com
+telephonenumber: +1 904 982 6882
+facsimiletelephonenumber: +1 904 982 6883
+roomnumber: 666
+userpassword: maxwell
+
+dn: uid=erodriguez,ou=users,dc=example,dc=com
+cn: Enrique Rodriguez
+sn: Rodriguez
+givenname: Enrique
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: krb5Principal
+objectclass: krb5KDCEntry
+ou: Directory
+ou: users
+l: Boston
+uid: erodriguez
+krb5PrincipalName: erodriguez@EXAMPLE.COM
+krb5KeyVersionNumber: 0
+mail: erodriguez@example.com
+telephonenumber: +1 408 555 9187
+facsimiletelephonenumber: +1 408 555 8473
+roomnumber: 667
+userpassword: kerby
+
+dn: uid=krbtgt,ou=users,dc=example,dc=com
+cn: Kerberos Server
+sn: Server
+givenname: Kerberos
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: krb5Principal
+objectclass: krb5KDCEntry
+ou: Directory
+ou: users
+l: Boston
+uid: krbtgt
+krb5PrincipalName: krbtgt/EXAMPLE.COM@EXAMPLE.COM
+krb5KeyVersionNumber: 0
+mail: erodriguez@example.com
+telephonenumber: +1 408 555 9187
+facsimiletelephonenumber: +1 408 555 8473
+roomnumber: 667
 userpassword: kahuna
 
-dn: uid=hostssh,ou=users,dc=example,dc=com
-cn: SSH Service
-sn: Service
-givenname: SSH
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: krb5Principal
-objectclass: krb5KDCEntry
-ou: Directory
-ou: users
-l: Boston
-uid: hostssh
-krb5PrincipalName: host/www.example.com@EXAMPLE.COM
-krb5KeyVersionNumber: 0
-mail: erodriguez@example.com
-telephonenumber: +1 408 555 9187
-facsimiletelephonenumber: +1 408 555 8473
-roomnumber: 667
+dn: uid=hostssh,ou=users,dc=example,dc=com
+cn: SSH Service
+sn: Service
+givenname: SSH
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: krb5Principal
+objectclass: krb5KDCEntry
+ou: Directory
+ou: users
+l: Boston
+uid: hostssh
+krb5PrincipalName: host/www.example.com@EXAMPLE.COM
+krb5KeyVersionNumber: 0
+mail: erodriguez@example.com
+telephonenumber: +1 408 555 9187
+facsimiletelephonenumber: +1 408 555 8473
+roomnumber: 667
 userpassword: randall
-
-dn: uid=dns1,ou=users,dc=example,dc=com
-cn: DNS Service
-sn: Service
-givenname: DNS
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: krb5Principal
-objectclass: krb5KDCEntry
-ou: Directory
-ou: users
-l: Boston
-uid: dns1
-krb5PrincipalName: DNS/dns1.icann.org@EXAMPLE.COM
-krb5KeyVersionNumber: 0
-mail: erodriguez@example.com
-telephonenumber: +1 408 555 9187
-facsimiletelephonenumber: +1 408 555 8473
-roomnumber: 667
-userpassword: randall
-
-dn: uid=kadmin,ou=users,dc=example,dc=com
-cn: Changepw Server
-sn: Server
-givenname: Changepw
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: krb5Principal
-objectclass: krb5KDCEntry
-ou: Directory
-ou: users
-l: Boston
-uid: kadmin
-krb5PrincipalName: kadmin/changepw@EXAMPLE.COM
-krb5KeyVersionNumber: 0
-mail: erodriguez@example.com
-telephonenumber: +1 408 555 9187
-facsimiletelephonenumber: +1 408 555 8473
-roomnumber: 667
+
+dn: uid=dns1,ou=users,dc=example,dc=com
+cn: DNS Service
+sn: Service
+givenname: DNS
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: krb5Principal
+objectclass: krb5KDCEntry
+ou: Directory
+ou: users
+l: Boston
+uid: dns1
+krb5PrincipalName: DNS/dns1.icann.org@EXAMPLE.COM
+krb5KeyVersionNumber: 0
+mail: erodriguez@example.com
+telephonenumber: +1 408 555 9187
+facsimiletelephonenumber: +1 408 555 8473
+roomnumber: 667
+userpassword: randall
+
+dn: uid=kadmin,ou=users,dc=example,dc=com
+cn: Changepw Server
+sn: Server
+givenname: Changepw
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: krb5Principal
+objectclass: krb5KDCEntry
+ou: Directory
+ou: users
+l: Boston
+uid: kadmin
+krb5PrincipalName: kadmin/changepw@EXAMPLE.COM
+krb5KeyVersionNumber: 0
+mail: erodriguez@example.com
+telephonenumber: +1 408 555 9187
+facsimiletelephonenumber: +1 408 555 8473
+roomnumber: 667
 userpassword: kahuna

Modified: directory/sandbox/ccustine/new_installers/apacheds/sar-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/sar-plugin/pom.xml?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/sar-plugin/pom.xml (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/sar-plugin/pom.xml Sat Jul 14 00:55:44 2007
@@ -1,7 +1,7 @@
 <project>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/pom.xml?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/pom.xml (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/pom.xml Sat Jul 14 00:55:44 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-schema-bootstrap</artifactId>
@@ -33,12 +33,6 @@
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-constants</artifactId>
       <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>

Modified: directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java Sat Jul 14 00:55:44 2007
@@ -128,9 +128,9 @@
         }
 
 
-        public void setHumanReadible( boolean isHumanReadible )
+        public void setHumanReadable( boolean isHumanReadable )
         {
-            super.setHumanReadible( isHumanReadible );
+            super.setHumanReadable( isHumanReadable );
         }
 
 

Modified: directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java Sat Jul 14 00:55:44 2007
@@ -26,6 +26,7 @@
 import org.apache.directory.shared.ldap.schema.syntax.NumberSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.NumericOidSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.ObjectClassTypeSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.ObjectNameSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
 
 
@@ -65,6 +66,9 @@
         cb.schemaObjectProduced( this, checker.getSyntaxOid(), checker );
 
         checker = new NumberSyntaxChecker();
+        cb.schemaObjectProduced( this, checker.getSyntaxOid(), checker );
+
+        checker = new ObjectNameSyntaxChecker();
         cb.schemaObjectProduced( this, checker.getSyntaxOid(), checker );
     }
 }

Modified: directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java Sat Jul 14 00:55:44 2007
@@ -29,6 +29,7 @@
 import org.apache.directory.shared.ldap.schema.syntax.NumericOidSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.NumericStringSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.ObjectClassTypeSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.ObjectNameSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.OidSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
 
@@ -72,6 +73,9 @@
 
         syntax = new NumberSyntax();
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
+
+        syntax = new ObjectNameSyntax();
+        cb.schemaObjectProduced( this, syntax.getOid(), syntax );
     }
     
     
@@ -87,7 +91,7 @@
             return CHECKER;
         }
 
-        public final boolean isHumanReadible()
+        public final boolean isHumanReadable()
         {
             return true;
         }
@@ -141,7 +145,7 @@
             return CHECKER;
         }
 
-        public final boolean isHumanReadible()
+        public final boolean isHumanReadable()
         {
             return true;
         }
@@ -195,7 +199,7 @@
             return CHECKER;
         }
 
-        public final boolean isHumanReadible()
+        public final boolean isHumanReadable()
         {
             return true;
         }
@@ -249,7 +253,7 @@
             return CHECKER;
         }
 
-        public final boolean isHumanReadible()
+        public final boolean isHumanReadable()
         {
             return true;
         }
@@ -257,6 +261,59 @@
         public final String getDescription()
         {
             return "The syntax for numeric strings.";
+        }
+
+        public final String getName()
+        {
+            return NAMES[0];
+        }
+
+        public final String[] getNames()
+        {
+            return NAMES;
+        }
+
+        public final String getOid()
+        {
+            return OID;
+        }
+
+        public final boolean isObsolete()
+        {
+            return false;
+        }
+
+        public String getSchema()
+        {
+            return MetaSchemaConstants.SCHEMA_NAME;
+        }
+
+        public void setSchema( String schemaName )
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public static class ObjectNameSyntax implements Syntax
+    {
+        private static final long serialVersionUID = 1L;
+        private final static String OID = "1.3.6.1.4.1.18060.0.4.0.0.6";
+        private final static SyntaxChecker CHECKER = new ObjectNameSyntaxChecker();
+        private final static String[] NAMES = new String[] { "objectName" };
+        
+        public final SyntaxChecker getSyntaxChecker() throws NamingException
+        {
+            return CHECKER;
+        }
+
+        public final boolean isHumanReadable()
+        {
+            return true;
+        }
+
+        public final String getDescription()
+        {
+            return "The syntax for object names.";
         }
 
         public final String getName()

Modified: directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxProducer.java Sat Jul 14 00:55:44 2007
@@ -143,61 +143,61 @@
         syntax.setNames( new String[]
             { "ACI Item" } );
         // This is in direct conflict with RFC 2252 but for us ACI Item is human readable
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.2", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Access Point" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.3", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Attribute Type Description" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.4", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Audio" } );
-        syntax.setHumanReadible( false );
+        syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.5", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Binary" } );
-        syntax.setHumanReadible( false );
+        syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.6", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Bit String" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.7", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Boolean" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.8", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Certificate" } );
-        syntax.setHumanReadible( false );
+        syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.9", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Certificate List" } );
-        syntax.setHumanReadible( false );
+        syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.10", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Certificate Pair" } );
-        syntax.setHumanReadible( false );
+        syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         /*
@@ -217,61 +217,61 @@
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.11", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Country String" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.12", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "DN" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.13", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Data Quality Syntax" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.14", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Delivery Method" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.15", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Directory String" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.16", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "DIT Content Rule Description" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.17", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "DIT Structure Rule Description" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.18", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "DL Submit Permission" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.19", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "DSA Quality Syntax" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.20", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "DSE Type" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         /*
@@ -291,61 +291,61 @@
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.21", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Enhanced Guide" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.22", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Facsimile Telephone Number" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.23", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Fax" } );
-        syntax.setHumanReadible( false );
+        syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.24", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Generalized Time" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.25", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Guide" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.26", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "IA5 String" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.27", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "INTEGER" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.28", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "JPEG" } );
-        syntax.setHumanReadible( false );
+        syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.29", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Master And Shadow Access Points" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.30", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Matching Rule Description" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         /*
@@ -365,55 +365,55 @@
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.31", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Matching Rule Use Description" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.32", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Mail Preference" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.33", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "MHS OR Address" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.34", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Name And Optional UID" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.35", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Name Form Description" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.36", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Numeric String" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.37", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Object Class Description" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.38", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "OID" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.39", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Other Mailbox" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         /*
@@ -427,7 +427,7 @@
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.40", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Octet String" } );
-        syntax.setHumanReadible( false );
+        syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         /*
@@ -447,61 +447,61 @@
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.41", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Postal Address" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.42", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Protocol Information" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.43", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Presentation Address" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.44", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Printable String" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.45", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Subtree Specification" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.46", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Supplier Information" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.47", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Supplier Or Consumer" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.48", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Supplier And Consumer" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.49", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Supported Algorithm" } );
-        syntax.setHumanReadible( false );
+        syntax.setHumanReadable( false );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.50", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Telephone Number" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         /*
@@ -519,55 +519,55 @@
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.51", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Teletex Terminal Identifier" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.52", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Telex Number" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.53", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "UTC Time" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.54", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "LDAP Syntax Description" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.55", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Modify Rights" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.56", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "LDAP BootstrapSchema Definition" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.57", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "LDAP BootstrapSchema Description" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
 
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.58", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Substring Assertion" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
         
         syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.59", syntaxCheckerRegistry );
         syntax.setNames( new String[]
             { "Trigger Specification" } );
-        syntax.setHumanReadible( true );
+        syntax.setHumanReadable( true );
         cb.schemaObjectProduced( this, syntax.getOid(), syntax );
     }
 }



Mime
View raw message