directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1209072 - in /directory/shared/branches/shared-txns/ldap: client/api/src/main/java/org/apache/directory/ldap/client/api/ model/src/main/antlr/ model/src/main/java/org/apache/directory/shared/ldap/model/entry/ schema/data/src/main/resources...
Date Thu, 01 Dec 2011 13:32:10 GMT
Author: elecharny
Date: Thu Dec  1 13:32:08 2011
New Revision: 1209072

URL: http://svn.apache.org/viewvc?rev=1209072&view=rev
Log:
Merged back trunk into Selcuk's branch

Modified:
    directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
    directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
    directory/shared/branches/shared-txns/ldap/model/src/main/antlr/schema-value.g
    directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.10.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.11.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.1.16.1.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.0.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.2.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.3.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.4.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.4203.666.11.2.1.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.4203.666.11.2.4.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.0.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.1.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.2.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.4.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.6.ldif

Modified: directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
(original)
+++ directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
Thu Dec  1 13:32:08 2011
@@ -653,9 +653,9 @@ public interface LdapConnection
      * Tells if an Entry exists in the server.
      * 
      * @param dn The Dn for the entry we want to check the existence
-     * @return <code>true</code> if the entry exists, <code>false</code>
otherwise. 
+     * @return <code>true</code> if the entry exists, <code>false</code>
otherwise.
      * Note that if the entry exists but if the user does not have the permission to
-     * read it, <code>false</code> will also be returned 
+     * read it, <code>false</code> will also be returned
      * @throws LdapException if some error occurred
      */
     boolean exists( String dn ) throws LdapException;
@@ -665,12 +665,33 @@ public interface LdapConnection
      * Tells if an Entry exists in the server.
      * 
      * @param dn The Dn for the entry we want to check the existence
-     * @return <code>true</code> if the entry exists, <code>false</code>
otherwise. 
+     * @return <code>true</code> if the entry exists, <code>false</code>
otherwise.
      * Note that if the entry exists but if the user does not have the permission to
-     * read it, <code>false</code> will also be returned 
+     * read it, <code>false</code> will also be returned
      * @throws LdapException if some error occurred
      */
     boolean exists( Dn dn ) throws LdapException;
+    
+    
+    /**
+     * Get back the RooDSE from the connected server. We only return the user attributes.
+     * 
+     * @return The Entry containing all the information about the rootDSE
+     * @throws LdapException If the rootDSE can't be read
+     */
+    Entry getRootDse() throws LdapException;
+    
+    
+    /**
+     * Get back the RooDSE from the connected server. The user can provide the
+     * list of attributes he wants to get back. Sending "*" will return all the
+     * user attributes, sending "+" will return all the operational attributes;
+     * 
+     * @param attributes The list of attributes to return
+     * @return The Entry containing all the information about the rootDSE
+     * @throws LdapException If the rootDSE can't be read
+     */
+    Entry getRootDse( String... attributes ) throws LdapException;
 
 
     /**
@@ -778,7 +799,7 @@ public interface LdapConnection
 
     
     /**
-     * Gets the LDAP CODEC service responsible for encoding and decoding 
+     * Gets the LDAP CODEC service responsible for encoding and decoding
      * messages.
      * 
      * @return The LDAP CODEC service.

Modified: directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
(original)
+++ directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Thu Dec  1 13:32:08 2011
@@ -112,6 +112,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.ModifyRequest;
 import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
 import org.apache.directory.shared.ldap.model.message.ModifyResponse;
+import org.apache.directory.shared.ldap.model.message.Request;
 import org.apache.directory.shared.ldap.model.message.Response;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.message.SearchRequest;
@@ -188,7 +189,7 @@ public class LdapNetworkConnection exten
     private IoConnector connector;
 
     /** A mutex used to avoid a double close of the connector */
-    private ReentrantLock connectorMutex = new ReentrantLock(); 
+    private ReentrantLock connectorMutex = new ReentrantLock();
 
     /**
      * The created session, created when we open a connection with
@@ -230,6 +231,9 @@ public class LdapNetworkConnection exten
 
     /** the SslFilter key */
     private static final String SSL_FILTER_KEY = "sslFilter";
+    
+    /** The exception stored in the session if we've got one */
+    private static final String EXCEPTION_KEY = "sessionException";
 
     /** the StartTLS extended operation's OID */
     private static final String START_TLS_REQ_OID = "1.3.6.1.4.1.1466.20037";
@@ -523,8 +527,10 @@ public class LdapNetworkConnection exten
 
         // Wait until it's established
         connectionFuture.awaitUninterruptibly();
+        
+        boolean isConnected = connectionFuture.isConnected();
 
-        if ( !connectionFuture.isConnected() )
+        if ( !isConnected )
         {
             // disposing connector if not connected
             try
@@ -822,16 +828,7 @@ public class LdapNetworkConnection exten
         addToFutureMap( newId, addFuture );
 
         // Send the request to the server
-        WriteFuture writeFuture = ldapSession.write( addRequest );
-
-        // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( timeout ) )
-        {
-            // We didn't received anything : this is an error
-            LOG.error( "Add failed : timeout occured" );
-
-            throw new LdapException( TIME_OUT_ERROR );
-        }
+        writeRequest( addRequest );
 
         // Ok, done return the future
         return addFuture;
@@ -1305,7 +1302,7 @@ public class LdapNetworkConnection exten
 
         addToFutureMap( newId, bindFuture );
 
-        writeBindRequest( bindRequest );
+        writeRequest( bindRequest );
 
         // Ok, done return the future
         return bindFuture;
@@ -1691,18 +1688,9 @@ public class LdapNetworkConnection exten
         addToFutureMap( searchRequest.getMessageId(), searchFuture );
 
         // Send the request to the server
-        WriteFuture writeFuture = ldapSession.write( searchRequest );
-
-        // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( timeout ) )
-        {
-            // We didn't received anything : this is an error
-            LOG.error( "Search failed : timeout occured" );
+        writeRequest( searchRequest );
 
-            throw new LdapException( TIME_OUT_ERROR );
-        }
-
-        // Chekc that the future hasn't be canceled
+        // Check that the future hasn't be canceled
         if ( searchFuture.isCancelled() )
         {
             // Thow an exception here
@@ -1826,6 +1814,7 @@ public class LdapNetworkConnection exten
     public void exceptionCaught( IoSession session, Throwable cause ) throws Exception
     {
         LOG.warn( cause.getMessage(), cause );
+        session.setAttribute( EXCEPTION_KEY, cause );
 
         if ( cause instanceof ProtocolEncoderException )
         {
@@ -1840,10 +1829,8 @@ public class LdapNetworkConnection exten
                 response.setCause( realCause );
             }
         }
-        else
-        {
-            cause.printStackTrace();
-        }
+        
+        session.close( true );
     }
 
 
@@ -2365,16 +2352,7 @@ public class LdapNetworkConnection exten
         addToFutureMap( newId, modifyFuture );
 
         // Send the request to the server
-        WriteFuture writeFuture = ldapSession.write( modRequest );
-
-        // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( timeout ) )
-        {
-            // We didn't received anything : this is an error
-            LOG.error( "Modify failed : timeout occured" );
-
-            throw new LdapException( TIME_OUT_ERROR );
-        }
+        writeRequest( modRequest );
 
         // Ok, done return the future
         return modifyFuture;
@@ -2679,16 +2657,7 @@ public class LdapNetworkConnection exten
         addToFutureMap( newId, modifyDnFuture );
 
         // Send the request to the server
-        WriteFuture writeFuture = ldapSession.write( modDnRequest );
-
-        // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( timeout ) )
-        {
-            // We didn't received anything : this is an error
-            LOG.error( "Modify failed : timeout occured" );
-
-            throw new LdapException( TIME_OUT_ERROR );
-        }
+        writeRequest( modDnRequest );
 
         // Ok, done return the future
         return modifyDnFuture;
@@ -2878,16 +2847,7 @@ public class LdapNetworkConnection exten
         addToFutureMap( newId, deleteFuture );
 
         // Send the request to the server
-        WriteFuture writeFuture = ldapSession.write( deleteRequest );
-
-        // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( timeout ) )
-        {
-            // We didn't received anything : this is an error
-            LOG.error( "Delete failed : timeout occured" );
-
-            throw new LdapException( TIME_OUT_ERROR );
-        }
+        writeRequest( deleteRequest );
 
         // Ok, done return the future
         return deleteFuture;
@@ -3068,16 +3028,7 @@ public class LdapNetworkConnection exten
         addToFutureMap( newId, compareFuture );
 
         // Send the request to the server
-        WriteFuture writeFuture = ldapSession.write( compareRequest );
-
-        // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( timeout ) )
-        {
-            // We didn't received anything : this is an error
-            LOG.error( "Compare failed : timeout occured" );
-
-            throw new LdapException( TIME_OUT_ERROR );
-        }
+        writeRequest( compareRequest );
 
         // Ok, done return the future
         return compareFuture;
@@ -3222,16 +3173,7 @@ public class LdapNetworkConnection exten
         addToFutureMap( newId, extendedFuture );
 
         // Send the request to the server
-        WriteFuture writeFuture = ldapSession.write( extendedRequest );
-
-        // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( timeout ) )
-        {
-            // We didn't received anything : this is an error
-            LOG.error( "Extended failed : timeout occured" );
-
-            throw new LdapException( TIME_OUT_ERROR );
-        }
+        writeRequest( extendedRequest );
 
         // Ok, done return the future
         return extendedFuture;
@@ -3273,6 +3215,24 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
+    public Entry getRootDse() throws LdapException
+    {
+        return lookup( Dn.ROOT_DSE, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public Entry getRootDse( String... attributes ) throws LdapException
+    {
+        return lookup( Dn.ROOT_DSE, attributes );
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
     public Entry lookup( Dn dn ) throws LdapException
     {
         return lookup( dn, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
@@ -3775,7 +3735,7 @@ public class LdapNetworkConnection exten
             SSLContext sslContext = SSLContext.getInstance( config.getSslProtocol() );
             sslContext.init( config.getKeyManagers(), config.getTrustManagers(), config.getSecureRandom()
);
 
-            SslFilter sslFilter = new SslFilter( sslContext );
+            SslFilter sslFilter = new SslFilter( sslContext, true );
             sslFilter.setUseClientMode( true );
             sslFilter.setEnabledCipherSuites( config.getEnabledCipherSuites() );
 
@@ -3885,7 +3845,7 @@ public class LdapNetworkConnection exten
 
                 // Stores the challenge's response, and send it to the server
                 bindRequest.setCredentials( challengeResponse );
-                writeBindRequest( bindRequest );
+                writeRequest( bindRequest );
 
                 // Get the server's response, blocking
                 bindResponse = bindFuture.get( timeout, TimeUnit.MILLISECONDS );
@@ -3911,7 +3871,7 @@ public class LdapNetworkConnection exten
                 bindRequestCopy.setVersion3( bindRequest.getVersion3() );
                 bindRequestCopy.addAllControls( bindRequest.getControls().values().toArray(
new Control[0] ) );
 
-                writeBindRequest( bindRequestCopy );
+                writeRequest( bindRequestCopy );
 
                 bindResponse = bindFuture.get( timeout, TimeUnit.MILLISECONDS );
 
@@ -3945,7 +3905,7 @@ public class LdapNetworkConnection exten
 
                     addToFutureMap( newId, bindFuture );
 
-                    writeBindRequest( bindRequest );
+                    writeRequest( bindRequest );
 
                     bindResponse = bindFuture.get( timeout, TimeUnit.MILLISECONDS );
 
@@ -3974,24 +3934,56 @@ public class LdapNetworkConnection exten
             throw new LdapException( e );
         }
     }
-
-
+    
+    
     /**
      * a reusable code block to be used in various bind methods
      */
-    private void writeBindRequest( BindRequest bindRequest ) throws LdapException
+    private void writeRequest( Request request ) throws LdapException
     {
         // Send the request to the server
-        WriteFuture writeFuture = ldapSession.write( bindRequest );
+        WriteFuture writeFuture = ldapSession.write( request );
 
-        // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( timeout ) )
+        long localTimeout = timeout;
+        
+        while ( localTimeout > 0 )
         {
-            // We didn't received anything : this is an error
-            LOG.error( "Bind failed : timeout occured" );
+            // Wait only 100 ms
+            boolean done = writeFuture.awaitUninterruptibly( 100 );
 
-            throw new LdapException( TIME_OUT_ERROR );
+            if ( done )
+            {
+                return;
+            }
+            
+            // Wait for the message to be sent to the server
+            if ( !ldapSession.isConnected() )
+            {
+                // We didn't received anything : this is an error
+                LOG.error( "Message failed : something wrong has occured" );
+                
+                Exception exception = (Exception)ldapSession.removeAttribute( EXCEPTION_KEY
);
+    
+                if ( exception != null )
+                {
+                    if ( exception instanceof LdapException )
+                    {
+                        throw (LdapException)exception;
+                    }
+                    else
+                    {
+                        throw new InvalidConnectionException( exception.getMessage() );
+                    }
+                }
+                
+                throw new InvalidConnectionException( "Error while sending some message :
the session has been closed" );
+            }
+            
+            localTimeout -= 100;
         }
+        
+        LOG.error( "TimeOut has occured" );
+        throw new LdapException( TIME_OUT_ERROR );
     }
 
 

Modified: directory/shared/branches/shared-txns/ldap/model/src/main/antlr/schema-value.g
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/antlr/schema-value.g?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/antlr/schema-value.g (original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/antlr/schema-value.g Thu Dec
 1 13:32:08 2011
@@ -67,7 +67,7 @@ protected LDIGIT : '1'..'9' ;
 protected DIGIT : '0'..'9' ; 
 protected NUMBER : DIGIT | ( LDIGIT (DIGIT)+ ) ;
 protected NUMBER2 : (DIGIT)+ ;
-protected NUMERICOID : NUMBER ( '.' NUMBER )+ ;
+protected NUMERICOID : NUMBER2 ( '.' NUMBER2 )+ ;
 protected HYPEN : '-';
 protected OTHER : '_' | ';' | '.' | ':' ;
 protected DESCR: CHAR ( CHAR | DIGIT | HYPEN )* ;

Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
(original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
Thu Dec  1 13:32:08 2011
@@ -26,12 +26,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -225,6 +222,19 @@ public final class DefaultEntry implemen
      * @param dn The Dn for this serverEntry. Can be null.
      * @param upIds The list of attributes to create.
      */
+    public DefaultEntry( Dn dn, Object... elements ) throws LdapException
+    {
+        this( null, dn, elements );
+    }
+
+
+    /**
+     * Creates a new instance of DefaultEntry, with a
+     * Dn and a list of IDs.
+     *
+     * @param dn The Dn for this serverEntry. Can be null.
+     * @param upIds The list of attributes to create.
+     */
     public DefaultEntry( SchemaManager schemaManager, String dn, Object... elements ) throws
LdapException
     {
         this( schemaManager, new Dn( schemaManager, dn ), elements );
@@ -432,7 +442,7 @@ public final class DefaultEntry implemen
             return id;
         }
         else
-        {     
+        {
             return upId;
         }
     }

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.10.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.0.10.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.10.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.10.ldif
Thu Dec  1 13:32:08 2011
@@ -4,7 +4,7 @@ objectclass: top
 objectclass: metaTop
 objectclass: metaSyntax
 m-oid: 1.3.6.1.4.1.18060.0.4.1.0.10
-m-description: a syntax for SearchScope
+m-description: Search Scope
 x-humanreadable: TRUE
 m-obsolete: FALSE
 entrycsn: 20100111202214.878000Z#000000#000#000000

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.11.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.0.11.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.11.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.11.ldif
Thu Dec  1 13:32:08 2011
@@ -4,7 +4,7 @@ objectclass: top
 objectclass: metaTop
 objectclass: metaSyntax
 m-oid: 1.3.6.1.4.1.18060.0.4.1.0.11
-m-description: a syntax for DerefAlias
+m-description: Deref Alias
 x-humanreadable: TRUE
 m-obsolete: FALSE
 entrycsn: 20100111202214.878000Z#000000#000#000000

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.1.16.1.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dsyntaxes/m-oid%3D1.3.6.1.1.16.1.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.1.16.1.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.1.16.1.ldif
Thu Dec  1 13:32:08 2011
@@ -3,7 +3,7 @@ dn: m-oid=1.3.6.1.1.16.1,ou=syntaxes,cn=
 x-humanreadable: TRUE
 m-oid: 1.3.6.1.1.16.1
 m-obsolete: FALSE
-m-description: a syntax for UUID values
+m-description: UUID
 objectclass: metaSyntax
 objectclass: metaTop
 objectclass: top

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.0.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.0.0.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.0.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.0.ldif
Thu Dec  1 13:32:08 2011
@@ -3,7 +3,7 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.1.0.0,ou
 x-humanreadable: TRUE
 m-oid: 1.3.6.1.4.1.18060.0.4.1.0.0
 m-obsolete: FALSE
-m-description: a syntax for java byte values
+m-description: Java Byte
 objectclass: metaSyntax
 objectclass: metaTop
 objectclass: top

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.2.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.0.2.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.2.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.2.ldif
Thu Dec  1 13:32:08 2011
@@ -3,7 +3,7 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.1.0.2,ou
 x-humanreadable: TRUE
 m-oid: 1.3.6.1.4.1.18060.0.4.1.0.2
 m-obsolete: FALSE
-m-description: a syntax for java short values
+m-description: Java Short
 objectclass: metaSyntax
 objectclass: metaTop
 objectclass: top

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.3.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.0.3.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.3.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.3.ldif
Thu Dec  1 13:32:08 2011
@@ -3,7 +3,7 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.1.0.3,ou
 x-humanreadable: TRUE
 m-oid: 1.3.6.1.4.1.18060.0.4.1.0.3
 m-obsolete: FALSE
-m-description: a syntax for java long values
+m-description: Java Long
 objectclass: metaSyntax
 objectclass: metaTop
 objectclass: top

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.4.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.0.4.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.4.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.1.0.4.ldif
Thu Dec  1 13:32:08 2011
@@ -3,7 +3,7 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.1.0.4,ou
 x-humanreadable: TRUE
 m-oid: 1.3.6.1.4.1.18060.0.4.1.0.4
 m-obsolete: FALSE
-m-description: a syntax for java int values
+m-description: Java Int
 objectclass: metaSyntax
 objectclass: metaTop
 objectclass: top

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.4203.666.11.2.1.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.4203.666.11.2.1.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.4203.666.11.2.1.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.4203.666.11.2.1.ldif
Thu Dec  1 13:32:08 2011
@@ -3,7 +3,7 @@ dn: m-oid=1.3.6.1.4.1.4203.666.11.2.1,ou
 x-humanreadable: TRUE
 m-oid: 1.3.6.1.4.1.4203.666.11.2.1
 m-obsolete: FALSE
-m-description: a syntax for CSN values
+m-description: CSN
 objectclass: metaSyntax
 objectclass: metaTop
 objectclass: top

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.4203.666.11.2.4.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.4203.666.11.2.4.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.4203.666.11.2.4.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=syntaxes/m-oid=1.3.6.1.4.1.4203.666.11.2.4.ldif
Thu Dec  1 13:32:08 2011
@@ -3,7 +3,7 @@ dn: m-oid=1.3.6.1.4.1.4203.666.11.2.4,ou
 x-humanreadable: TRUE
 m-oid: 1.3.6.1.4.1.4203.666.11.2.4
 m-obsolete: FALSE
-m-description: a syntax for CSN SID values
+m-description: CSN SID
 objectclass: metaSyntax
 objectclass: metaTop
 objectclass: top

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.0.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.0.0.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.0.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.0.ldif
Thu Dec  1 13:32:08 2011
@@ -3,8 +3,7 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.0.0.0,ou
 x-humanreadable: TRUE
 m-oid: 1.3.6.1.4.1.18060.0.4.0.0.0
 m-obsolete: FALSE
-m-description: The syntax for either numeric ids or names.
-m-description: nameOrOid
+m-description: Numeric IDs Or Names
 objectclass: metaSyntax
 objectclass: metaTop
 objectclass: top

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.1.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.0.1.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.1.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.1.ldif
Thu Dec  1 13:32:08 2011
@@ -3,8 +3,7 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.0.0.1,ou
 x-humanreadable: TRUE
 m-oid: 1.3.6.1.4.1.18060.0.4.0.0.1
 m-obsolete: FALSE
-m-description: The syntax for either numeric ids or names.
-m-description: objectClassType
+m-description: Object Class Type
 objectclass: metaSyntax
 objectclass: metaTop
 objectclass: top

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.2.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.0.2.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.2.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.2.ldif
Thu Dec  1 13:32:08 2011
@@ -3,8 +3,7 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.0.0.2,ou
 x-humanreadable: TRUE
 m-oid: 1.3.6.1.4.1.18060.0.4.0.0.2
 m-obsolete: FALSE
-m-description: The syntax for numericoids.
-m-description: numericOid
+m-description: Numeric OID
 objectclass: metaSyntax
 objectclass: metaTop
 objectclass: top

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.4.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.0.4.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.4.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.4.ldif
Thu Dec  1 13:32:08 2011
@@ -3,8 +3,7 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.0.0.4,ou
 x-humanreadable: TRUE
 m-oid: 1.3.6.1.4.1.18060.0.4.0.0.4
 m-obsolete: FALSE
-m-description: The syntax for numeric strings.
-m-description: numeric
+m-description: Numeric String
 objectclass: metaSyntax
 objectclass: metaTop
 objectclass: top

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.6.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dsyntaxes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.0.6.ldif?rev=1209072&r1=1209071&r2=1209072&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.6.ldif
(original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=syntaxes/m-oid=1.3.6.1.4.1.18060.0.4.0.0.6.ldif
Thu Dec  1 13:32:08 2011
@@ -3,8 +3,7 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.0.0.6,ou
 x-humanreadable: TRUE
 m-oid: 1.3.6.1.4.1.18060.0.4.0.0.6
 m-obsolete: FALSE
-m-description: The syntax for object names.
-m-description: objectName
+m-description: Object Name
 objectclass: metaSyntax
 objectclass: metaTop
 objectclass: top



Mime
View raw message