You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/20 15:43:38 UTC
svn commit: r1061319 - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/
apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/
apacheds/trunk/xdbm-partition/src/main/java/org/apache...
Author: akarasulu
Date: Thu Jan 20 14:43:36 2011
New Revision: 1061319
URL: http://svn.apache.org/viewvc?rev=1061319&view=rev
Log:
moving primitives classes into utils package for asn1
Added:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java (contents, props changed)
- copied, changed from r1061318, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java (contents, props changed)
- copied, changed from r1061318, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/BitStringTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/OIDTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/PrimitivesTest.java
Removed:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/BitStringTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/PrimitivesTest.java
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ObjectIdentifierFirstComponentComparator.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/OidRegistry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Thu Jan 20 14:43:36 2011
@@ -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/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/AbstractKerberosFlags.java Thu Jan 20 14:43:36 2011
@@ -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/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Thu Jan 20 14:43:36 2011
@@ -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/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Thu Jan 20 14:43:36 2011
@@ -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;
@@ -1204,7 +1204,7 @@ public final class Dsmlv2ResponseGrammar
if ( attributeValue != null )
{
- if ( !OID.isOID( attributeValue ) )
+ if ( !OID.isOID(attributeValue) )
{
throw new XmlPullParserException( I18n.err( I18n.ERR_03006 ), xpp, null );
}
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java Thu Jan 20 14:43:36 2011
@@ -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/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Thu Jan 20 14:43:36 2011
@@ -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;
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java Thu Jan 20 14:43:36 2011
@@ -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/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java Thu Jan 20 14:43:36 2011
@@ -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/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Thu Jan 20 14:43:36 2011
@@ -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;
@@ -564,7 +564,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;
@@ -576,7 +576,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;
@@ -587,7 +587,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/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Thu Jan 20 14:43:36 2011
@@ -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.DecoderException;
import org.apache.directory.shared.asn1.ber.Asn1Container;
-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/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Thu Jan 20 14:43:36 2011
@@ -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;
@@ -111,7 +111,7 @@ public class SchemaEntityFactory impleme
String oid = mOid.getString();
- if ( !OID.isOID( oid ) )
+ if ( !OID.isOID(oid) )
{
String msg = I18n.err( I18n.ERR_10006, oid );
LOG.warn( msg );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java Thu Jan 20 14:43:36 2011
@@ -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/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java (from r1061318, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java&r1=1061318&r2=1061319&rev=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java Thu Jan 20 14:43:36 2011
@@ -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/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/BitString.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Thu Jan 20 14:43:36 2011
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java (from r1061318, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java&r1=1061318&r2=1061319&rev=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java Thu Jan 20 14:43:36 2011
@@ -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/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/OID.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Thu Jan 20 14:43:36 2011
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Thu Jan 20 14:43:36 2011
@@ -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;
@@ -3439,7 +3434,7 @@ public final class LdapMessageGrammar ex
String oidValue = StringTools.asciiBytesToString( value );
// The OID is encoded as a String, not an Object Id
- if ( !OID.isOID( oidValue ) )
+ if ( !OID.isOID(oidValue) )
{
LOG.error( I18n.err( I18n.ERR_04098, StringTools.dumpBytes( value ) ) );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java Thu Jan 20 14:43:36 2011
@@ -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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttribute.java Thu Jan 20 14:43:36 2011
@@ -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;
@@ -593,7 +593,7 @@ public class DefaultEntryAttribute imple
}
// Last case, the UpId is an OID
- if ( !OID.isOID( newId ) || !attributeType.getOid().equals( newId ) )
+ if ( !OID.isOID(newId) || !attributeType.getOid().equals( newId ) )
{
// The id is incorrect : this is not allowed
throw new IllegalArgumentException( I18n.err( I18n.ERR_04455, id, attributeType.getName() ) );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java Thu Jan 20 14:43:36 2011
@@ -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;
@@ -755,7 +755,7 @@ public class LdifReader implements Itera
// Create and check the OID
String oidString = lowerLine.substring( 0, pos );
- if ( !OID.isOID( oidString ) )
+ if ( !OID.isOID(oidString) )
{
String message = I18n.err( I18n.ERR_12031_INVALID_OID, oidString );
LOG.error( message );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ObjectIdentifierFirstComponentComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ObjectIdentifierFirstComponentComparator.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ObjectIdentifierFirstComponentComparator.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ObjectIdentifierFirstComponentComparator.java Thu Jan 20 14:43:36 2011
@@ -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;
@@ -77,7 +77,7 @@ public class ObjectIdentifierFirstCompon
String numericOid = s.substring( start, pos );
- if ( OID.isOID( numericOid ) )
+ if ( OID.isOID(numericOid) )
{
return numericOid;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java Thu Jan 20 14:43:36 2011
@@ -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;
@@ -90,7 +90,7 @@ public abstract class DefaultSchemaObjec
*/
public String getSchemaName( String oid ) throws LdapException
{
- if ( !OID.isOID( oid ) )
+ if ( !OID.isOID(oid) )
{
String msg = I18n.err( I18n.ERR_04267 );
LOG.warn( msg );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/OidRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/OidRegistry.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/OidRegistry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/OidRegistry.java Thu Jan 20 14:43:36 2011
@@ -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;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NumericOidSyntaxChecker.java Thu Jan 20 14:43:36 2011
@@ -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;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidLenSyntaxChecker.java Thu Jan 20 14:43:36 2011
@@ -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;
@@ -104,7 +104,7 @@ public class OidLenSyntaxChecker extends
if ( pos < 0 )
{
// Not found ... but it may still be a valid OID
- boolean result = OID.isOID( strValue );
+ boolean result = OID.isOID(strValue);
if ( result )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/OidSyntaxChecker.java Thu Jan 20 14:43:36 2011
@@ -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;
@@ -102,7 +102,7 @@ public class OidSyntaxChecker extends Sy
// checked to make sure there are no other chars except '.' and digits.
if ( StringTools.isDigit( strValue.charAt( 0 ) ) )
{
- if ( ! OID.isOID( strValue ) )
+ if ( ! OID.isOID(strValue) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java Thu Jan 20 14:43:36 2011
@@ -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;
Added: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/BitStringTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/BitStringTest.java?rev=1061319&view=auto
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/BitStringTest.java (added)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/BitStringTest.java Thu Jan 20 14:43:36 2011
@@ -0,0 +1,273 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.shared.asn1.util;
+
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+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.apache.directory.shared.asn1.util.BitString;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+/**
+ * Test the Bit String primitive
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
+public class BitStringTest
+{
+ // ~ Methods
+ // ------------------------------------------------------------------------------------
+
+ /**
+ * Test a null BitString
+ */
+ @Test
+ public void testBitStringNull()
+ {
+
+ BitString bitString = new BitString( 1 );
+
+ bitString.setData( null );
+
+ try
+ {
+ bitString.getBit( 0 );
+ fail( "Should not reach this point ..." );
+ }
+ catch ( IndexOutOfBoundsException ioobe )
+ {
+ assertTrue( true );
+ }
+ }
+
+
+ /**
+ * Test an empty BitString
+ */
+ @Test
+ public void testBitStringEmpty()
+ {
+
+ BitString bitString = new BitString( 1 );
+
+ bitString.setData( new byte[]
+ {} );
+
+ try
+ {
+ bitString.getBit( 0 );
+ fail( "Should not reach this point ..." );
+ }
+ catch ( IndexOutOfBoundsException ioobe )
+ {
+ assertTrue( true );
+ }
+ }
+
+
+ /**
+ * Test a single bit BitString
+ */
+ @Test
+ public void testSingleBitBitString() throws DecoderException
+ {
+
+ BitString bitString = new BitString(new byte[] {0x07, ( byte ) 0x80 });
+
+ assertEquals( true, bitString.getBit( 0 ) );
+ }
+
+
+ /**
+ * Test a 32 bits BitString
+ */
+ @Test
+ public void test32BitsBitString() throws DecoderException
+ {
+
+ BitString bitString = new BitString( 32 );
+
+ bitString.setData( new byte[]
+ { 0x00, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF } );
+
+ for ( int i = 0; i < 32; i++ )
+ {
+ assertEquals( true, bitString.getBit( i ) );
+ }
+ }
+
+
+ /**
+ * Test a 33 bits BitString
+ */
+ @Test
+ public void test33BitsBitString() throws DecoderException
+ {
+
+ BitString bitString = new BitString( 33 );
+
+ bitString.setData( new byte[]
+ { 0x07, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0x80 } );
+
+ for ( int i = 0; i < 33; i++ )
+ {
+ assertEquals( true, bitString.getBit( i ) );
+ }
+
+ assertEquals( true, bitString.getBit( 32 ) );
+ }
+
+
+ /**
+ * Test all bits from 0 to 128 BitString
+ */
+ @Test
+ public void test0to128BitString() throws DecoderException
+ {
+
+ // bit number 14
+ BitString bitString14 = new BitString( 14 );
+
+ bitString14.setData( new byte[]
+ { 0x02, ( byte ) 0xFF, ( byte ) 0xFC } );
+
+ for ( int i = 0; i < 14; i++ )
+ {
+ assertEquals( true, bitString14.getBit( i ) );
+ }
+
+ // bit number 31
+ BitString bitString31 = new BitString( 31 );
+
+ bitString31.setData( new byte[]
+ { 0x01, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFE } );
+
+ for ( int i = 0; i < 31; i++ )
+ {
+ assertEquals( true, bitString31.getBit( i ) );
+ }
+
+ // bit number 128
+ BitString bitString128 = new BitString( 128 );
+
+ bitString128.setData( new byte[]
+ { 0x00, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF,
+ ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF,
+ ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF } );
+
+ for ( int i = 0; i < 128; i++ )
+ {
+ assertEquals( true, bitString128.getBit( i ) );
+ }
+ }
+
+ @Test
+ public void testBitStringSet()
+ {
+ BitString bitString = new BitString( 32 );
+
+ byte[] bytes = new byte[]
+ { 0x00, (byte)0xAA, 0x11, (byte)0x88, (byte)0xFE };
+
+ int[] bits = new int[]
+ {
+ 1, 0, 1, 0 , 1, 0, 1, 0,
+ 0, 0, 0, 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1, 0, 0, 0,
+ 1, 1, 1, 1, 1, 1, 1, 0
+ };
+
+ for ( int i = 0; i < bits.length; i++ )
+ {
+ if ( bits[i] == 1 )
+ {
+ bitString.setBit( i );
+ }
+ }
+
+ assertEquals( Asn1StringUtils.dumpBytes( bytes ), Asn1StringUtils.dumpBytes( bitString.getData() ) );
+ }
+
+ @Test
+ public void testBitStringSetBit()
+ {
+ BitString bitString = new BitString( 32 );
+
+ int[] bits = new int[]
+ {
+ 1, 0, 1, 0 , 1, 0, 1, 0,
+ 0, 0, 0, 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1, 0, 0, 0, // After modification, will become 8A
+ 1, 1, 1, 1, 1, 1, 1, 0
+ };
+
+ for ( int i = 0; i < bits.length; i++ )
+ {
+ if ( bits[i] == 1 )
+ {
+ bitString.setBit( i );
+ }
+ }
+
+ bitString.setBit( 9 );
+ byte[] bytesModified = new byte[]
+ { 0x00, (byte)0xAA, 0x51, (byte)0x88, (byte)0xFE };
+
+ assertEquals( Asn1StringUtils.dumpBytes( bytesModified ), Asn1StringUtils.dumpBytes( bitString.getData() ) );
+ }
+
+ @Test
+ public void testBitStringClearBit()
+ {
+ BitString bitString = new BitString( 32 );
+
+ int[] bits = new int[]
+ {
+ 1, 0, 1, 0 , 1, 0, 1, 0,
+ 0, 0, 0, 1, 0, 0, 0, 1,
+ 1, 0, 0, 0, 1, 0, 0, 0,
+ 1, 1, 1, 1, 1, 1, 1, 0
+ };
+
+ for ( int i = 0; i < bits.length; i++ )
+ {
+ if ( bits[i] == 1 )
+ {
+ bitString.setBit( i );
+ }
+ }
+
+ bitString.clearBit( 11 );
+ byte[] bytesModified = new byte[]
+ { 0x00, (byte)0xAA, 0x01, (byte)0x88, (byte)0xFE };
+
+ assertEquals( Asn1StringUtils.dumpBytes( bytesModified ), Asn1StringUtils.dumpBytes( bitString.getData() ) );
+ }
+}
Added: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/OIDTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/OIDTest.java?rev=1061319&view=auto
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/OIDTest.java (added)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/OIDTest.java Thu Jan 20 14:43:36 2011
@@ -0,0 +1,409 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.shared.asn1.util;
+
+
+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.OID;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+
+/**
+ * Test the OID primitive
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
+public class OIDTest
+{
+ // ~ Methods
+ // ------------------------------------------------------------------------------------
+
+ /**
+ * Test a null OID
+ */
+ @Test
+ public void testOidNull()
+ {
+
+ OID oid = new OID();
+
+ try
+ {
+ oid.setOID( ( byte[] ) null );
+ fail( "Should not reach this point ..." );
+ }
+ catch ( DecoderException de )
+ {
+ assertTrue( true );
+ }
+ }
+
+
+ /**
+ * Test an empty OID
+ */
+ @Test
+ public void testOidEmpty()
+ {
+
+ OID oid = new OID();
+
+ try
+ {
+ oid.setOID( new byte[]
+ {} );
+ fail( "Should not reach this point ..." );
+ }
+ catch ( DecoderException de )
+ {
+ assertTrue( true );
+ }
+ }
+
+
+ /**
+ * Test itu-t OID tree
+ */
+ @Test
+ public void testOidItuT()
+ {
+
+ OID oid = new OID();
+
+ try
+ {
+
+ // itu-t(0), recommendation(0), series a-z (0..26)
+ for ( int i = 1; i < 27; i++ )
+ {
+ oid.setOID( new byte[]
+ { 0x00, ( byte ) i } );
+ assertEquals( "0.0." + i, oid.toString() );
+ }
+
+ // itu-t(0), question(1)
+ oid.setOID( new byte[]
+ { 0x01 } );
+ assertEquals( "0.1", oid.toString() );
+
+ // itu-t(0), administration(2), country(202 .. 748)
+ for ( int i = 202; i < 748; i++ )
+ {
+ oid.setOID( new byte[]
+ { 0x02, ( byte ) ( ( i / 128 ) | 0x0080 ), ( byte ) ( i % 128 ) } );
+ assertEquals( "0.2." + i, oid.toString() );
+ }
+
+ // itu-t(0), network-operator(3), operator(2023 .. 41363)
+ for ( int i = 2023; i < 41363; i++ )
+ {
+
+ if ( i < ( 128 * 128 ) )
+ {
+ oid.setOID( new byte[]
+ { 0x03, ( byte ) ( ( i / 128 ) | 0x0080 ), ( byte ) ( i % 128 ) } );
+ assertEquals( "0.3." + i, oid.toString() );
+ }
+ else
+ {
+ oid.setOID( new byte[]
+ { 0x03, ( byte ) ( ( i / ( 128 * 128 ) ) | 0x0080 ),
+ ( byte ) ( ( ( i / 128 ) % 128 ) | 0x0080 ), ( byte ) ( i % 128 ) } );
+ assertEquals( "0.3." + i, oid.toString() );
+
+ }
+ }
+ }
+ catch ( DecoderException de )
+ {
+ fail();
+ }
+ }
+
+
+ /**
+ * Test iso OID tree
+ */
+ @Test
+ public void testOidIso()
+ {
+
+ OID oid = new OID();
+
+ try
+ {
+
+ // iso(1), standard(0)
+ oid.setOID( new byte[]
+ { 40 + 0 } );
+ assertEquals( "1.0", oid.toString() );
+
+ // iso(1), registration-authority(1)
+ oid.setOID( new byte[]
+ { 40 + 1 } );
+ assertEquals( "1.1", oid.toString() );
+
+ // iso(1), member-body(2)
+ oid.setOID( new byte[]
+ { 40 + 2 } );
+ assertEquals( "1.2", oid.toString() );
+
+ // iso(1), identified-organization(3) | org(3) | organization(3)
+ oid.setOID( new byte[]
+ { 40 + 3 } );
+ assertEquals( "1.3", oid.toString() );
+ }
+ catch ( DecoderException de )
+ {
+ fail();
+ }
+ }
+
+
+ /**
+ * Test joint-iso-itu-t OID tree
+ */
+ @Test
+ public void testOidJointIsoItuT()
+ {
+
+ OID oid = new OID();
+
+ try
+ {
+
+ // joint-iso-itu-t(2), presentation(0)
+ oid.setOID( new byte[]
+ { 80 + 0 } );
+ assertEquals( "2.0", oid.toString() );
+
+ // joint-iso-itu-t(2), asn1(1)
+ oid.setOID( new byte[]
+ { 80 + 1 } );
+ assertEquals( "2.1", oid.toString() );
+
+ // joint-iso-itu-t(2), association-control(2)
+ oid.setOID( new byte[]
+ { 80 + 2 } );
+ assertEquals( "2.2", oid.toString() );
+
+ // joint-iso-itu-t(2), reliable-transfer(3)
+ oid.setOID( new byte[]
+ { 80 + 3 } );
+ assertEquals( "2.3", oid.toString() );
+
+ // ...
+ // joint-iso-itu-t(2), upu(40)
+ oid.setOID( new byte[]
+ { 80 + 40 } );
+ assertEquals( "2.40", oid.toString() );
+
+ // ...
+ // joint-iso-itu-t(2), xxx(100)
+ oid.setOID( new byte[]
+ { ( byte ) ( 0x81 ), 0x34 } );
+ assertEquals( "2.100", oid.toString() );
+ }
+ catch ( DecoderException de )
+ {
+ fail();
+ }
+ }
+
+
+ /**
+ * Test valid String OIDs
+ */
+ @Test
+ public void testOidStringGood()
+ {
+
+ OID oid = new OID();
+
+ try
+ {
+ oid.setOID( "0.0" );
+ assertEquals( "0.0", oid.toString() );
+
+ oid.setOID( "0.0.0.0.0" );
+ assertEquals( "0.0.0.0.0", oid.toString() );
+
+ oid.setOID( "0.1.2.3.4" );
+ assertEquals( "0.1.2.3.4", oid.toString() );
+
+ oid.setOID( "2.123456" );
+ assertEquals( "2.123456", oid.toString() );
+
+ oid.setOID( "1.2.840.113554.1.2.2" );
+ assertEquals( "1.2.840.113554.1.2.2", oid.toString() );
+ }
+ catch ( DecoderException de )
+ {
+ fail();
+ }
+ }
+
+
+ /**
+ * Test invalid String OIDs
+ */
+ @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" ) );
+ }
+
+
+ /**
+ * Test Spnego OID
+ */
+ @Test
+ public void testOidSpnego()
+ {
+
+ OID oid = new OID();
+
+ try
+ {
+ oid.setOID( new byte[]
+ { 0x2b, 0x06, 0x01, 0x05, 0x05, 0x02 } );
+
+ assertEquals( "1.3.6.1.5.5.2", oid.toString() );
+ }
+ catch ( DecoderException de )
+ {
+ fail();
+ }
+ }
+
+
+ /**
+ * Test Kerberos V5 OID
+ */
+ @Test
+ public void testOidKerberosV5()
+ {
+
+ OID oid = new OID();
+
+ try
+ {
+ oid.setOID( new byte[]
+ { 0x2a, ( byte ) 0x86, 0x48, ( byte ) 0x86, ( byte ) 0xf7, 0x12, 0x01, 0x02, 0x02 } );
+
+ assertEquals( "1.2.840.113554.1.2.2", oid.toString() );
+ }
+ catch ( DecoderException de )
+ {
+ fail();
+ }
+ }
+
+
+ /**
+ * Test OIDs bytes
+ */
+ @Test
+ public void testOidBytes()
+ {
+ OID oid = new OID();
+ OID oid2 = new OID();
+
+ try
+ {
+ oid.setOID( "0.0" );
+ oid2.setOID( oid.getOID() );
+ assertEquals( oid.toString(), oid2.toString() );
+
+ oid.setOID( "0.0.0.0.0" );
+ oid2.setOID( oid.getOID() );
+ assertEquals( oid.toString(), oid2.toString() );
+
+ oid.setOID( "0.1.2.3.4" );
+ oid2.setOID( oid.getOID() );
+ assertEquals( oid.toString(), oid2.toString() );
+
+ oid.setOID( "2.123456" );
+ oid2.setOID( oid.getOID() );
+ assertEquals( oid.toString(), oid2.toString() );
+
+ oid.setOID( "1.2.840.113554.1.2.2" );
+ oid2.setOID( oid.getOID() );
+ assertEquals( oid.toString(), oid2.toString() );
+ }
+ catch ( DecoderException de )
+ {
+ fail();
+ }
+ }
+
+ /**
+ * Test OID Equals
+ */
+ @Test
+ public void testOidEquals() throws DecoderException
+ {
+ OID oid1 = new OID();
+ OID oid2 = new OID();
+ OID oid3 = new OID( "1.1" );
+
+ assertTrue( oid1.equals( oid2 ) );
+ assertFalse( oid1.equals( oid3 ) );
+ assertFalse( oid2.equals( oid3 ) );
+ }
+
+ /**
+ * Test OID Equals
+ */
+ @Test
+ public void testOidEqualsPerf() throws DecoderException
+ {
+ String s1 = "1.2.840.113554.1.2.2.1.2.840.113554.1.2.2.1.2.840.113554.1.2.2";
+ String s2 = "1.2.840.113554.1.2.2.1.2.840.113554.1.2.2.1.2.840.113554.1.2.2";
+ String s3 = "1.3.6.1.5.5.2";
+
+ OID oid1 = new OID( s1 );
+ OID oid2 = new OID( s2 );
+ OID oid3 = new OID( s3 );
+
+ assertTrue( oid1.equals( oid2 ) );
+ assertFalse( oid1.equals( oid3 ) );
+ assertFalse( oid2.equals( oid3 ) );
+ }
+}
Added: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/PrimitivesTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/PrimitivesTest.java?rev=1061319&view=auto
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/PrimitivesTest.java (added)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/util/PrimitivesTest.java Thu Jan 20 14:43:36 2011
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.shared.asn1.util;
+
+
+import org.apache.directory.junit.tools.Concurrent;
+import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.util.IntegerDecoder;
+import org.apache.directory.shared.asn1.util.IntegerDecoderException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
+
+/**
+ * Test the Primitives
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+@RunWith(ConcurrentJunitRunner.class)
+@Concurrent()
+public class PrimitivesTest
+{
+ /**
+ * Test the Integer Primitive
+ */
+ @Test
+ public void testIntegerPrimitive() throws IntegerDecoderException
+ {
+ Value value = new Value();
+
+ value.init( 1 );
+ value.setData( new byte[]
+ { 0x00 } ); // res = 0
+ assertEquals( 0, IntegerDecoder.parse( value ) );
+ value.reset();
+
+ value.init( 1 );
+ value.setData( new byte[]
+ { 0x01 } ); // res = 1
+ assertEquals( 1, IntegerDecoder.parse( value ) );
+ value.reset();
+
+ value.init( 1 );
+ value.setData( new byte[]
+ { ( byte ) 0xFF } ); // res = 255
+ assertEquals( -1, IntegerDecoder.parse( value ) );
+ value.reset();
+
+ value.init( 2 );
+ value.setData( new byte[]
+ { 0x00, 0x01 } ); // res = 1
+ assertEquals( 1, IntegerDecoder.parse( value ) );
+ value.reset();
+
+ value.init( 2 );
+ value.setData( new byte[]
+ { 0x01, 0x00 } ); // res = 256
+ assertEquals( 256, IntegerDecoder.parse( value ) );
+ value.reset();
+
+ value.init( 2 );
+ value.setData( new byte[]
+ { 0x01, 0x01 } ); // res = 257
+ assertEquals( 257, IntegerDecoder.parse( value ) );
+ value.reset();
+
+ value.init( 2 );
+ value.setData( new byte[]
+ { 0x01, ( byte ) 0xFF } ); // res = 511
+ assertEquals( 511, IntegerDecoder.parse( value ) );
+ value.reset();
+
+ value.init( 2 );
+ value.setData( new byte[]
+ { 0x02, 0x00 } ); // res = 512
+ 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 ) );
+ value.reset();
+
+ value.init( 4 );
+ value.setData( new byte[]
+ { ( byte ) 0x7F, ( byte ) 0xFF, ( byte ) 0xFF, ( byte ) 0xFF } ); // res
+ // =
+ // 2^31
+ // - 1
+ // =
+ // MaxInt
+ assertEquals( Integer.MAX_VALUE, IntegerDecoder.parse( value ) );
+ value.reset();
+
+ value.init( 4 );
+ value.setData( new byte[]
+ { ( byte ) 0x80, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00 } ); // res
+ // =
+ // 2^31
+ // =
+ // MinInt
+ assertEquals( Integer.MIN_VALUE, IntegerDecoder.parse( value ) );
+ value.reset();
+ }
+} // end class TLVTagDecoderTest
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java Thu Jan 20 14:43:36 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.sche
import java.util.ArrayList;
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.schema.UsageEnum;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -323,7 +323,7 @@ public class AttributeTypeEditorOverview
String oid = oidText.getText();
- if ( OID.isOID( oid ) )
+ if ( OID.isOID(oid) )
{
if ( ( originalAttributeType.getOid().equals( oid ) )
|| !( schemaHandler.isAliasOrOidAlreadyTaken( oid ) ) )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Thu Jan 20 14:43:36 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.sche
import java.util.ArrayList;
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.schema.ObjectClassTypeEnum;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -324,7 +324,7 @@ public class ObjectClassEditorOverviewPa
String oid = oidText.getText();
- if ( OID.isOID( oid ) )
+ if ( OID.isOID(oid) )
{
if ( ( originalObjectClass.getOid().equals( oid ) )
|| !( schemaHandler.isAliasOrOidAlreadyTaken( oid ) ) )
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java Thu Jan 20 14:43:36 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java?rev=1061319&r1=1061318&r2=1061319&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java Thu Jan 20 14:43:36 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.apache.directory.shared.asn1.primitives.OID;
+import org.apache.directory.shared.asn1.util.OID;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;