Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 18404 invoked from network); 8 Feb 2006 00:31:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Feb 2006 00:31:46 -0000 Received: (qmail 51205 invoked by uid 500); 8 Feb 2006 00:31:26 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 51062 invoked by uid 500); 8 Feb 2006 00:31:25 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 50901 invoked by uid 99); 8 Feb 2006 00:31:23 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Feb 2006 16:31:23 -0800 X-ASF-Spam-Status: No, hits=-8.3 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,SPOOF_NET2COM X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 07 Feb 2006 16:30:59 -0800 Received: (qmail 16744 invoked by uid 65534); 8 Feb 2006 00:30:38 -0000 Message-ID: <20060208003038.16743.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r375785 [15/28] - in /directory/trunks: apacheds/ apacheds/core-plugin/src/main/antlr/ apacheds/core-plugin/src/main/java/org/apache/directory/ apacheds/core-plugin/src/main/java/org/apache/directory/server/ apacheds/core-plugin/src/main/ja... Date: Wed, 08 Feb 2006 00:18:49 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Copied: directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java (from r375781, directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/ldap/server/protocol/support/extended/GracefulShutdownHandler.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java?p2=directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java&p1=directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/ldap/server/protocol/support/extended/GracefulShutdownHandler.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/ldap/server/protocol/support/extended/GracefulShutdownHandler.java (original) +++ directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java Tue Feb 7 16:10:02 2006 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.ldap.server.protocol.support.extended; +package org.apache.directory.server.ldap.support.extended; import java.util.ArrayList; @@ -27,20 +27,20 @@ import javax.naming.NamingException; import javax.naming.ldap.LdapContext; -import org.apache.ldap.common.message.ExtendedRequest; -import org.apache.ldap.common.message.ResultCodeEnum; -import org.apache.ldap.common.message.extended.GracefulDisconnect; -import org.apache.ldap.common.message.extended.GracefulShutdownRequest; -import org.apache.ldap.common.message.extended.GracefulShutdownResponse; -import org.apache.ldap.common.message.extended.NoticeOfDisconnect; +import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.configuration.StartupConfiguration; +import org.apache.directory.server.core.jndi.ServerLdapContext; +import org.apache.directory.server.core.partition.DirectoryPartitionNexus; +import org.apache.directory.server.ldap.ExtendedOperationHandler; +import org.apache.directory.server.ldap.LdapProtocolProvider; +import org.apache.directory.server.ldap.SessionRegistry; +import org.apache.directory.shared.ldap.message.ExtendedRequest; +import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.message.extended.GracefulDisconnect; +import org.apache.directory.shared.ldap.message.extended.GracefulShutdownRequest; +import org.apache.directory.shared.ldap.message.extended.GracefulShutdownResponse; +import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect; -import org.apache.ldap.server.DirectoryService; -import org.apache.ldap.server.configuration.StartupConfiguration; -import org.apache.ldap.server.jndi.ServerLdapContext; -import org.apache.ldap.server.partition.DirectoryPartitionNexus; -import org.apache.ldap.server.protocol.ExtendedOperationHandler; -import org.apache.ldap.server.protocol.LdapProtocolProvider; -import org.apache.ldap.server.protocol.SessionRegistry; import org.apache.mina.common.IoAcceptor; import org.apache.mina.common.IoSession; Copied: directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java (from r375781, directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/ldap/server/protocol/support/extended/LaunchDiagnosticUiHandler.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java?p2=directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java&p1=directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/ldap/server/protocol/support/extended/LaunchDiagnosticUiHandler.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/ldap/server/protocol/support/extended/LaunchDiagnosticUiHandler.java (original) +++ directory/trunks/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java Tue Feb 7 16:10:02 2006 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.ldap.server.protocol.support.extended; +package org.apache.directory.server.ldap.support.extended; import java.awt.Dimension; @@ -29,21 +29,21 @@ import javax.naming.ldap.LdapContext; import javax.swing.JFrame; -import org.apache.ldap.common.message.ExtendedRequest; -import org.apache.ldap.common.message.ResultCodeEnum; -import org.apache.ldap.common.message.extended.LaunchDiagnosticUiRequest; -import org.apache.ldap.common.message.extended.LaunchDiagnosticUiResponse; -import org.apache.ldap.common.name.LdapName; -import org.apache.ldap.server.DirectoryService; -import org.apache.ldap.server.jndi.ServerLdapContext; -import org.apache.ldap.server.partition.DirectoryPartition; -import org.apache.ldap.server.partition.DirectoryPartitionNexus; -import org.apache.ldap.server.partition.impl.btree.BTreeDirectoryPartition; -import org.apache.ldap.server.partition.impl.btree.gui.PartitionFrame; -import org.apache.ldap.server.protocol.ExtendedOperationHandler; -import org.apache.ldap.server.protocol.LdapProtocolProvider; -import org.apache.ldap.server.protocol.SessionRegistry; -import org.apache.ldap.server.protocol.gui.SessionsFrame; +import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.jndi.ServerLdapContext; +import org.apache.directory.server.core.partition.DirectoryPartition; +import org.apache.directory.server.core.partition.DirectoryPartitionNexus; +import org.apache.directory.server.core.partition.impl.btree.BTreeDirectoryPartition; +import org.apache.directory.server.core.partition.impl.btree.gui.PartitionFrame; +import org.apache.directory.server.ldap.ExtendedOperationHandler; +import org.apache.directory.server.ldap.LdapProtocolProvider; +import org.apache.directory.server.ldap.SessionRegistry; +import org.apache.directory.server.ldap.gui.SessionsFrame; +import org.apache.directory.shared.ldap.message.ExtendedRequest; +import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.message.extended.LaunchDiagnosticUiRequest; +import org.apache.directory.shared.ldap.message.extended.LaunchDiagnosticUiResponse; +import org.apache.directory.shared.ldap.name.LdapName; import org.apache.mina.common.IoSession; import org.apache.mina.registry.Service; import org.apache.mina.registry.ServiceRegistry; Copied: directory/trunks/apacheds/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapProtocolProviderTest.java (from r375781, directory/trunks/apacheds/protocol-ldap/src/test/java/org/apache/ldap/server/protocol/LdapProtocolProviderTest.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapProtocolProviderTest.java?p2=directory/trunks/apacheds/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapProtocolProviderTest.java&p1=directory/trunks/apacheds/protocol-ldap/src/test/java/org/apache/ldap/server/protocol/LdapProtocolProviderTest.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ldap/src/test/java/org/apache/ldap/server/protocol/LdapProtocolProviderTest.java (original) +++ directory/trunks/apacheds/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapProtocolProviderTest.java Tue Feb 7 16:10:02 2006 @@ -14,36 +14,37 @@ * limitations under the License. * */ -package org.apache.ldap.server.protocol; +package org.apache.directory.server.ldap; import java.util.Properties; import junit.framework.TestCase; -import org.apache.ldap.common.NotImplementedException; -import org.apache.ldap.common.exception.LdapNamingException; -import org.apache.ldap.common.message.AbandonRequest; -import org.apache.ldap.common.message.AbandonRequestImpl; -import org.apache.ldap.common.message.AddRequest; -import org.apache.ldap.common.message.AddRequestImpl; -import org.apache.ldap.common.message.BindRequest; -import org.apache.ldap.common.message.BindRequestImpl; -import org.apache.ldap.common.message.CompareRequest; -import org.apache.ldap.common.message.CompareRequestImpl; -import org.apache.ldap.common.message.DeleteRequest; -import org.apache.ldap.common.message.DeleteRequestImpl; -import org.apache.ldap.common.message.ExtendedRequest; -import org.apache.ldap.common.message.ExtendedRequestImpl; -import org.apache.ldap.common.message.ModifyDnRequest; -import org.apache.ldap.common.message.ModifyDnRequestImpl; -import org.apache.ldap.common.message.ModifyRequest; -import org.apache.ldap.common.message.ModifyRequestImpl; -import org.apache.ldap.common.message.SearchRequest; -import org.apache.ldap.common.message.SearchRequestImpl; -import org.apache.ldap.common.message.UnbindRequest; -import org.apache.ldap.common.message.UnbindRequestImpl; -import org.apache.ldap.server.protocol.support.ExtendedHandler; +import org.apache.directory.server.ldap.LdapProtocolProvider; +import org.apache.directory.server.ldap.support.ExtendedHandler; +import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.ldap.exception.LdapNamingException; +import org.apache.directory.shared.ldap.message.AbandonRequest; +import org.apache.directory.shared.ldap.message.AbandonRequestImpl; +import org.apache.directory.shared.ldap.message.AddRequest; +import org.apache.directory.shared.ldap.message.AddRequestImpl; +import org.apache.directory.shared.ldap.message.BindRequest; +import org.apache.directory.shared.ldap.message.BindRequestImpl; +import org.apache.directory.shared.ldap.message.CompareRequest; +import org.apache.directory.shared.ldap.message.CompareRequestImpl; +import org.apache.directory.shared.ldap.message.DeleteRequest; +import org.apache.directory.shared.ldap.message.DeleteRequestImpl; +import org.apache.directory.shared.ldap.message.ExtendedRequest; +import org.apache.directory.shared.ldap.message.ExtendedRequestImpl; +import org.apache.directory.shared.ldap.message.ModifyDnRequest; +import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl; +import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.message.ModifyRequestImpl; +import org.apache.directory.shared.ldap.message.SearchRequest; +import org.apache.directory.shared.ldap.message.SearchRequestImpl; +import org.apache.directory.shared.ldap.message.UnbindRequest; +import org.apache.directory.shared.ldap.message.UnbindRequestImpl; import org.apache.mina.common.IoSession; import org.apache.mina.handler.demux.MessageHandler; Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java (from r375665, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/NtpConfiguration.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/NtpConfiguration.java&r1=375665&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/NtpConfiguration.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java Tue Feb 7 16:10:02 2006 @@ -15,16 +15,16 @@ * */ -package org.apache.ntp; +package org.apache.directory.server.ntp; import java.util.Dictionary; import java.util.HashMap; import java.util.Map; -import org.apache.ldap.server.DirectoryService; -import org.apache.ldap.server.configuration.ConfigurationException; -import org.apache.protocol.common.LoadStrategy; -import org.apache.protocol.common.ServiceConfiguration; +import org.apache.directory.server.core.DirectoryService; +import org.apache.directory.server.core.configuration.ConfigurationException; +import org.apache.directory.server.protocol.shared.LoadStrategy; +import org.apache.directory.server.protocol.shared.ServiceConfiguration; public class NtpConfiguration extends ServiceConfiguration { Propchange: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpException.java (from r375665, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/NtpException.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpException.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpException.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/NtpException.java&r1=375665&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/NtpException.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpException.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.ntp; +package org.apache.directory.server.ntp; /** * The root of the NTP exception hierarchy. Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java (from r375665, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/NtpServer.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/NtpServer.java&r1=375665&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/NtpServer.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java Tue Feb 7 16:10:02 2006 @@ -15,16 +15,16 @@ * */ -package org.apache.ntp; +package org.apache.directory.server.ntp; import java.io.IOException; import java.util.Dictionary; +import org.apache.directory.server.ntp.protocol.NtpProtocolHandler; import org.apache.mina.common.IoHandler; import org.apache.mina.common.TransportType; import org.apache.mina.registry.Service; import org.apache.mina.registry.ServiceRegistry; -import org.apache.ntp.protocol.NtpProtocolHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Propchange: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpService.java (from r375665, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/NtpService.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpService.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpService.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/NtpService.java&r1=375665&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/NtpService.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpService.java Tue Feb 7 16:10:02 2006 @@ -15,9 +15,9 @@ * */ -package org.apache.ntp; +package org.apache.directory.server.ntp; -import org.apache.ntp.messages.NtpMessage; +import org.apache.directory.server.ntp.messages.NtpMessage; /** * NTP Protocol (RFC 2030) Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/io/NtpMessageDecoder.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/io/NtpMessageDecoder.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/io/NtpMessageDecoder.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/io/NtpMessageDecoder.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/io/NtpMessageDecoder.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/io/NtpMessageDecoder.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/io/NtpMessageDecoder.java Tue Feb 7 16:10:02 2006 @@ -15,17 +15,17 @@ * */ -package org.apache.ntp.io; +package org.apache.directory.server.ntp.io; import java.nio.ByteBuffer; -import org.apache.ntp.messages.LeapIndicatorType; -import org.apache.ntp.messages.ModeType; -import org.apache.ntp.messages.NtpMessage; -import org.apache.ntp.messages.NtpMessageModifier; -import org.apache.ntp.messages.NtpTimeStamp; -import org.apache.ntp.messages.ReferenceIdentifier; -import org.apache.ntp.messages.StratumType; +import org.apache.directory.server.ntp.messages.LeapIndicatorType; +import org.apache.directory.server.ntp.messages.ModeType; +import org.apache.directory.server.ntp.messages.NtpMessage; +import org.apache.directory.server.ntp.messages.NtpMessageModifier; +import org.apache.directory.server.ntp.messages.NtpTimeStamp; +import org.apache.directory.server.ntp.messages.ReferenceIdentifier; +import org.apache.directory.server.ntp.messages.StratumType; public class NtpMessageDecoder { Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/io/NtpMessageEncoder.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/io/NtpMessageEncoder.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/io/NtpMessageEncoder.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/io/NtpMessageEncoder.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/io/NtpMessageEncoder.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/io/NtpMessageEncoder.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/io/NtpMessageEncoder.java Tue Feb 7 16:10:02 2006 @@ -15,14 +15,14 @@ * */ -package org.apache.ntp.io; +package org.apache.directory.server.ntp.io; import java.nio.ByteBuffer; -import org.apache.ntp.messages.LeapIndicatorType; -import org.apache.ntp.messages.ModeType; -import org.apache.ntp.messages.NtpMessage; -import org.apache.ntp.messages.ReferenceIdentifier; +import org.apache.directory.server.ntp.messages.LeapIndicatorType; +import org.apache.directory.server.ntp.messages.ModeType; +import org.apache.directory.server.ntp.messages.NtpMessage; +import org.apache.directory.server.ntp.messages.ReferenceIdentifier; public class NtpMessageEncoder { Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/LeapIndicatorType.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/LeapIndicatorType.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/LeapIndicatorType.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/LeapIndicatorType.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/LeapIndicatorType.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/LeapIndicatorType.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/LeapIndicatorType.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.ntp.messages; +package org.apache.directory.server.ntp.messages; import java.util.Arrays; import java.util.Collections; Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/ModeType.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/ModeType.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/ModeType.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/ModeType.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/ModeType.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/ModeType.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/ModeType.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.ntp.messages; +package org.apache.directory.server.ntp.messages; import java.util.Arrays; import java.util.Collections; Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/NtpMessage.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/NtpMessage.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/NtpMessage.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/NtpMessage.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/NtpMessage.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/NtpMessage.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/NtpMessage.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.ntp.messages; +package org.apache.directory.server.ntp.messages; public class NtpMessage { Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/NtpMessageModifier.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/NtpMessageModifier.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/NtpMessageModifier.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/NtpMessageModifier.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/NtpMessageModifier.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/NtpMessageModifier.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/NtpMessageModifier.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.ntp.messages; +package org.apache.directory.server.ntp.messages; public class NtpMessageModifier { Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/NtpTimeStamp.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/NtpTimeStamp.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/NtpTimeStamp.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/NtpTimeStamp.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/NtpTimeStamp.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/NtpTimeStamp.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/NtpTimeStamp.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.ntp.messages; +package org.apache.directory.server.ntp.messages; import java.nio.ByteBuffer; import java.text.SimpleDateFormat; Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/ReferenceIdentifier.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/ReferenceIdentifier.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/ReferenceIdentifier.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/ReferenceIdentifier.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/ReferenceIdentifier.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/ReferenceIdentifier.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/ReferenceIdentifier.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.ntp.messages; +package org.apache.directory.server.ntp.messages; import java.util.Arrays; import java.util.Collections; Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/StratumType.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/StratumType.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/StratumType.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/StratumType.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/StratumType.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/messages/StratumType.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/StratumType.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.ntp.messages; +package org.apache.directory.server.ntp.messages; import java.util.Arrays; import java.util.Collections; Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/protocol/NtpDecoder.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/protocol/NtpDecoder.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/protocol/NtpDecoder.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java Tue Feb 7 16:10:02 2006 @@ -15,13 +15,13 @@ * */ -package org.apache.ntp.protocol; +package org.apache.directory.server.ntp.protocol; +import org.apache.directory.server.ntp.io.NtpMessageDecoder; import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolDecoder; import org.apache.mina.filter.codec.ProtocolDecoderOutput; -import org.apache.ntp.io.NtpMessageDecoder; public class NtpDecoder implements ProtocolDecoder { Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpEncoder.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/protocol/NtpEncoder.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpEncoder.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpEncoder.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/protocol/NtpEncoder.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/protocol/NtpEncoder.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpEncoder.java Tue Feb 7 16:10:02 2006 @@ -15,14 +15,14 @@ * */ -package org.apache.ntp.protocol; +package org.apache.directory.server.ntp.protocol; +import org.apache.directory.server.ntp.io.NtpMessageEncoder; +import org.apache.directory.server.ntp.messages.NtpMessage; import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolEncoder; import org.apache.mina.filter.codec.ProtocolEncoderOutput; -import org.apache.ntp.io.NtpMessageEncoder; -import org.apache.ntp.messages.NtpMessage; public class NtpEncoder implements ProtocolEncoder { Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolCodecFactory.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/protocol/NtpProtocolCodecFactory.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolCodecFactory.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolCodecFactory.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/protocol/NtpProtocolCodecFactory.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/protocol/NtpProtocolCodecFactory.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolCodecFactory.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.ntp.protocol; +package org.apache.directory.server.ntp.protocol; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/protocol/NtpProtocolHandler.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/protocol/NtpProtocolHandler.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/protocol/NtpProtocolHandler.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java Tue Feb 7 16:10:02 2006 @@ -15,15 +15,15 @@ * */ -package org.apache.ntp.protocol; +package org.apache.directory.server.ntp.protocol; +import org.apache.directory.server.ntp.NtpService; +import org.apache.directory.server.ntp.messages.NtpMessage; +import org.apache.directory.server.ntp.service.NtpServiceImpl; import org.apache.mina.common.IdleStatus; import org.apache.mina.common.IoHandler; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; -import org.apache.ntp.NtpService; -import org.apache.ntp.messages.NtpMessage; -import org.apache.ntp.service.NtpServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Copied: directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/service/NtpServiceImpl.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/service/NtpServiceImpl.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/service/NtpServiceImpl.java?p2=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/service/NtpServiceImpl.java&p1=directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/service/NtpServiceImpl.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/ntp/service/NtpServiceImpl.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/service/NtpServiceImpl.java Tue Feb 7 16:10:02 2006 @@ -15,16 +15,16 @@ * */ -package org.apache.ntp.service; +package org.apache.directory.server.ntp.service; -import org.apache.ntp.NtpService; -import org.apache.ntp.messages.LeapIndicatorType; -import org.apache.ntp.messages.ModeType; -import org.apache.ntp.messages.NtpMessage; -import org.apache.ntp.messages.NtpMessageModifier; -import org.apache.ntp.messages.NtpTimeStamp; -import org.apache.ntp.messages.ReferenceIdentifier; -import org.apache.ntp.messages.StratumType; +import org.apache.directory.server.ntp.NtpService; +import org.apache.directory.server.ntp.messages.LeapIndicatorType; +import org.apache.directory.server.ntp.messages.ModeType; +import org.apache.directory.server.ntp.messages.NtpMessage; +import org.apache.directory.server.ntp.messages.NtpMessageModifier; +import org.apache.directory.server.ntp.messages.NtpTimeStamp; +import org.apache.directory.server.ntp.messages.ReferenceIdentifier; +import org.apache.directory.server.ntp.messages.StratumType; public class NtpServiceImpl implements NtpService { Copied: directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/directory/server/ntp/AbstractNtpTestCase.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/ntp/AbstractNtpTestCase.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/directory/server/ntp/AbstractNtpTestCase.java?p2=directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/directory/server/ntp/AbstractNtpTestCase.java&p1=directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/ntp/AbstractNtpTestCase.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/ntp/AbstractNtpTestCase.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/directory/server/ntp/AbstractNtpTestCase.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.ntp; +package org.apache.directory.server.ntp; import java.io.IOException; import java.io.InputStream; @@ -23,7 +23,7 @@ import junit.framework.TestCase; -import org.apache.ntp.messages.NtpMessage; +import org.apache.directory.server.ntp.messages.NtpMessage; public class AbstractNtpTestCase extends TestCase Copied: directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpMessageDecoderTest.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/ntp/NtpMessageDecoderTest.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpMessageDecoderTest.java?p2=directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpMessageDecoderTest.java&p1=directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/ntp/NtpMessageDecoderTest.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/ntp/NtpMessageDecoderTest.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpMessageDecoderTest.java Tue Feb 7 16:10:02 2006 @@ -15,12 +15,12 @@ * */ -package org.apache.ntp; +package org.apache.directory.server.ntp; import java.nio.ByteBuffer; -import org.apache.ntp.io.NtpMessageDecoder; -import org.apache.ntp.messages.NtpMessage; +import org.apache.directory.server.ntp.io.NtpMessageDecoder; +import org.apache.directory.server.ntp.messages.NtpMessage; public class NtpMessageDecoderTest extends AbstractNtpTestCase Copied: directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpMessageEncoderTest.java (from r375781, directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/ntp/NtpMessageEncoderTest.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpMessageEncoderTest.java?p2=directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpMessageEncoderTest.java&p1=directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/ntp/NtpMessageEncoderTest.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/ntp/NtpMessageEncoderTest.java (original) +++ directory/trunks/apacheds/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpMessageEncoderTest.java Tue Feb 7 16:10:02 2006 @@ -15,19 +15,19 @@ * */ -package org.apache.ntp; +package org.apache.directory.server.ntp; import java.nio.ByteBuffer; -import org.apache.ntp.io.NtpMessageDecoder; -import org.apache.ntp.io.NtpMessageEncoder; -import org.apache.ntp.messages.LeapIndicatorType; -import org.apache.ntp.messages.ModeType; -import org.apache.ntp.messages.NtpMessage; -import org.apache.ntp.messages.NtpMessageModifier; -import org.apache.ntp.messages.NtpTimeStamp; -import org.apache.ntp.messages.ReferenceIdentifier; -import org.apache.ntp.messages.StratumType; +import org.apache.directory.server.ntp.io.NtpMessageDecoder; +import org.apache.directory.server.ntp.io.NtpMessageEncoder; +import org.apache.directory.server.ntp.messages.LeapIndicatorType; +import org.apache.directory.server.ntp.messages.ModeType; +import org.apache.directory.server.ntp.messages.NtpMessage; +import org.apache.directory.server.ntp.messages.NtpMessageModifier; +import org.apache.directory.server.ntp.messages.NtpTimeStamp; +import org.apache.directory.server.ntp.messages.ReferenceIdentifier; +import org.apache.directory.server.ntp.messages.StratumType; public class NtpMessageEncoderTest extends AbstractNtpTestCase Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java (from r375675, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/AbstractBackingStoreTest.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/AbstractBackingStoreTest.java&r1=375675&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/AbstractBackingStoreTest.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.protocol.common; +package org.apache.directory.server.protocol.shared; import java.io.File; import java.io.FileInputStream; @@ -42,24 +42,24 @@ import junit.framework.TestCase; -import org.apache.ldap.common.ldif.LdifIterator; -import org.apache.ldap.common.ldif.LdifParser; -import org.apache.ldap.common.ldif.LdifParserImpl; -import org.apache.ldap.common.message.LockableAttributeImpl; -import org.apache.ldap.common.message.LockableAttributesImpl; -import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration; -import org.apache.ldap.server.configuration.MutableDirectoryPartitionConfiguration; -import org.apache.ldap.server.configuration.MutableStartupConfiguration; -import org.apache.ldap.server.configuration.ShutdownConfiguration; -import org.apache.ldap.server.jndi.CoreContextFactory; -import org.apache.ldap.server.schema.bootstrap.ApacheSchema; -import org.apache.ldap.server.schema.bootstrap.ApachednsSchema; -import org.apache.ldap.server.schema.bootstrap.CoreSchema; -import org.apache.ldap.server.schema.bootstrap.CosineSchema; -import org.apache.ldap.server.schema.bootstrap.InetorgpersonSchema; -import org.apache.ldap.server.schema.bootstrap.Krb5kdcSchema; -import org.apache.ldap.server.schema.bootstrap.SystemSchema; -import org.apache.protocol.common.store.KerberosAttribute; +import org.apache.directory.server.core.configuration.DirectoryPartitionConfiguration; +import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration; +import org.apache.directory.server.core.configuration.MutableStartupConfiguration; +import org.apache.directory.server.core.configuration.ShutdownConfiguration; +import org.apache.directory.server.core.jndi.CoreContextFactory; +import org.apache.directory.server.core.schema.bootstrap.ApacheSchema; +import org.apache.directory.server.core.schema.bootstrap.ApachednsSchema; +import org.apache.directory.server.core.schema.bootstrap.CoreSchema; +import org.apache.directory.server.core.schema.bootstrap.CosineSchema; +import org.apache.directory.server.core.schema.bootstrap.InetorgpersonSchema; +import org.apache.directory.server.core.schema.bootstrap.Krb5kdcSchema; +import org.apache.directory.server.core.schema.bootstrap.SystemSchema; +import org.apache.directory.server.protocol.shared.store.KerberosAttribute; +import org.apache.directory.shared.ldap.ldif.LdifIterator; +import org.apache.directory.shared.ldap.ldif.LdifParser; +import org.apache.directory.shared.ldap.ldif.LdifParserImpl; +import org.apache.directory.shared.ldap.message.LockableAttributeImpl; +import org.apache.directory.shared.ldap.message.LockableAttributesImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,7 +90,7 @@ env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" ); env.put( Context.SECURITY_AUTHENTICATION, "simple" ); env.put( Context.SECURITY_CREDENTIALS, "secret" ); - env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.CoreContextFactory" ); + env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.directory.server.core.jndi.CoreContextFactory" ); env.put( Context.PROVIDER_URL, "ou=system" ); factory = new CoreContextFactory(); Propchange: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LdapLoader.java (from r375675, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/LdapLoader.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LdapLoader.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LdapLoader.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/LdapLoader.java&r1=375675&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/LdapLoader.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LdapLoader.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.protocol.common; +package org.apache.directory.server.protocol.shared; import java.util.Map; Propchange: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LdapLoader.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LoadStrategy.java (from r375675, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/LoadStrategy.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LoadStrategy.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LoadStrategy.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/LoadStrategy.java&r1=375675&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/LoadStrategy.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LoadStrategy.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.protocol.common; +package org.apache.directory.server.protocol.shared; import java.util.Map; Propchange: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LoadStrategy.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/MapAdapter.java (from r375675, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/MapAdapter.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/MapAdapter.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/MapAdapter.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/MapAdapter.java&r1=375675&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/MapAdapter.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/MapAdapter.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.protocol.common; +package org.apache.directory.server.protocol.shared; import java.util.Collection; import java.util.Collections; Propchange: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/MapAdapter.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/PropsLoader.java (from r375675, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/PropsLoader.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/PropsLoader.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/PropsLoader.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/PropsLoader.java&r1=375675&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/PropsLoader.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/PropsLoader.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.protocol.common; +package org.apache.directory.server.protocol.shared; import java.util.HashMap; import java.util.Iterator; Propchange: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/PropsLoader.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java (from r375675, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/ServiceConfiguration.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/ServiceConfiguration.java&r1=375675&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/ServiceConfiguration.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java Tue Feb 7 16:10:02 2006 @@ -15,13 +15,13 @@ * */ -package org.apache.protocol.common; +package org.apache.directory.server.protocol.shared; import java.util.HashMap; import java.util.Hashtable; import java.util.Map; -import org.apache.ldap.server.configuration.Configuration; +import org.apache.directory.server.core.configuration.Configuration; /** * Base class shared by all protocol providers for configuration. @@ -57,7 +57,7 @@ public static final String DEFAULT_ENTRY_BASEDN = "dc=example,dc=com"; - public static final String DEFAULT_INITIAL_CONTEXT_FACTORY = "org.apache.ldap.server.jndi.CoreContextFactory"; + public static final String DEFAULT_INITIAL_CONTEXT_FACTORY = "org.apache.directory.server.core.jndi.CoreContextFactory"; public static final String APACHE_SERVICE_CONFIGURATION = "apacheServiceConfiguration"; Propchange: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java (from r375781, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/catalog/Catalog.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/catalog/Catalog.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/catalog/Catalog.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.protocol.common.catalog; +package org.apache.directory.server.protocol.shared.catalog; /** * The interface for resolving search-base DN's from zone or realm names. Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java (from r375781, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/catalog/GetCatalog.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/catalog/GetCatalog.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/catalog/GetCatalog.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.protocol.common.catalog; +package org.apache.directory.server.protocol.shared.catalog; import java.util.HashMap; import java.util.Map; @@ -28,7 +28,7 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apache.protocol.common.store.ContextOperation; +import org.apache.directory.server.protocol.shared.store.ContextOperation; /** * A JNDI context operation for building a catalog. Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Chain.java (from r375675, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/Chain.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Chain.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Chain.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/Chain.java&r1=375675&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/Chain.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Chain.java Tue Feb 7 16:10:02 2006 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.protocol.common.chain; +package org.apache.directory.server.protocol.shared.chain; /** *

A {@link Chain} represents a configured list of @@ -32,7 +32,7 @@ * *

To protect applications from evolution of this interface, specialized * implementations of {@link Chain} should generally be created by extending - * the provided base class {@link org.apache.protocol.common.chain.impl.ChainBase}) + * the provided base class {@link org.apache.directory.server.protocol.shared.chain.impl.ChainBase}) * rather than directly implementing this interface.

* *

{@link Chain} implementations should be designed in a thread-safe Propchange: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Chain.java ------------------------------------------------------------------------------ svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Command.java (from r375675, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/Command.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Command.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Command.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/Command.java&r1=375675&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/Command.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Command.java Tue Feb 7 16:10:02 2006 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.protocol.common.chain; +package org.apache.directory.server.protocol.shared.chain; /** *

A {@link Command} encapsulates a unit of processing work to be Propchange: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Command.java ------------------------------------------------------------------------------ svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Context.java (from r375675, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/Context.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Context.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Context.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/Context.java&r1=375675&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/Context.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Context.java Tue Feb 7 16:10:02 2006 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.protocol.common.chain; +package org.apache.directory.server.protocol.shared.chain; import java.util.Map; @@ -44,7 +44,7 @@ * *

To protect applications from evolution of this interface, specialized * implementations of {@link Context} should generally be created by extending - * the provided base class ({@link org.apache.protocol.common.chain.impl.ContextBase}) + * the provided base class ({@link org.apache.directory.server.protocol.shared.chain.impl.ContextBase}) * rather than directly implementing this interface.

* *

Applications should NOT assume that Propchange: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Context.java ------------------------------------------------------------------------------ svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Filter.java (from r375675, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/Filter.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Filter.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Filter.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/Filter.java&r1=375675&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/Filter.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Filter.java Tue Feb 7 16:10:02 2006 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.protocol.common.chain; +package org.apache.directory.server.protocol.shared.chain; /** *

A {@link Filter} is a specialized {@link Command} that also expects Propchange: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Filter.java ------------------------------------------------------------------------------ svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ChainBase.java (from r375781, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/impl/ChainBase.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ChainBase.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ChainBase.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/impl/ChainBase.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/impl/ChainBase.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ChainBase.java Tue Feb 7 16:10:02 2006 @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.protocol.common.chain.impl; +package org.apache.directory.server.protocol.shared.chain.impl; import java.util.Collection; import java.util.Iterator; -import org.apache.protocol.common.chain.Chain; -import org.apache.protocol.common.chain.Command; -import org.apache.protocol.common.chain.Context; -import org.apache.protocol.common.chain.Filter; +import org.apache.directory.server.protocol.shared.chain.Chain; +import org.apache.directory.server.protocol.shared.chain.Command; +import org.apache.directory.server.protocol.shared.chain.Context; +import org.apache.directory.server.protocol.shared.chain.Filter; /** *

Convenience base class for {@link Chain} implementations.

Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/CommandBase.java (from r375781, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/impl/CommandBase.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/CommandBase.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/CommandBase.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/impl/CommandBase.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/impl/CommandBase.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/CommandBase.java Tue Feb 7 16:10:02 2006 @@ -14,9 +14,9 @@ * limitations under the License. * */ -package org.apache.protocol.common.chain.impl; +package org.apache.directory.server.protocol.shared.chain.impl; -import org.apache.protocol.common.chain.Command; +import org.apache.directory.server.protocol.shared.chain.Command; /** *

Convenience base class for {@link Command} implementations.

Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ContextBase.java (from r375781, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/impl/ContextBase.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ContextBase.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ContextBase.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/impl/ContextBase.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/chain/impl/ContextBase.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ContextBase.java Tue Feb 7 16:10:02 2006 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.protocol.common.chain.impl; +package org.apache.directory.server.protocol.shared.chain.impl; import java.beans.IntrospectionException; import java.beans.Introspector; @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Set; -import org.apache.protocol.common.chain.Context; +import org.apache.directory.server.protocol.shared.chain.Context; /** *

Convenience base class for {@link Context} implementations.

Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/ContextOperation.java (from r375781, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/ContextOperation.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/ContextOperation.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/ContextOperation.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/ContextOperation.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/ContextOperation.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/ContextOperation.java Tue Feb 7 16:10:02 2006 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.protocol.common.store; +package org.apache.directory.server.protocol.shared.store; import java.io.Serializable; Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/KerberosAttribute.java (from r375781, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/KerberosAttribute.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/KerberosAttribute.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/KerberosAttribute.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/KerberosAttribute.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/KerberosAttribute.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/KerberosAttribute.java Tue Feb 7 16:10:02 2006 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.protocol.common.store; +package org.apache.directory.server.protocol.shared.store; public class KerberosAttribute { Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/Krb5KdcEntryFilter.java (from r375781, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/Krb5KdcEntryFilter.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/Krb5KdcEntryFilter.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/Krb5KdcEntryFilter.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/Krb5KdcEntryFilter.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/Krb5KdcEntryFilter.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/Krb5KdcEntryFilter.java Tue Feb 7 16:10:02 2006 @@ -1,4 +1,4 @@ -package org.apache.protocol.common.store; +package org.apache.directory.server.protocol.shared.store; import java.io.File; Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java (from r375781, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/LdifFileLoader.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/LdifFileLoader.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/LdifFileLoader.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java Tue Feb 7 16:10:02 2006 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.protocol.common.store; +package org.apache.directory.server.protocol.shared.store; import java.io.File; import java.io.FileInputStream; @@ -30,10 +30,10 @@ import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; -import org.apache.ldap.common.ldif.LdifIterator; -import org.apache.ldap.common.ldif.LdifParser; -import org.apache.ldap.common.ldif.LdifParserImpl; -import org.apache.ldap.common.message.LockableAttributesImpl; +import org.apache.directory.shared.ldap.ldif.LdifIterator; +import org.apache.directory.shared.ldap.ldif.LdifParser; +import org.apache.directory.shared.ldap.ldif.LdifParserImpl; +import org.apache.directory.shared.ldap.message.LockableAttributesImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Copied: directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java (from r375781, directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/LdifLoadFilter.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java?p2=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java&p1=directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/LdifLoadFilter.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/protocol/common/store/LdifLoadFilter.java (original) +++ directory/trunks/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java Tue Feb 7 16:10:02 2006 @@ -1,4 +1,4 @@ -package org.apache.protocol.common.store; +package org.apache.directory.server.protocol.shared.store; import javax.naming.directory.Attributes; Copied: directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/CatalogTest.java (from r375781, directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/protocol/common/catalog/CatalogTest.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/CatalogTest.java?p2=directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/CatalogTest.java&p1=directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/protocol/common/catalog/CatalogTest.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/protocol/common/catalog/CatalogTest.java (original) +++ directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/CatalogTest.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.protocol.common.catalog; +package org.apache.directory.server.protocol.shared.catalog; import java.util.HashMap; import java.util.HashSet; @@ -30,7 +30,7 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apache.protocol.common.AbstractBackingStoreTest; +import org.apache.directory.server.protocol.shared.AbstractBackingStoreTest; public class CatalogTest extends AbstractBackingStoreTest { Copied: directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java (from r375781, directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/protocol/common/kerberos/KerberosTest.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java?p2=directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java&p1=directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/protocol/common/kerberos/KerberosTest.java&r1=375781&r2=375785&rev=375785&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/protocol/common/kerberos/KerberosTest.java (original) +++ directory/trunks/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java Tue Feb 7 16:10:02 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.protocol.common.kerberos; +package org.apache.directory.server.protocol.shared.kerberos; import javax.naming.Context; import javax.naming.NamingException; @@ -25,7 +25,7 @@ import javax.naming.directory.BasicAttributes; import javax.naming.directory.DirContext; -import org.apache.protocol.common.AbstractBackingStoreTest; +import org.apache.directory.server.protocol.shared.AbstractBackingStoreTest; /** * @author Apache Directory Project Modified: directory/trunks/apacheds/server-installers/src/main/installers/bootstrapper.properties URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-installers/src/main/installers/bootstrapper.properties?rev=375785&r1=375784&r2=375785&view=diff ============================================================================== --- directory/trunks/apacheds/server-installers/src/main/installers/bootstrapper.properties (original) +++ directory/trunks/apacheds/server-installers/src/main/installers/bootstrapper.properties Tue Feb 7 16:10:02 2006 @@ -1,2 +1,2 @@ -bootstrap.start.class=org.apache.ldap.server.DirectoryServer -bootstrap.stop.class=org.apache.ldap.server.DirectoryServer +bootstrap.start.class=org.apache.directory.server.Service +bootstrap.stop.class=org.apache.directory.server.Service Modified: directory/trunks/apacheds/server-installers/src/main/installers/log4j.properties URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-installers/src/main/installers/log4j.properties?rev=375785&r1=375784&r2=375785&view=diff ============================================================================== --- directory/trunks/apacheds/server-installers/src/main/installers/log4j.properties (original) +++ directory/trunks/apacheds/server-installers/src/main/installers/log4j.properties Tue Feb 7 16:10:02 2006 @@ -7,6 +7,6 @@ # with these we'll not get innundated when switching to DEBUG log4j.logger.org.apache.ldap.common.name=WARN log4j.logger.org.springframework=WARN -log4j.logger.org.apache.ldap.common.codec=WARN +log4j.logger.org.apache.directory.common.codec=WARN log4j.logger.org.apache.asn1=WARN