You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2006/01/05 10:04:46 UTC

svn commit: r366129 - in /directory/branches/DN-refactoring/apacheds-server-unit: log4j.conf src/main/java/org/apache/ldap/server/AbstractServerTest.java

Author: elecharny
Date: Thu Jan  5 01:04:40 2006
New Revision: 366129

URL: http://svn.apache.org/viewcvs?rev=366129&view=rev
Log:
Backporting DN-refactoring to this branch

Added:
    directory/branches/DN-refactoring/apacheds-server-unit/log4j.conf
Modified:
    directory/branches/DN-refactoring/apacheds-server-unit/src/main/java/org/apache/ldap/server/AbstractServerTest.java

Added: directory/branches/DN-refactoring/apacheds-server-unit/log4j.conf
URL: http://svn.apache.org/viewcvs/directory/branches/DN-refactoring/apacheds-server-unit/log4j.conf?rev=366129&view=auto
==============================================================================
--- directory/branches/DN-refactoring/apacheds-server-unit/log4j.conf (added)
+++ directory/branches/DN-refactoring/apacheds-server-unit/log4j.conf Thu Jan  5 01:04:40 2006
@@ -0,0 +1,114 @@
+# Properties to initialise log4j
+
+####################################################
+# DEFAULT
+log4j.rootLogger=DEBUG, APACHE-DS
+
+####################################################
+
+log4j.appender.APACHE-DS=org.apache.log4j.ConsoleAppender
+log4j.appender.APACHE-DS.layout=org.apache.log4j.PatternLayout
+#log4j.appender.APACHE-DS.layout.ConversionPattern=%8r> [%-20.20C{1}] - %m%n
+log4j.appender.APACHE-DS.layout.ConversionPattern=%8r --%-30.30C{1}-- [%5.5p] %m%n
+
+log4j.logger.org.apache.asn1new.ber.Asn1Decoder=INFO
+log4j.logger.org.apache.asn1new.ber.grammar.AbstractGrammar=DEBUG
+
+# Ber grammar
+log4j.logger.org.apache.asn1new.ber.grammar.AbstractGrammar=DEBUG
+# The two followin classes does not have any logger
+#log4j.logger.org.apache.asn1new.ber.grammar.GrammarAction=DEBUG
+#log4j.logger.org.apache.asn1new.ber.grammar.GrammarTransition=DEBUG
+
+#Ber TLV: none of the following classes does have a logger.
+#log4j.logger.org.apache.asn1new.ber.tlv.Length=DEBUG
+#log4j.logger.org.apache.asn1new.ber.tlv.Tag=DEBUG
+#log4j.logger.org.apache.asn1new.ber.tlv.TLV=DEBUG
+#log4j.logger.org.apache.asn1new.ber.tlv.Value=DEBUG
+
+# Ldap Codec
+log4j.logger.org.apache.asn1new.LdapDecoder
+log4j.logger.org.apache.asn1new.LdapMessageContainer
+
+
+# Ldap grammars
+log4j.logger.org.apache.asn1new.codec.grammar.AbandonRequestGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.AddRequestGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.AddResponseGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.BindRequestGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.BindResponseGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.CompareRequestGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.CompareResponseGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.DelRequestGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.DelResponseGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.ExtendedRequestGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.ExtendedResponseGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.FilterGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.LdapControlGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.LdapMessageGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.LdapResultGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.ModifyDNRequestGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.ModifyDNResponseGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.ModifyRequestGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.ModifyResponseGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.SearchRequestGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.SearchResultDoneGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.SearchResultEntryGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.SearchResultReferenceGrammar=DEBUG
+log4j.logger.org.apache.asn1new.codec.grammar.UnBinRequestGrammar=DEBUG
+
+# Ldap codec Primitives
+log4j.logger.org.apache.asn1new.codec.primitives.LdapDN=DEBUG
+log4j.logger.org.apache.asn1new.codec.primitives.LdapString=DEBUG
+log4j.logger.org.apache.asn1new.codec.primitives.LdapURL=DEBUG
+log4j.logger.org.apache.asn1new.codec.primitives.RelativeLdapDN=DEBUG
+
+# Ldap codec utils
+log4j.logger.org.apache.asn1new.codec.utils.DNUtils=DEBUG
+
+
+# Beware ! Very verbose ...
+log4j.logger.org.apache.asn1new.ldap.TwixDecoder=DEBUG
+log4j.logger.org.apache.asn1new.ldap.TwixEncoder=DEBUG
+log4j.logger.org.apache.asn1new.ldap.TwixTransformer=DEBUG
+
+# Pojos 
+log4j.logger.org.apache.asn1new.ldap.pojo.AbandonRequest=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.AddRequest=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.AddResponse=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.AttributeValueAssertion=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.BindRequest=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.BindResponse=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.CompareRequest=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.CompareResponse=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.Control=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.DelRequest=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.DelResponse=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.ExtendedRequest=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.ExtendedResponse=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.LdapAuthentication=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.LdapMessage=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.LdapResponse=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.LdapResult=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.ModifyDNRequest=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.ModifyDNResponse=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.ModifyRequest=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.ModifyResponse=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.SaslCredentials=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.SearchRequest=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.SearchResultDone=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.SearchResultEntry=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.SearchResultReference=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.SimpleAuthentication=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.UnBinRequest=DEBUG
+
+# Pojo filters
+log4j.logger.org.apache.asn1new.ldap.pojo.filters.AndFilter=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.filters.AttributeValueAssertionFilter=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.filters.ConnectorFilter=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.filters.ExtensibleMatchFilter=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.filters.Filter=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.filters.NotFilter=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.filters.OrFilter=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.filters.PresentFilter=DEBUG
+log4j.logger.org.apache.asn1new.ldap.pojo.filters.SubstringFilter=DEBUG
\ No newline at end of file

Modified: directory/branches/DN-refactoring/apacheds-server-unit/src/main/java/org/apache/ldap/server/AbstractServerTest.java
URL: http://svn.apache.org/viewcvs/directory/branches/DN-refactoring/apacheds-server-unit/src/main/java/org/apache/ldap/server/AbstractServerTest.java?rev=366129&r1=366128&r2=366129&view=diff
==============================================================================
--- directory/branches/DN-refactoring/apacheds-server-unit/src/main/java/org/apache/ldap/server/AbstractServerTest.java (original)
+++ directory/branches/DN-refactoring/apacheds-server-unit/src/main/java/org/apache/ldap/server/AbstractServerTest.java Thu Jan  5 01:04:40 2006
@@ -38,7 +38,7 @@
 import org.apache.ldap.common.ldif.LdifParser;
 import org.apache.ldap.common.ldif.LdifParserImpl;
 import org.apache.ldap.common.message.LockableAttributesImpl;
-import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.common.name.LdapDN;
 import org.apache.ldap.server.configuration.MutableServerStartupConfiguration;
 import org.apache.ldap.server.configuration.ShutdownConfiguration;
 import org.apache.ldap.server.jndi.ServerContextFactory;
@@ -201,7 +201,7 @@
 
                 parser.parse( attributes, ldif );
 
-                Name dn = new LdapName( ( String ) attributes.remove( "dn" ).get() );
+                Name dn = new LdapDN( ( String ) attributes.remove( "dn" ).get() );
 
                 dn.remove( 0 );