Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 23849 invoked from network); 20 Dec 2010 15:02:44 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Dec 2010 15:02:44 -0000 Received: (qmail 25730 invoked by uid 500); 20 Dec 2010 15:02:44 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 25675 invoked by uid 500); 20 Dec 2010 15:02:43 -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 25668 invoked by uid 99); 20 Dec 2010 15:02:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Dec 2010 15:02:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Dec 2010 15:02:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2411F238899C; Mon, 20 Dec 2010 15:02:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1051137 - in /directory: apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ apacheds/branches/alex_refactoring/core-api/src/test/java/org/apache/directory/server/core/ apacheds/b... Date: Mon, 20 Dec 2010 15:02:19 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101220150220.2411F238899C@eris.apache.org> Author: akarasulu Date: Mon Dec 20 15:02:17 2010 New Revision: 1051137 URL: http://svn.apache.org/viewvc?rev=1051137&view=rev Log: Continuing with shared decoupling ... o Moved some String constants and functions in StringTools to shared-util module's Strings utility class. o Moved generic exceptions that are not LDAP related into the shared-util module so other non-ldap related code can leverage them without having to depend on shared-ldap. Added: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/MultiException.java (contents, props changed) - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/NotImplementedException.java (contents, props changed) - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/NotImplementedException.java directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/RuntimeMultiException.java (contents, props changed) - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/RuntimeMultiException.java Removed: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/NotImplementedException.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/RuntimeMultiException.java directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/asn1/ Modified: directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java directory/apacheds/branches/alex_refactoring/core-api/src/test/java/org/apache/directory/server/core/MockCursor.java directory/apacheds/branches/alex_refactoring/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/prefs/ServerPreferencesFactory.java directory/apacheds/branches/alex_refactoring/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java directory/apacheds/branches/alex_refactoring/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java directory/apacheds/branches/alex_refactoring/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java directory/apacheds/branches/alex_refactoring/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntry.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ImmutableEntry.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/exception/AbstractLdapReferralException.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageException.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchParams.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DITStructureRule.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchema.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Strings.java Modified: directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java (original) +++ directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java Mon Dec 20 15:02:17 2010 @@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.AttributeTypeOptions; import org.apache.directory.shared.ldap.schema.SchemaUtils; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -123,7 +123,7 @@ public abstract class SearchingOperation protected void setReturningAttributes( Collection attributesIds ) throws LdapException { - setReturningAttributes( attributesIds.toArray( StringTools.EMPTY_STRINGS ) ); + setReturningAttributes( attributesIds.toArray( Strings.EMPTY_STRINGS ) ); } Modified: directory/apacheds/branches/alex_refactoring/core-api/src/test/java/org/apache/directory/server/core/MockCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-api/src/test/java/org/apache/directory/server/core/MockCursor.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/core-api/src/test/java/org/apache/directory/server/core/MockCursor.java (original) +++ directory/apacheds/branches/alex_refactoring/core-api/src/test/java/org/apache/directory/server/core/MockCursor.java Mon Dec 20 15:02:17 2010 @@ -23,7 +23,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.cursor.ClosureMonitor; import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.cursor.CursorIterator; Modified: directory/apacheds/branches/alex_refactoring/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original) +++ directory/apacheds/branches/alex_refactoring/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Mon Dec 20 15:02:17 2010 @@ -37,7 +37,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.interceptor.context.CompareOperationContext; import org.apache.directory.server.core.interceptor.context.UnbindOperationContext; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.entry.BinaryValue; import org.apache.directory.shared.ldap.entry.StringValue; import org.apache.directory.shared.ldap.entry.Value; Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Mon Dec 20 15:02:17 2010 @@ -80,7 +80,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.subtree.SubentryInterceptor; import org.apache.directory.server.core.trigger.TriggerInterceptor; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.csn.Csn; Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original) +++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Mon Dec 20 15:02:17 2010 @@ -23,7 +23,7 @@ package org.apache.directory.server.core import java.util.Comparator; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.StringValue; Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original) +++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Mon Dec 20 15:02:17 2010 @@ -57,8 +57,8 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.interceptor.context.UnbindOperationContext; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.MultiException; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.MultiException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.codec.controls.CascadeControl; import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl; import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControl; Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/prefs/ServerPreferencesFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/prefs/ServerPreferencesFactory.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/prefs/ServerPreferencesFactory.java (original) +++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/prefs/ServerPreferencesFactory.java Mon Dec 20 15:02:17 2010 @@ -22,7 +22,7 @@ package org.apache.directory.server.core import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import java.util.prefs.Preferences; import java.util.prefs.PreferencesFactory; Modified: directory/apacheds/branches/alex_refactoring/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original) +++ directory/apacheds/branches/alex_refactoring/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Mon Dec 20 15:02:17 2010 @@ -35,7 +35,7 @@ import org.apache.directory.server.const import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.xdbm.AbstractStore; import org.apache.directory.server.xdbm.Index; -import org.apache.directory.shared.ldap.MultiException; +import org.apache.directory.shared.util.exception.MultiException; import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.cursor.Tuple; import org.apache.directory.shared.ldap.entry.Entry; Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java (original) +++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java Mon Dec 20 15:02:17 2010 @@ -34,7 +34,7 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.ModifyHandler; import org.apache.directory.server.ldap.handlers.SearchHandler; import org.apache.directory.server.ldap.handlers.UnbindHandler; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.message.AbandonRequest; import org.apache.directory.shared.ldap.message.AddRequest; import org.apache.directory.shared.ldap.message.BindRequest; Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java (original) +++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java Mon Dec 20 15:02:17 2010 @@ -20,7 +20,7 @@ package org.apache.directory.server.core.partition.impl.btree; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.cursor.Tuple; import org.apache.directory.server.xdbm.ForwardIndexEntry; import org.apache.directory.server.xdbm.IndexEntry; Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java (original) +++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ValueArrayCursor.java Mon Dec 20 15:02:17 2010 @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.List; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.cursor.AbstractCursor; import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.cursor.Tuple; Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java (original) +++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java Mon Dec 20 15:02:17 2010 @@ -27,7 +27,7 @@ import org.apache.directory.server.i18n. import org.apache.directory.server.xdbm.IndexCursor; import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.search.Evaluator; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.filter.AndNode; import org.apache.directory.shared.ldap.filter.ExprNode; Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java (original) +++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java Mon Dec 20 15:02:17 2010 @@ -26,7 +26,7 @@ import java.util.List; import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.search.Evaluator; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.filter.AndNode; import org.apache.directory.shared.ldap.filter.ApproximateNode; Modified: directory/apacheds/branches/alex_refactoring/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java (original) +++ directory/apacheds/branches/alex_refactoring/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java Mon Dec 20 15:02:17 2010 @@ -50,7 +50,7 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.ForwardIndexEntry; import org.apache.directory.server.xdbm.Index; import org.apache.directory.shared.ldap.cursor.Cursor; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/alex_refactoring/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java (original) +++ directory/apacheds/branches/alex_refactoring/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java Mon Dec 20 15:02:17 2010 @@ -51,7 +51,7 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original) +++ directory/shared/branches/alex_refactoring/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Mon Dec 20 15:02:17 2010 @@ -136,7 +136,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.registries.ObjectClassRegistry; import org.apache.directory.shared.ldap.schema.registries.Schema; import org.apache.directory.shared.ldap.schema.registries.SchemaLoader; -import org.apache.directory.shared.ldap.util.StringTools; import org.apache.directory.shared.util.CharConstants; import org.apache.directory.shared.util.Strings; import org.apache.mina.core.filterchain.IoFilter; @@ -887,7 +886,7 @@ public class LdapNetworkConnection exten LOG.debug( "Anonymous Bind request" ); // Create the BindRequest - BindRequest bindRequest = createBindRequest( StringTools.EMPTY, CharConstants.EMPTY_BYTES ); + BindRequest bindRequest = createBindRequest( Strings.EMPTY, CharConstants.EMPTY_BYTES ); return bind( bindRequest ); } @@ -901,7 +900,7 @@ public class LdapNetworkConnection exten LOG.debug( "Anonymous Bind request" ); // Create the BindRequest - BindRequest bindRequest = createBindRequest( StringTools.EMPTY, CharConstants.EMPTY_BYTES ); + BindRequest bindRequest = createBindRequest( Strings.EMPTY, CharConstants.EMPTY_BYTES ); return bindAsync( bindRequest ); } Modified: directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java (original) +++ directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java Mon Dec 20 15:02:17 2010 @@ -58,7 +58,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.registries.Registries; import org.apache.directory.shared.ldap.schema.registries.Schema; import org.apache.directory.shared.ldap.util.Base64; -import org.apache.directory.shared.ldap.util.StringTools; import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -263,7 +262,7 @@ public class SchemaEntityFactory impleme // Try to class load the syntaxChecker Class clazz = null; SyntaxChecker syntaxChecker = null; - String byteCodeStr = StringTools.EMPTY; + String byteCodeStr = Strings.EMPTY; if ( byteCode == null ) { @@ -395,7 +394,7 @@ public class SchemaEntityFactory impleme // Try to class load the comparator LdapComparator comparator = null; Class clazz = null; - String byteCodeStr = StringTools.EMPTY; + String byteCodeStr = Strings.EMPTY; if ( byteCode == null ) { @@ -545,7 +544,7 @@ public class SchemaEntityFactory impleme // Try to class load the normalizer Class clazz = null; Normalizer normalizer = null; - String byteCodeStr = StringTools.EMPTY; + String byteCodeStr = Strings.EMPTY; if ( byteCode == null ) { Modified: directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java (original) +++ directory/shared/branches/alex_refactoring/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java Mon Dec 20 15:02:17 2010 @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.constants.MetaSchemaConstants; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Entry; @@ -1827,7 +1827,7 @@ public class DefaultSchemaManager implem if ( ( referencing != null ) && !referencing.isEmpty() ) { - String msg = I18n.err( I18n.ERR_11012, schemaObject.getOid(), StringTools.setToString( referencing ) ); + String msg = I18n.err( I18n.ERR_11012, schemaObject.getOid(), Strings.setToString(referencing) ); Throwable error = new LdapProtocolErrorException( msg ); errors.add( error ); Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntry.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntry.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntry.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/DefaultEntry.java Mon Dec 20 15:02:17 2010 @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Set; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.name.DN; Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ImmutableEntry.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ImmutableEntry.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ImmutableEntry.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/ImmutableEntry.java Mon Dec 20 15:02:17 2010 @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.AttributeType; Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/entry/StringValue.java Mon Dec 20 15:02:17 2010 @@ -24,7 +24,7 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.LdapComparator; Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/exception/AbstractLdapReferralException.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/exception/AbstractLdapReferralException.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/exception/AbstractLdapReferralException.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/exception/AbstractLdapReferralException.java Mon Dec 20 15:02:17 2010 @@ -25,7 +25,7 @@ import java.util.Hashtable; import javax.naming.Context; import javax.naming.NamingException; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.DN; Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java Mon Dec 20 15:02:17 2010 @@ -28,7 +28,7 @@ import java.util.List; import javax.naming.Context; import javax.naming.NamingException; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.DN; Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java Mon Dec 20 15:02:17 2010 @@ -43,7 +43,7 @@ import java.util.NoSuchElementException; import org.apache.directory.shared.asn1.util.OID; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.ModificationOperation; Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageException.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageException.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageException.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageException.java Mon Dec 20 15:02:17 2010 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap.message; -import org.apache.directory.shared.ldap.RuntimeMultiException; +import org.apache.directory.shared.util.exception.RuntimeMultiException; /** Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java Mon Dec 20 15:02:17 2010 @@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; import org.apache.directory.shared.ldap.name.DN; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; /** @@ -213,7 +213,7 @@ public class ModifyRequestImpl extends A */ public void replace( String attributeName ) { - addModification( ModificationOperation.REPLACE_ATTRIBUTE, attributeName, StringTools.EMPTY_STRINGS ); + addModification( ModificationOperation.REPLACE_ATTRIBUTE, attributeName, Strings.EMPTY_STRINGS ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java Mon Dec 20 15:02:17 2010 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap.message; -import org.apache.directory.shared.ldap.RuntimeMultiException; +import org.apache.directory.shared.util.exception.RuntimeMultiException; /** Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchParams.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchParams.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchParams.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchParams.java Mon Dec 20 15:02:17 2010 @@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.AttributeTypeOptions; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.SchemaUtils; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -316,7 +316,7 @@ public class SearchParams if ( returningAttributesStr.size() != 0 ) { - sb.append( " returning attributes : " ).append( StringTools.setToString( returningAttributesStr ) ) + sb.append( " returning attributes : " ).append( Strings.setToString(returningAttributesStr) ) .append( "\n" ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java Mon Dec 20 15:02:17 2010 @@ -27,7 +27,7 @@ import javax.naming.ldap.ExtendedRespons import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedure; import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedureContainer; import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedureDecoder; Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DITStructureRule.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DITStructureRule.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DITStructureRule.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DITStructureRule.java Mon Dec 20 15:02:17 2010 @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; /** Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java Mon Dec 20 15:02:17 2010 @@ -35,6 +35,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; /** @@ -173,7 +174,7 @@ public abstract class AbstractSchemaLoad String name; String owner; - String[] dependencies = StringTools.EMPTY_STRINGS; + String[] dependencies = Strings.EMPTY_STRINGS; boolean isDisabled = false; if ( entry.get( SchemaConstants.CN_AT ) == null ) @@ -208,7 +209,7 @@ public abstract class AbstractSchemaLoad depsSet.add( value.getString() ); } - dependencies = depsSet.toArray( StringTools.EMPTY_STRINGS ); + dependencies = depsSet.toArray( Strings.EMPTY_STRINGS ); } return new DefaultSchema( name, owner, dependencies, isDisabled ) Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchema.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchema.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchema.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchema.java Mon Dec 20 15:02:17 2010 @@ -26,8 +26,7 @@ import java.util.Set; import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.schema.SchemaObjectWrapper; -import org.apache.directory.shared.ldap.util.StringTools; - +import org.apache.directory.shared.util.Strings; /** @@ -124,7 +123,7 @@ public class DefaultSchema implements Sc } else { - this.dependencies = StringTools.EMPTY_STRINGS; + this.dependencies = Strings.EMPTY_STRINGS; } this.disabled = disabled; Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java Mon Dec 20 15:02:17 2010 @@ -28,7 +28,7 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Properties; -import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.util.exception.NotImplementedException; /** Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java Mon Dec 20 15:02:17 2010 @@ -68,18 +68,6 @@ public final class StringTools // The following methods are taken from org.apache.commons.lang.StringUtils /** - * The empty String "". - * - * @since 2.0 - */ - public static final String EMPTY = ""; - - /** - * The empty String[] - */ - public static final String[] EMPTY_STRINGS = new String[] {}; - - /** * Trims several consecutive characters into one. * * @param str @@ -2686,42 +2674,6 @@ public final class StringTools } - - - /** - * Utility method that return a String representation of a set - * - * @param set The set to transform to a string - * @return A csv string - */ - public static String setToString( Set set ) - { - if ( ( set == null ) || ( set.size() == 0 ) ) - { - return ""; - } - - StringBuilder sb = new StringBuilder(); - boolean isFirst = true; - - for ( Object elem : set ) - { - if ( isFirst ) - { - isFirst = false; - } - else - { - sb.append( ", " ); - } - - sb.append( elem ); - } - - return sb.toString(); - } - - /** * Utility method that return a String representation of a list * Modified: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Strings.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Strings.java?rev=1051137&r1=1051136&r2=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Strings.java (original) +++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Strings.java Mon Dec 20 15:02:17 2010 @@ -21,6 +21,7 @@ package org.apache.directory.shared.util import java.io.UnsupportedEncodingException; +import java.util.Set; /** * Various string manipulation methods that are more efficient then chaining @@ -31,6 +32,18 @@ import java.io.UnsupportedEncodingExcept */ public class Strings { + /** + * The empty String "". + * + * @since 2.0 + */ + public static final String EMPTY = ""; + + /** + * The empty String[] + */ + public static final String[] EMPTY_STRINGS = new String[] {}; + /** * Helper function that dump an array of bytes in hex form @@ -47,15 +60,16 @@ public class Strings StringBuffer sb = new StringBuffer(); - for ( int i = 0; i < buffer.length; i++ ) + for ( byte bite : buffer ) { - sb.append( "0x" ).append( ( char ) ( CharConstants.HEX_CHAR[( buffer[i] & 0x00F0 ) >> 4] ) ).append( - ( char ) ( CharConstants.HEX_CHAR[buffer[i] & 0x000F] ) ).append( " " ); + sb.append( "0x" ).append( ( char ) ( CharConstants.HEX_CHAR [ ( bite & 0x00F0 ) >> 4 ] ) ).append( + ( char ) ( CharConstants.HEX_CHAR [ bite & 0x000F ] ) ).append( " " ); } return sb.toString(); } + /** * Test if the current character is a digit <digit> ::= '0' | '1' | '2' | * '3' | '4' | '5' | '6' | '7' | '8' | '9' @@ -69,6 +83,7 @@ public class Strings return ( car >= '0' ) && ( car <= '9' ); } + /** * Test if the current byte is an Alpha character : * <alpha> ::= [0x41-0x5A] | [0x61-0x7A] @@ -83,6 +98,7 @@ public class Strings return ( ( c > 0 ) && ( c <= 127 ) && CharConstants.ALPHA[c] ); } + /** * Test if the current character is an Alpha character : * <alpha> ::= [0x41-0x5A] | [0x61-0x7A] @@ -97,6 +113,7 @@ public class Strings return ( ( c > 0 ) && ( c <= 127 ) && CharConstants.ALPHA[c] ); } + /** * Check if the current char is in the unicodeSubset : all chars but * '\0', '(', ')', '*' and '\' @@ -109,6 +126,7 @@ public class Strings return ( ( c > 127 ) || CharConstants.UNICODE_SUBSET[c] ); } + /** *

* Checks if a String is empty ("") or null. @@ -135,6 +153,7 @@ public class Strings return str == null || str.length() == 0; } + /** * Checks if a bytes array is empty or null. * @@ -146,6 +165,7 @@ public class Strings return bytes == null || bytes.length == 0; } + /** * Return an UTF-8 encoded String * @@ -170,6 +190,7 @@ public class Strings } } + /** * Return an UTF-8 encoded String * @@ -195,6 +216,7 @@ public class Strings } } + /** * Return an UTF-8 encoded String * @@ -221,6 +243,7 @@ public class Strings } } + /** * Return UTF-8 encoded byte[] representation of a String * @@ -244,4 +267,38 @@ public class Strings throw new RuntimeException( uee ); } } + + + /** + * Utility method that return a String representation of a set + * + * @param set The set to transform to a string + * @return A csv string + */ + public static String setToString( Set set ) + { + if ( ( set == null ) || ( set.size() == 0 ) ) + { + return ""; + } + + StringBuilder sb = new StringBuilder(); + boolean isFirst = true; + + for ( Object elem : set ) + { + if ( isFirst ) + { + isFirst = false; + } + else + { + sb.append( ", " ); + } + + sb.append( elem ); + } + + return sb.toString(); + } } Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/MultiException.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/MultiException.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/MultiException.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java&r1=1049962&r2=1051137&rev=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java (original) +++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/MultiException.java Mon Dec 20 15:02:17 2010 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap; +package org.apache.directory.shared.util.exception; import java.io.PrintStream; Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/MultiException.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/NotImplementedException.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/NotImplementedException.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/NotImplementedException.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/NotImplementedException.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/NotImplementedException.java&r1=1049962&r2=1051137&rev=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/NotImplementedException.java (original) +++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/NotImplementedException.java Mon Dec 20 15:02:17 2010 @@ -18,7 +18,7 @@ * */ -package org.apache.directory.shared.ldap; +package org.apache.directory.shared.util.exception; /** Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/NotImplementedException.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/RuntimeMultiException.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/RuntimeMultiException.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/RuntimeMultiException.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/RuntimeMultiException.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/RuntimeMultiException.java&r1=1049962&r2=1051137&rev=1051137&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/RuntimeMultiException.java (original) +++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/RuntimeMultiException.java Mon Dec 20 15:02:17 2010 @@ -18,7 +18,7 @@ * */ -package org.apache.directory.shared.ldap; +package org.apache.directory.shared.util.exception; import java.io.PrintStream; Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/exception/RuntimeMultiException.java ------------------------------------------------------------------------------ svn:eol-style = native