directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1049332 - in /directory: apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/ apacheds/branches/alex_refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/ apacheds/branc...
Date Tue, 14 Dec 2010 23:38:55 GMT
Author: akarasulu
Date: Tue Dec 14 23:38:53 2010
New Revision: 1049332

URL: http://svn.apache.org/viewvc?rev=1049332&view=rev
Log:
Moved classes in o.a.d.s.asn1.primitives into o.a.d.s.asn1.util since these two packages
essentially do the same thing: both deal with primitive ASN.1 types.

Added:
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java   (contents, props changed)
      - copied, changed from r1049319, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitStringTest.java   (contents, props changed)
      - copied, changed from r1049319, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/BitStringTest.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java   (contents, props changed)
      - copied, changed from r1049319, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OIDTest.java   (contents, props changed)
      - copied, changed from r1049319, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/PrimitivesTest.java   (contents, props changed)
      - copied, changed from r1049319, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/PrimitivesTest.java
Removed:
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/
    directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/
Modified:
    directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
    directory/apacheds/branches/alex_refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java
    directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
    directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
    directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
    directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
    directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
    directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
    directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
    directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
    directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ObjectIdentifierFirstComponentComparator.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/OidRegistry.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java
    directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java

Modified: directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Tue Dec 14 23:38:53 2010
@@ -31,7 +31,7 @@ import org.apache.directory.ldap.client.
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.EmptyCursor;
 import org.apache.directory.shared.ldap.cursor.SearchCursor;

Modified: directory/apacheds/branches/alex_refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java (original)
+++ directory/apacheds/branches/alex_refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java Tue Dec 14 23:38:53 2010
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.shared.kerberos.flags;
 
-import org.apache.directory.shared.asn1.primitives.BitString;
+import org.apache.directory.shared.asn1.util.BitString;
 
 
 /**

Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Tue Dec 14 23:38:53 2010
@@ -32,7 +32,7 @@ import java.util.Set;
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.entry.Entry;

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Tue Dec 14 23:38:53 2010
@@ -28,7 +28,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.dsmlv2.AbstractGrammar;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Container;
 import org.apache.directory.shared.dsmlv2.Dsmlv2StatesEnum;

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java Tue Dec 14 23:38:53 2010
@@ -21,7 +21,7 @@
 package org.apache.directory.shared.dsmlv2.reponse;
 
 
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.ExtendedResponse;

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Tue Dec 14 23:38:53 2010
@@ -26,7 +26,7 @@ import java.lang.reflect.Array;
 import java.util.HashMap;
 
 import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.dsmlv2.AbstractGrammar;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Container;
 import org.apache.directory.shared.dsmlv2.Dsmlv2StatesEnum;
@@ -1565,7 +1565,7 @@ public final class Dsmlv2Grammar extends
                 {
                     String oid = nextText.trim();
 
-                    if ( OID.isOID( oid ) )
+                    if ( OID.isOID(oid) )
                     {
                         extendedRequest.setRequestName( nextText.trim() );
                     }

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java Tue Dec 14 23:38:53 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.request;
 
 
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.ExtendedRequest;

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java Tue Dec 14 23:38:53 2010
@@ -32,7 +32,7 @@ import java.util.Collection;
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;

Modified: directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original)
+++ directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Tue Dec 14 23:38:53 2010
@@ -23,7 +23,7 @@ package org.apache.directory.ldap.client
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.ldap.cursor.SearchCursor;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Modification;
@@ -563,7 +563,7 @@ public interface LdapConnection
      * @param oid the object identifier of the extended operation
      * @return extended operation's response
      * @throws LdapException if some error occurred
-     * @see #extended(OID, byte[])
+     * @see #extended(org.apache.directory.shared.asn1.util.OID, byte[])
      */
     ExtendedResponse extended( String oid ) throws LdapException;
 
@@ -575,7 +575,7 @@ public interface LdapConnection
      * @param value value to be used by the extended operation, can be a null value
      * @return extended operation's response
      * @throws LdapException if some error occurred
-     * @see #extended(OID, byte[])
+     * @see #extended(org.apache.directory.shared.asn1.util.OID, byte[])
      */
     ExtendedResponse extended( String oid, byte[] value ) throws LdapException;
 
@@ -586,7 +586,7 @@ public interface LdapConnection
      * @param oid the object identifier of the extended operation
      * @return extended operation's response
      * @throws LdapException if some error occurred
-     * @see #extended(OID, byte[])
+     * @see #extended(org.apache.directory.shared.asn1.util.OID, byte[])
      */
     ExtendedResponse extended( OID oid ) throws LdapException;
 

Modified: directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Tue Dec 14 23:38:53 2010
@@ -58,7 +58,7 @@ import org.apache.directory.ldap.client.
 import org.apache.directory.ldap.client.api.protocol.LdapProtocolCodecFactory;
 import org.apache.directory.shared.asn1.ber.Asn1Container;
 import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.MessageEncoderException;
 import org.apache.directory.shared.ldap.codec.controls.ControlImpl;

Modified: directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java (original)
+++ directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java Tue Dec 14 23:38:53 2010
@@ -26,7 +26,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -138,7 +138,7 @@ public class SchemaEntityFactory impleme
             throw new IllegalArgumentException( msg );
         }
 
-        if ( !OID.isOID( oid ) )
+        if ( !OID.isOID(oid) )
         {
             String msg = I18n.err( I18n.ERR_10006, oid );
             LOG.warn( msg );

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java Tue Dec 14 23:38:53 2010
@@ -25,8 +25,8 @@ import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.asn1.primitives.BitString;
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.BitString;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.asn1.util.Asn1StringUtils;
 import org.apache.directory.shared.i18n.I18n;
 

Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java (from r1049319, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java&r1=1049319&r2=1049332&rev=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java Tue Dec 14 23:38:53 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.asn1.primitives;
+package org.apache.directory.shared.asn1.util;
 
 
 import java.io.Serializable;

Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Dec 14 23:38:53 2010
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitStringTest.java (from r1049319, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/BitStringTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitStringTest.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitStringTest.java&p1=directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/BitStringTest.java&r1=1049319&r2=1049332&rev=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/BitStringTest.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitStringTest.java Tue Dec 14 23:38:53 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.asn1.primitives;
+package org.apache.directory.shared.asn1.util;
 
 
 import static org.junit.Assert.assertEquals;
@@ -27,7 +27,6 @@ import static org.junit.Assert.fail;
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.asn1.util.Asn1StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -58,11 +57,11 @@ public class BitStringTest
         try
         {
             bitString.getBit( 0 );
-            fail( "Should not reach this point ..." );
+            Assert.fail("Should not reach this point ...");
         }
         catch ( IndexOutOfBoundsException ioobe )
         {
-            assertTrue( true );
+            Assert.assertTrue(true);
         }
     }
 
@@ -82,11 +81,11 @@ public class BitStringTest
         try
         {
             bitString.getBit( 0 );
-            fail( "Should not reach this point ..." );
+            Assert.fail("Should not reach this point ...");
         }
         catch ( IndexOutOfBoundsException ioobe )
         {
-            assertTrue( true );
+            Assert.assertTrue(true);
         }
     }
 
@@ -211,7 +210,7 @@ public class BitStringTest
             }
         }
         
-        assertEquals( Asn1StringUtils.dumpBytes( bytes ), Asn1StringUtils.dumpBytes( bitString.getData() ) );
+        Assert.assertEquals(Asn1StringUtils.dumpBytes(bytes), Asn1StringUtils.dumpBytes(bitString.getData()));
     }
 
     @Test
@@ -239,7 +238,7 @@ public class BitStringTest
         byte[] bytesModified = new byte[]
             { 0x00, (byte)0xAA, 0x51, (byte)0x88, (byte)0xFE };
                             
-        assertEquals( Asn1StringUtils.dumpBytes( bytesModified ), Asn1StringUtils.dumpBytes( bitString.getData() ) );
+        Assert.assertEquals(Asn1StringUtils.dumpBytes(bytesModified), Asn1StringUtils.dumpBytes(bitString.getData()));
     }
 
     @Test
@@ -267,6 +266,6 @@ public class BitStringTest
         byte[] bytesModified = new byte[]
             { 0x00, (byte)0xAA, 0x01, (byte)0x88, (byte)0xFE };
                             
-        assertEquals( Asn1StringUtils.dumpBytes( bytesModified ), Asn1StringUtils.dumpBytes( bitString.getData() ) );
+        Assert.assertEquals(Asn1StringUtils.dumpBytes(bytesModified), Asn1StringUtils.dumpBytes(bitString.getData()));
     }
 }

Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitStringTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitStringTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Dec 14 23:38:53 2010
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java (from r1049319, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java&r1=1049319&r2=1049332&rev=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java Tue Dec 14 23:38:53 2010
@@ -17,14 +17,13 @@
  *  under the License.
  *
  */
-package org.apache.directory.shared.asn1.primitives;
+package org.apache.directory.shared.asn1.util;
 
 
 import java.io.Serializable;
 import java.util.Arrays;
 
 import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.asn1.util.Asn1StringUtils;
 import org.apache.directory.shared.i18n.I18n;
 
 

Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Dec 14 23:38:53 2010
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OIDTest.java (from r1049319, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OIDTest.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OIDTest.java&p1=directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java&r1=1049319&r2=1049332&rev=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OIDTest.java Tue Dec 14 23:38:53 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.asn1.primitives;
+package org.apache.directory.shared.asn1.util;
 
 
 import org.apache.directory.junit.tools.Concurrent;
@@ -56,11 +56,11 @@ public class OIDTest
         try
         {
             oid.setOID( ( byte[] ) null );
-            fail( "Should not reach this point ..." );
+            Assert.fail("Should not reach this point ...");
         }
         catch ( DecoderException de )
         {
-            assertTrue( true );
+            Assert.assertTrue(true);
         }
     }
 
@@ -78,11 +78,11 @@ public class OIDTest
         {
             oid.setOID( new byte[]
                 {} );
-            fail( "Should not reach this point ..." );
+            Assert.fail("Should not reach this point ...");
         }
         catch ( DecoderException de )
         {
-            assertTrue( true );
+            Assert.assertTrue(true);
         }
     }
 
@@ -142,7 +142,7 @@ public class OIDTest
         }
         catch ( DecoderException de )
         {
-            fail();
+            Assert.fail();
         }
     }
 
@@ -181,7 +181,7 @@ public class OIDTest
         }
         catch ( DecoderException de )
         {
-            fail();
+            Assert.fail();
         }
     }
 
@@ -232,7 +232,7 @@ public class OIDTest
         }
         catch ( DecoderException de )
         {
-            fail();
+            Assert.fail();
         }
     }
 
@@ -265,7 +265,7 @@ public class OIDTest
         }
         catch ( DecoderException de )
         {
-            fail();
+            Assert.fail();
         }
     }
 
@@ -276,16 +276,16 @@ public class OIDTest
     @Test
     public void testOidStringBad()
     {
-        assertFalse( OID.isOID( "0" ) );
-        assertFalse( OID.isOID( "0." ) );
-        assertFalse( OID.isOID( "." ) );
-        assertFalse( OID.isOID( "0.1.2." ) );
-        assertFalse( OID.isOID( "3.1" ) );
-        assertFalse( OID.isOID( "0..1" ) );
-        assertFalse( OID.isOID( "0..12" ) );
-        assertFalse( OID.isOID( "0.a.2" ) );
-        assertTrue( OID.isOID( "0.123456" ) );
-        assertTrue( OID.isOID( "1.123456" ) );
+        Assert.assertFalse(OID.isOID("0"));
+        Assert.assertFalse(OID.isOID("0."));
+        Assert.assertFalse(OID.isOID("."));
+        Assert.assertFalse(OID.isOID("0.1.2."));
+        Assert.assertFalse(OID.isOID("3.1"));
+        Assert.assertFalse(OID.isOID("0..1"));
+        Assert.assertFalse(OID.isOID("0..12"));
+        Assert.assertFalse(OID.isOID("0.a.2"));
+        Assert.assertTrue(OID.isOID("0.123456"));
+        Assert.assertTrue(OID.isOID("1.123456"));
     }
 
 
@@ -307,7 +307,7 @@ public class OIDTest
         }
         catch ( DecoderException de )
         {
-            fail();
+            Assert.fail();
         }
     }
 
@@ -330,7 +330,7 @@ public class OIDTest
         }
         catch ( DecoderException de )
         {
-            fail();
+            Assert.fail();
         }
     }
 
@@ -368,7 +368,7 @@ public class OIDTest
         }
         catch ( DecoderException de )
         {
-            fail();
+            Assert.fail();
         }
     }
 
@@ -382,9 +382,9 @@ public class OIDTest
         OID oid2 = new OID();
         OID oid3 = new OID( "1.1" );
 
-        assertTrue( oid1.equals( oid2 ) );
-        assertFalse( oid1.equals( oid3 ) );
-        assertFalse( oid2.equals( oid3 ) );
+        Assert.assertTrue(oid1.equals(oid2));
+        Assert.assertFalse(oid1.equals(oid3));
+        Assert.assertFalse(oid2.equals(oid3));
     }
 
     /**
@@ -401,8 +401,8 @@ public class OIDTest
         OID oid2 = new OID( s2 );
         OID oid3 = new OID( s3 );
         
-        assertTrue( oid1.equals( oid2 ) );
-        assertFalse( oid1.equals( oid3 ) );
-        assertFalse( oid2.equals( oid3 ) );
+        Assert.assertTrue(oid1.equals(oid2));
+        Assert.assertFalse(oid1.equals(oid3));
+        Assert.assertFalse(oid2.equals(oid3));
     }
 }

Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OIDTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/OIDTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Dec 14 23:38:53 2010
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/PrimitivesTest.java (from r1049319, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/PrimitivesTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/PrimitivesTest.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/PrimitivesTest.java&p1=directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/PrimitivesTest.java&r1=1049319&r2=1049332&rev=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/PrimitivesTest.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/PrimitivesTest.java Tue Dec 14 23:38:53 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.asn1.primitives;
+package org.apache.directory.shared.asn1.util;
 
 
 import org.apache.directory.junit.tools.Concurrent;
@@ -51,55 +51,55 @@ public class PrimitivesTest
         value.init( 1 );
         value.setData( new byte[]
             { 0x00 } ); // res = 0
-        assertEquals( 0, IntegerDecoder.parse( value ) );
+        Assert.assertEquals(0, IntegerDecoder.parse(value));
         value.reset();
 
         value.init( 1 );
         value.setData( new byte[]
             { 0x01 } ); // res = 1
-        assertEquals( 1, IntegerDecoder.parse( value ) );
+        Assert.assertEquals(1, IntegerDecoder.parse(value));
         value.reset();
 
         value.init( 1 );
         value.setData( new byte[]
             { ( byte ) 0xFF } ); // res = 255
-        assertEquals( -1, IntegerDecoder.parse( value ) );
+        Assert.assertEquals(-1, IntegerDecoder.parse(value));
         value.reset();
 
         value.init( 2 );
         value.setData( new byte[]
             { 0x00, 0x01 } ); // res = 1
-        assertEquals( 1, IntegerDecoder.parse( value ) );
+        Assert.assertEquals(1, IntegerDecoder.parse(value));
         value.reset();
 
         value.init( 2 );
         value.setData( new byte[]
             { 0x01, 0x00 } ); // res = 256
-        assertEquals( 256, IntegerDecoder.parse( value ) );
+        Assert.assertEquals(256, IntegerDecoder.parse(value));
         value.reset();
 
         value.init( 2 );
         value.setData( new byte[]
             { 0x01, 0x01 } ); // res = 257
-        assertEquals( 257, IntegerDecoder.parse( value ) );
+        Assert.assertEquals(257, IntegerDecoder.parse(value));
         value.reset();
 
         value.init( 2 );
         value.setData( new byte[]
             { 0x01, ( byte ) 0xFF } ); // res = 511
-        assertEquals( 511, IntegerDecoder.parse( value ) );
+        Assert.assertEquals(511, IntegerDecoder.parse(value));
         value.reset();
 
         value.init( 2 );
         value.setData( new byte[]
             { 0x02, 0x00 } ); // res = 512
-        assertEquals( 512, IntegerDecoder.parse( value ) );
+        Assert.assertEquals(512, IntegerDecoder.parse(value));
         value.reset();
 
         value.init( 3 );
         value.setData( new byte[]
             { 0x00, ( byte ) 0xFF, ( byte ) 0xFF } ); // res = 65535
-        assertEquals( 65535, IntegerDecoder.parse( value ) );
+        Assert.assertEquals(65535, IntegerDecoder.parse(value));
         value.reset();
 
         value.init( 4 );
@@ -110,7 +110,7 @@ public class PrimitivesTest
                                                                                 // - 1
                                                                                 // =
                                                                                 // MaxInt
-        assertEquals( Integer.MAX_VALUE, IntegerDecoder.parse( value ) );
+        Assert.assertEquals(Integer.MAX_VALUE, IntegerDecoder.parse(value));
         value.reset();
 
         value.init( 4 );
@@ -120,7 +120,7 @@ public class PrimitivesTest
                                                                                 // 2^31
                                                                                 // =
                                                                                 // MinInt
-        assertEquals( Integer.MIN_VALUE, IntegerDecoder.parse( value ) );
+        Assert.assertEquals(Integer.MIN_VALUE, IntegerDecoder.parse(value));
         value.reset();
     }
 } // end class TLVTagDecoderTest

Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/PrimitivesTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/asn1/util/PrimitivesTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Dec 14 23:38:53 2010
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Tue Dec 14 23:38:53 2010
@@ -30,13 +30,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
-import org.apache.directory.shared.asn1.primitives.OID;
-import org.apache.directory.shared.asn1.util.BooleanDecoder;
-import org.apache.directory.shared.asn1.util.BooleanDecoderException;
-import org.apache.directory.shared.asn1.util.IntegerDecoder;
-import org.apache.directory.shared.asn1.util.IntegerDecoderException;
-import org.apache.directory.shared.asn1.util.LongDecoder;
-import org.apache.directory.shared.asn1.util.LongDecoderException;
+import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.*;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.actions.AttributeDescAction;
 import org.apache.directory.shared.ldap.codec.actions.ControlValueAction;
@@ -3236,7 +3231,7 @@ public final class LdapMessageGrammar ex
 
                         if ( OID.isOID( oidStr ) )
                         {
-                            OID.isOID( oidStr );
+                            OID.isOID(oidStr);
                             intermediateResponse.setResponseName( oidStr );
                         }
                         else

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java Tue Dec 14 23:38:53 2010
@@ -24,7 +24,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.Asn1Container;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
 import org.apache.directory.shared.ldap.message.ExtendedResponse;

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java Tue Dec 14 23:38:53 2010
@@ -26,7 +26,7 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
@@ -566,7 +566,7 @@ public class DefaultEntryAttribute imple
             if ( attributeType.getName() == null )
             {
                 // If the name is null, then we may have to store an OID
-                if ( !OID.isOID( newId )  || !attributeType.getOid().equals( newId ) )
+                if ( !OID.isOID(newId)  || !attributeType.getOid().equals( newId ) )
                 {
                     // This is an error
                     throw new IllegalArgumentException( I18n.err( I18n.ERR_04132 ) );

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java Tue Dec 14 23:38:53 2010
@@ -41,7 +41,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ObjectIdentifierFirstComponentComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ObjectIdentifierFirstComponentComparator.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ObjectIdentifierFirstComponentComparator.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ObjectIdentifierFirstComponentComparator.java Tue Dec 14 23:38:53 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.schema.comparators;
 
 
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.ldap.schema.LdapComparator;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java Tue Dec 14 23:38:53 2010
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException;
 import org.apache.directory.shared.ldap.exception.LdapException;

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/OidRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/OidRegistry.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/OidRegistry.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/OidRegistry.java Tue Dec 14 23:38:53 2010
@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.schema.SchemaObject;
@@ -187,7 +187,7 @@ public class OidRegistry implements Iter
 
         String oid = schemaObject.getOid();
 
-        if ( !OID.isOID( oid ) )
+        if ( !OID.isOID(oid) )
         {
             String message = I18n.err( I18n.ERR_04290 );
 

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java Tue Dec 14 23:38:53 2010
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -94,7 +94,7 @@ public class NumericOidSyntaxChecker ext
         }
 
         // Just check that the value is a valid OID
-        boolean result = ( OID.isOID( strValue ) );
+        boolean result = ( OID.isOID(strValue) );
         
         if ( result )
         {

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java Tue Dec 14 23:38:53 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.schema.syntaxCheckers;
 
 
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -122,7 +122,7 @@ public class OidLenSyntaxChecker extends
             // we should have a len value. First check that the OID is valid
             String oid = strValue.substring( 0, pos );
             
-            if ( !OID.isOID( oid ) )
+            if ( !OID.isOID(oid) )
             {
                 LOG.debug( "Syntax invalid for '{}'", value );
                 return false;

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java Tue Dec 14 23:38:53 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.schema.syntaxCheckers;
 
 
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.util.StringTools;

Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java?rev=1049332&r1=1049331&r2=1049332&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java Tue Dec 14 23:38:53 2010
@@ -31,7 +31,7 @@ import java.util.Arrays;
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.asn1.primitives.BitString;
+import org.apache.directory.shared.asn1.util.BitString;
 import org.apache.directory.shared.asn1.util.Asn1StringUtils;
 import org.apache.directory.shared.asn1.util.IntegerDecoder;
 import org.apache.directory.shared.asn1.util.LongDecoder;



Mime
View raw message