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:33:02 UTC
svn commit: r1061316 - in /directory: apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ shared/trunk/ldap/src/main/java/org/apache/d...

Author: akarasulu
Date: Thu Jan 20 14:33:01 2011
New Revision: 1061316

URL: http://svn.apache.org/viewvc?rev=1061316&view=rev
Log:
moving hex decorder into asn1 where it is used

Added:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/Hex.java   (contents, props changed)
      - copied, changed from r1061309, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/binary/Hex.java
Removed:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/binary/
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/stateful/
Modified:
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshaller.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshaller.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshaller.java?rev=1061316&r1=1061315&r2=1061316&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshaller.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshaller.java Thu Jan 20 14:33:01 2011
@@ -24,7 +24,7 @@ import java.io.IOException;
 
 import org.apache.directory.server.core.avltree.Marshaller;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.asn1.codec.binary.Hex;
+import org.apache.directory.shared.asn1.Hex;
 
 
 /**
@@ -74,7 +74,7 @@ public class BTreeRedirectMarshaller imp
         {
             if ( bites != null )
             {
-                throw new IOException( I18n.err( I18n.ERR_568, new String( Hex.encodeHex( bites ) ) ) );
+                throw new IOException( I18n.err( I18n.ERR_568, new String( Hex.encodeHex(bites) ) ) );
             }
             else
             {

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/Hex.java (from r1061309, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/binary/Hex.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/Hex.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/Hex.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/binary/Hex.java&r1=1061309&r2=1061316&rev=1061316&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/binary/Hex.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/Hex.java Thu Jan 20 14:33:01 2011
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.asn1.codec.binary;
+package org.apache.directory.shared.asn1;
 
 
 import org.apache.directory.shared.asn1.BinaryDecoder;

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/Hex.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/Hex.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/Hex.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Thu Jan 20 14:33:01 2011
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java?rev=1061316&r1=1061315&r2=1061316&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java Thu Jan 20 14:33:01 2011
@@ -29,7 +29,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.directory.shared.asn1.codec.binary.Hex;
+import org.apache.directory.shared.asn1.Hex;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.util.HttpClientError;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java?rev=1061316&r1=1061315&r2=1061316&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java Thu Jan 20 14:33:01 2011
@@ -37,7 +37,7 @@ import java.util.regex.PatternSyntaxExce
 
 import javax.naming.InvalidNameException;
 
-import org.apache.directory.shared.asn1.codec.binary.Hex;
+import org.apache.directory.shared.asn1.Hex;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
 import org.apache.directory.shared.ldap.entry.StringValue;