From 8f5eb8800e90d21998c45fa80583db17414c6aff Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 25 Oct 2013 10:28:10 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-175: Decouple OpenDJ LDAP SDK from Grizzly
---
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java | 8
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java | 4
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java | 4
opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java | 4
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java | 2
opendj-sdk/opendj3/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java | 8
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java | 8
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java | 1
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java | 4
opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java | 6
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java | 3
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java | 4
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java | 8
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java | 6
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java | 4
opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java | 8
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java | 4
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java | 6
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java | 3
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java | 5
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java | 4
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java | 8
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java | 8
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java | 8
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java | 4
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java | 9 +
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java | 3
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java | 6
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java | 8
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java | 7
/dev/null | 36 ------
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java | 8
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java | 7
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java | 4
opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java | 2
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java | 6
opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java | 6
54 files changed, 146 insertions(+), 178 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java
index 2cc8f4c..a8f5e68 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java
@@ -35,8 +35,8 @@
import java.util.List;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.Attribute;
import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.ByteSequence;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java
index 84a2586..cc5a114 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java
@@ -36,9 +36,9 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java
index c66331c..11656d1 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package com.forgerock.opendj.ldap.extensions;
@@ -29,8 +30,8 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.DecodeOptions;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java
index 30033b3..ae85d87 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java
@@ -22,15 +22,15 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
package com.forgerock.opendj.ldap.extensions;
import java.io.IOException;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java
index 161a3ff..4da3e8b 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package com.forgerock.opendj.ldap.extensions;
@@ -32,9 +33,9 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java
index 447b613..ebdbe2b 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package com.forgerock.opendj.ldap.extensions;
@@ -40,9 +40,9 @@
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/package-info.java
deleted file mode 100755
index 150b2af..0000000
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/package-info.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2009 Sun Microsystems, Inc.
- */
-
-/**
- * Classes and interfaces for encoding and decoding ASN.1 data streams.
- * <p>
- * Note that this particular implementation is limited to the subset of elements
- * that are typically used by LDAP clients. As such, it does not include all
- * ASN.1 element types, particularly elements like OIDs, bit strings, and
- * timestamp values.
- */
-package org.forgerock.opendj.asn1;
-
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java
index e3e7a91..b74cebf 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java
index ae85bf5..6e6b8f4 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReader.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java
@@ -25,7 +25,7 @@
* Portions copyright 2012-2013 ForgeRock AS.
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
import static com.forgerock.opendj.ldap.CoreMessages.*;
import static com.forgerock.opendj.util.StaticUtils.IO_LOG;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1InputStreamReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1InputStreamReader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java
index 61e8ddb..9e6f940 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1InputStreamReader.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java
@@ -25,7 +25,7 @@
* Portions copyright 2012-2013 ForgeRock AS.
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
import static com.forgerock.opendj.ldap.CoreMessages.*;
import static com.forgerock.opendj.util.StaticUtils.IO_LOG;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java
index 81a4798..35943c5 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java
@@ -24,7 +24,7 @@
* Copyright 2006-2009 Sun Microsystems, Inc.
* Portions copyright 2012-2013 ForgeRock AS.
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
import static com.forgerock.opendj.ldap.CoreMessages.ERR_ASN1_SEQUENCE_WRITE_NOT_STARTED;
import static com.forgerock.opendj.util.StaticUtils.IO_LOG;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1Reader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1Reader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java
index 77af69a..7a762ac 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1Reader.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
import java.io.Closeable;
import java.io.IOException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1Writer.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1Writer.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java
index f103a21..7c869a2 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/ASN1Writer.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java
@@ -22,9 +22,9 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
import java.io.Closeable;
import java.io.Flushable;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java
similarity index 97%
rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java
index f62d095..7648ee0 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
import static com.forgerock.opendj.ldap.CoreMessages.ERR_ASN1_UNEXPECTED_TAG;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java
similarity index 97%
rename from opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java
rename to opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java
index caa3c27..26570ee 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java
@@ -22,9 +22,9 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
import java.io.IOException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java
index 5323d2b..9f86b0c 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java
@@ -34,8 +34,6 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
import org.forgerock.opendj.ldap.Attribute;
import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.ByteString;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java
index 802524f..1aea357 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java
@@ -34,7 +34,6 @@
import java.io.IOException;
import java.util.List;
-import org.forgerock.opendj.asn1.ASN1Writer;
import org.forgerock.opendj.ldap.Attribute;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java
index d00f4bd..ea6e4c4 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java
@@ -25,7 +25,14 @@
*/
/**
- * Classes providing I/O functionality.
+ * Classes and interfaces providing I/O functionality.
+ * <p>
+ * It includes facilities for encoding and decoding ASN.1 data streams.
+ * <p>
+ * Note that this particular implementation is limited to the subset of elements
+ * that are typically used by LDAP clients. As such, it does not include all
+ * ASN.1 element types, particularly elements like OIDs, bit strings, and
+ * timestamp values.
*/
package org.forgerock.opendj.io;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java
index 56e5f87..00fadea 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.controls;
@@ -35,9 +35,9 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java
index ed1beb4..9d390ad 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java
@@ -33,9 +33,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java
index 218737c..8faeb9a 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.controls;
@@ -38,9 +38,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java
index 193c825..784f71a 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java
@@ -39,9 +39,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.AbstractFilterVisitor;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java
index 941c769..baecbd5 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java
@@ -33,9 +33,9 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java
index 019d28d..bdb6dad 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java
@@ -40,9 +40,9 @@
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java
index 8eef0d9..a983319 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java
@@ -42,9 +42,9 @@
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java
index eb766d5..8b99e12 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java
@@ -34,9 +34,9 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java
index 29d88ab..25ac38f 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java
@@ -42,9 +42,9 @@
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java
index 03434c5..74629fe 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java
@@ -34,9 +34,9 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java
index e0946d1..d829200 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java
@@ -33,9 +33,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DN;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java
index 1ee25e7..f748c14 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java
@@ -33,8 +33,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.DecodeOptions;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java
index 8cbfdbc..c0f9492 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java
@@ -40,9 +40,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java
index 450c466..b01d204 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java
@@ -35,9 +35,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java
index daa41fc..34cdae6 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java
@@ -32,9 +32,9 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java
index 219c653..09ffac3 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java
@@ -34,9 +34,9 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java
index 2b4aabe..7b9fbb2 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.controls;
@@ -36,9 +36,9 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java
index 105e6fb..b329e14 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.controls;
@@ -34,9 +34,9 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java
index ca5115a..03afa44 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.requests;
@@ -34,9 +34,9 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java
index 01ab3a6..8f6b0c8 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java
@@ -33,9 +33,9 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java
index ff4a0bb..366081d 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -45,8 +45,8 @@
import javax.security.sasl.RealmCallback;
import javax.security.sasl.RealmChoiceCallback;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java
index 0cb184f..ed99db9 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java
@@ -22,15 +22,15 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.responses;
import java.io.IOException;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.ResultCode;
diff --git a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java
index c8dba85..d97a8dc 100644
--- a/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java
+++ b/opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java
@@ -20,7 +20,7 @@
*
* CDDL HEADER END
*
- * Copyright 2011-2012 ForgeRock AS
+ * Copyright 2011-2013 ForgeRock AS
*/
package org.forgerock.opendj.ldif;
@@ -42,9 +42,9 @@
import java.util.SortedMap;
import java.util.TreeMap;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.AVA;
import org.forgerock.opendj.ldap.Attribute;
import org.forgerock.opendj.ldap.AttributeDescription;
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReaderTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java
similarity index 94%
rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReaderTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java
index 65fb26e..a44e4c4 100644
--- a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReaderTestCase.java
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java
@@ -22,9 +22,10 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
import org.forgerock.opendj.ldap.ByteSequenceReader;
import org.forgerock.opendj.ldap.ByteString;
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1InputStreamReaderTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java
similarity index 94%
rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1InputStreamReaderTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java
index 328b5b9..e397745 100644
--- a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1InputStreamReaderTestCase.java
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java
@@ -22,8 +22,9 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
import java.io.ByteArrayInputStream;
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriterTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java
similarity index 95%
rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriterTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java
index f9f09a9..9cd9399 100644
--- a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriterTestCase.java
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java
@@ -22,8 +22,9 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java
index cb4379a..bd59b1a 100644
--- a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java
@@ -22,13 +22,11 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.*;
import java.io.IOException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java
rename to opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java
index a8382a2..cdc3789 100644
--- a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java
@@ -22,13 +22,11 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
-package org.forgerock.opendj.asn1;
+package org.forgerock.opendj.io;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.*;
import java.io.IOException;
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java
index 65c7ded..bc6f9d6 100644
--- a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java
@@ -29,8 +29,6 @@
import java.io.IOException;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SdkTestCase;
import org.forgerock.opendj.ldap.requests.AbandonRequest;
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
index 4b3bb3f..13286c3 100644
--- a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
@@ -52,8 +52,8 @@
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Reader;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.ldap.controls.Control;
import org.forgerock.opendj.ldap.controls.ControlDecoder;
import org.forgerock.opendj.ldap.requests.AbandonRequest;
diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java
index ce6ead2..a8c6c21 100644
--- a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferReader.java
@@ -34,8 +34,8 @@
import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.AbstractASN1Reader;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.AbstractASN1Reader;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java
index 18f652b..65aa881 100644
--- a/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/ASN1BufferWriter.java
@@ -32,10 +32,11 @@
import java.io.IOException;
import java.nio.ByteBuffer;
+
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.asn1.ASN1;
-import org.forgerock.opendj.asn1.ASN1Writer;
-import org.forgerock.opendj.asn1.AbstractASN1Writer;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Writer;
+import org.forgerock.opendj.io.AbstractASN1Writer;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.glassfish.grizzly.Buffer;
diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java
index 6faf60b..82a89be 100644
--- a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package com.forgerock.opendj.grizzly;
@@ -30,8 +30,8 @@
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1ReaderTestCase;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1ReaderTestCase;
import org.glassfish.grizzly.memory.ByteBufferWrapper;
import org.glassfish.grizzly.memory.MemoryManager;
diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java
index 3c21b45..9465f03 100644
--- a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java
@@ -30,9 +30,9 @@
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
-import org.forgerock.opendj.asn1.ASN1WriterTestCase;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
+import org.forgerock.opendj.io.ASN1WriterTestCase;
import org.forgerock.opendj.ldap.DecodeException;
import org.glassfish.grizzly.Buffer;
import org.glassfish.grizzly.memory.ByteBufferWrapper;
diff --git a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java
index 029c2ac..7f6e9f3 100644
--- a/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java
@@ -25,8 +25,8 @@
*/
package com.forgerock.opendj.grizzly;
-import org.forgerock.opendj.asn1.ASN1Reader;
-import org.forgerock.opendj.asn1.ASN1Writer;
+import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.io.LDAPReader;
import org.forgerock.opendj.io.LDAPReaderWriterTestCase;
import org.forgerock.opendj.io.LDAPWriter;
diff --git a/opendj-sdk/opendj3/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java b/opendj-sdk/opendj3/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java
index 13cca89..3f622b8 100644
--- a/opendj-sdk/opendj3/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java
+++ b/opendj-sdk/opendj3/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java
@@ -476,19 +476,19 @@
}
final ByteString sdkByteString = from(builder.toByteString());
- final org.forgerock.opendj.asn1.ASN1Reader sdkReaderASN1 =
- org.forgerock.opendj.asn1.ASN1.getReader(sdkByteString.toByteArray());
+ final org.forgerock.opendj.io.ASN1Reader sdkReaderASN1 =
+ org.forgerock.opendj.io.ASN1.getReader(sdkByteString.toByteArray());
// Reads the ASN1 SDK byte string.
try {
sdkReaderASN1.readStartSequence();
oid = sdkReaderASN1.readOctetStringAsString();
if (sdkReaderASN1.hasNextElement()
- && (sdkReaderASN1.peekType() == org.forgerock.opendj.asn1.ASN1.UNIVERSAL_BOOLEAN_TYPE)) {
+ && (sdkReaderASN1.peekType() == org.forgerock.opendj.io.ASN1.UNIVERSAL_BOOLEAN_TYPE)) {
isCritical = sdkReaderASN1.readBoolean();
}
if (sdkReaderASN1.hasNextElement()
- && (sdkReaderASN1.peekType() == org.forgerock.opendj.asn1.ASN1.UNIVERSAL_OCTET_STRING_TYPE)) {
+ && (sdkReaderASN1.peekType() == org.forgerock.opendj.io.ASN1.UNIVERSAL_OCTET_STRING_TYPE)) {
value = sdkReaderASN1.readOctetString();
}
sdkReaderASN1.readEndSequence();
--
Gitblit v1.10.0