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 2006/01/04 05:11:55 UTC
svn commit: r365817 [4/4] - in /directory/trunk/ldap-common: ./
src/main/java/org/apache/ldap/common/asn1/
src/main/java/org/apache/ldap/common/asn1/codec/
src/main/java/org/apache/ldap/common/asn1/codec/grammar/
src/main/java/org/apache/ldap/common/as...
Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultEntryTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultEntryTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultEntryTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultEntryTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultEntryTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultEntryTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultEntryTest.java Tue Jan 3 20:10:09 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.search;
import java.nio.ByteBuffer;
import java.util.HashSet;
@@ -28,8 +28,10 @@
import org.apache.asn1.codec.EncoderException;
import org.apache.asn1.ber.Asn1Decoder;
import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
-import org.apache.ldap.common.asn1.pojo.SearchResultEntry;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.search.SearchResultEntry;
import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultEntryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultReferenceTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultReferenceTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultReferenceTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultReferenceTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultReferenceTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultReferenceTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultReferenceTest.java Tue Jan 3 20:10:09 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.search;
import java.nio.ByteBuffer;
import java.util.HashSet;
@@ -26,10 +26,12 @@
import org.apache.asn1.codec.EncoderException;
import org.apache.asn1.ber.Asn1Decoder;
import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.codec.primitives.LdapURL;
-import org.apache.ldap.common.asn1.codec.primitives.LdapURLEncodingException;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
-import org.apache.ldap.common.asn1.pojo.SearchResultReference;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
+import org.apache.ldap.common.codec.search.SearchResultReference;
+import org.apache.ldap.common.codec.util.LdapURL;
+import org.apache.ldap.common.codec.util.LdapURLEncodingException;
import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/search/SearchResultReferenceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/unbind/UnBindRequestTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/UnBindRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/unbind/UnBindRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/unbind/UnBindRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/UnBindRequestTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/UnBindRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/unbind/UnBindRequestTest.java Tue Jan 3 20:10:09 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.common.asn1.codec;
+package org.apache.ldap.common.codec.unbind;
import java.nio.ByteBuffer;
@@ -22,7 +22,9 @@
import org.apache.asn1.codec.EncoderException;
import org.apache.asn1.ber.Asn1Decoder;
import org.apache.asn1.ber.IAsn1Container;
-import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.codec.LdapDecoder;
+import org.apache.ldap.common.codec.LdapMessage;
+import org.apache.ldap.common.codec.LdapMessageContainer;
import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/unbind/UnBindRequestTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/DNParserTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/DNParserTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/DNParserTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/DNParserTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/DNParserTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/DNParserTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/DNParserTest.java Tue Jan 3 20:10:09 2006
@@ -14,15 +14,15 @@
* limitations under the License.
*
*/
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
import javax.naming.InvalidNameException;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.ldap.common.asn1.codec.primitives.LdapDN;
-import org.apache.ldap.common.asn1.codec.primitives.DNParser;
+import org.apache.ldap.common.codec.util.DNParser;
+import org.apache.ldap.common.codec.util.LdapDN;
/**
Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/DNUtilsTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/utils/DNUtilsTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/DNUtilsTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/DNUtilsTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/utils/DNUtilsTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/utils/DNUtilsTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/DNUtilsTest.java Tue Jan 3 20:10:09 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.common.asn1.codec.utils;
+package org.apache.ldap.common.codec.util;
import org.apache.ldap.common.util.StringTools;
Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/DNUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapDNTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapDNTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapDNTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapDNTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapDNTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapDNTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapDNTest.java Tue Jan 3 20:10:09 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
import java.util.Enumeration;
@@ -25,8 +25,8 @@
import junit.framework.TestCase;
import org.apache.asn1.codec.DecoderException;
-import org.apache.ldap.common.asn1.codec.primitives.LdapDN;
-import org.apache.ldap.common.asn1.codec.primitives.DNParser;
+import org.apache.ldap.common.codec.util.DNParser;
+import org.apache.ldap.common.codec.util.LdapDN;
/**
Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapRDNTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDNTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapRDNTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapRDNTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDNTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDNTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapRDNTest.java Tue Jan 3 20:10:09 2006
@@ -14,14 +14,15 @@
* limitations under the License.
*
*/
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
import javax.naming.InvalidNameException;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.ldap.common.asn1.codec.primitives.LdapRDN;
+import org.apache.ldap.common.codec.util.LdapRDN;
+import org.apache.ldap.common.codec.util.RDNParser;
/**
Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapStringTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapStringTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapStringTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapStringTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapStringTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapStringTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapStringTest.java Tue Jan 3 20:10:09 2006
@@ -14,14 +14,15 @@
* limitations under the License.
*
*/
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
import java.io.UnsupportedEncodingException;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.ldap.common.asn1.codec.primitives.LdapString;
-import org.apache.ldap.common.asn1.codec.primitives.LdapStringEncodingException;
+
+import org.apache.ldap.common.codec.util.LdapString;
+import org.apache.ldap.common.codec.util.LdapStringEncodingException;
/**
Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapUrlTest.java (from r365811, directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapUrlTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapUrlTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapUrlTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapUrlTest.java&r1=365811&r2=365817&rev=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapUrlTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapUrlTest.java Tue Jan 3 20:10:09 2006
@@ -14,13 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.ldap.common.asn1.codec.primitives;
+package org.apache.ldap.common.codec.util;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.ldap.common.asn1.codec.primitives.LdapURL;
-import org.apache.ldap.common.asn1.codec.primitives.LdapURLEncodingException;
+import org.apache.ldap.common.codec.util.LdapURL;
+import org.apache.ldap.common.codec.util.LdapURLEncodingException;
/**
Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/codec/util/LdapUrlTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: directory/trunk/ldap-common/todo.txt
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/todo.txt?rev=365817&r1=365816&r2=365817&view=diff
==============================================================================
--- directory/trunk/ldap-common/todo.txt (original)
+++ directory/trunk/ldap-common/todo.txt Tue Jan 3 20:10:09 2006
@@ -6,11 +6,6 @@
o remove old provider architecture structures since we now have only one
asn1 provider library
o make sure logging properties files are being picked up for tests
- o reorg package structure for codec
- - blow away all this grammar, and pojo stuff
- - create codec.<operation> based packages like codec.add and codec.search
- - put controls under operation the request or reponse control is for
- - remove this asn1 pkg component to have org.apache.ldap.common.codec base
o delete unneeded tag transitions that don't have actions
o remove Assert.assertXXX lines in test cases
o move out GrammarAction for LdapControlGrammar into its own class and setup