directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1051214 - in /directory: apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/schema/ apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/schema/ apacheds/branc...
Date Mon, 20 Dec 2010 17:24:43 GMT
Author: akarasulu
Date: Mon Dec 20 17:24:41 2010
New Revision: 1051214

URL: http://svn.apache.org/viewvc?rev=1051214&view=rev
Log:
Continuing to decouple shared:

  o moved general purpose utility classes not tied to LDAP to shared-util module


Added:
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/AbstractSimpleComponentsMonitor.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/AbstractSimpleComponentsMonitor.java
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ArrayEnumeration.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ArrayEnumeration.java
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Base32.java   (contents, props changed)
      - copied, changed from r1051130, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base32.java
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Base64.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base64.java
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ByteBuffer.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ByteBuffer.java
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ComponentsMonitor.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ComponentsMonitor.java
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/DateUtils.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/DateUtils.java
    directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/ArrayEnumerationTest.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/ArrayEnumerationTest.java
    directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/Base32Test.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/Base32Test.java
    directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/ByteBufferTest.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/ByteBufferTest.java
Removed:
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/AbstractSimpleComponentsMonitor.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ArrayEnumeration.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base32.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base64.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ByteBuffer.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ComponentsMonitor.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/DateUtils.java
    directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/ArrayEnumerationTest.java
    directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/Base32Test.java
    directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/ByteBufferTest.java
Modified:
    directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
    directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
    directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
    directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.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/authn/AbstractAuthenticator.java
    directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/PasswordHistory.java
    directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java
    directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
    directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
    directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.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/schema/AttributesFactory.java
    directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
    directory/apacheds/branches/alex_refactoring/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
    directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
    directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
    directory/apacheds/branches/alex_refactoring/service/src/main/java/org/apache/directory/server/ApacheDsService.java
    directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
    directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
    directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.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/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/ldif/LdifUtils.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryAndOptionalComponentsMonitor.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryComponentsMonitor.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/OptionalComponentsMonitor.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/PreferencesDictionary.java

Modified: directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java Mon Dec 20 17:24:41 2010
@@ -56,7 +56,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaUtils;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Mon Dec 20 17:24:41 2010
@@ -65,7 +65,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.loader.ldif.SchemaEntityFactory;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.NumericOidSyntaxChecker;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Mon Dec 20 17:24:41 2010
@@ -89,8 +89,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
 import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.OctetStringSyntaxChecker;
-import org.apache.directory.shared.ldap.util.Base64;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.Base64;
+import org.apache.directory.shared.util.DateUtils;
 import org.apache.directory.shared.ldap.util.JndiUtils;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -1929,7 +1929,7 @@ public class SubschemaSubentryIT extends
 
         Calendar cal = Calendar.getInstance( tz );
         String modifyTimestampStr = ( String ) modifyTimestampAttr.get();
-        Date modifyTimestamp = DateUtils.getDate( modifyTimestampStr );
+        Date modifyTimestamp = DateUtils.getDate(modifyTimestampStr);
         Date currentTimestamp = cal.getTime();
 
         assertFalse( modifyTimestamp.after( currentTimestamp ) );
@@ -2075,7 +2075,7 @@ public class SubschemaSubentryIT extends
             out.write( in.read() );
         }
 
-        return new String( Base64.encode( out.toByteArray() ) );
+        return new String( Base64.encode(out.toByteArray()) );
     }
 
 

Modified: directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java Mon Dec 20 17:24:41 2010
@@ -36,7 +36,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.jndi.ServerLdapContext;
-import org.apache.directory.shared.ldap.util.Base64;
+import org.apache.directory.shared.util.Base64;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -59,7 +59,7 @@ public class LdapClassLoaderIT extends A
         + "AAkAAAAdAAEAAQAAAAUqtwABsQAAAAEACgAAAAYAAQAAAAEACQALAAwAAQAJAAAAJQACAAEAAAA"
         + "JsgACEgO2AASxAAAAAQAKAAAACgACAAAABQAIAAYAAQANAAAAAgAO";
 
-    private static final byte[] HELLOWORLD_CLASS_BYTES = Base64.decode( HELLOWORLD_CLASS_BASE64.toCharArray() );
+    private static final byte[] HELLOWORLD_CLASS_BYTES = Base64.decode(HELLOWORLD_CLASS_BASE64.toCharArray());
 
 
     @Test

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=1051214&r1=1051213&r2=1051214&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 17:24:41 2010
@@ -80,6 +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.util.DateUtils;
 import org.apache.directory.shared.util.exception.NotImplementedException;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -101,7 +102,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.apache.directory.shared.ldap.util.DateUtils;
 import org.apache.directory.shared.ldap.util.tree.DnNode;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;

Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java (original)
+++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java Mon Dec 20 17:24:41 2010
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Mon Dec 20 17:24:41 2010
@@ -107,7 +107,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
 import org.apache.directory.shared.util.CharConstants;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;

Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/PasswordHistory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/PasswordHistory.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/PasswordHistory.java (original)
+++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/PasswordHistory.java Mon Dec 20 17:24:41 2010
@@ -22,8 +22,8 @@ package org.apache.directory.server.core
 
 
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.util.Base64;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.Base64;
+import org.apache.directory.shared.util.DateUtils;
 import org.apache.directory.shared.util.Strings;
 
 
@@ -70,7 +70,7 @@ public class PasswordHistory implements 
     public PasswordHistory( String time, byte[] password )
     {
         this.time = time;
-        this.data = String.valueOf( Base64.encode( password ) );
+        this.data = String.valueOf( Base64.encode(password) );
         this.length = data.length();
     }
 

Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java (original)
+++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java Mon Dec 20 17:24:41 2010
@@ -35,8 +35,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.constants.LdapSecurityConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.util.Base64;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.Base64;
+import org.apache.directory.shared.util.DateUtils;
 import org.apache.directory.shared.ldap.util.UnixCrypt;
 import org.apache.directory.shared.util.Strings;
 

Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Mon Dec 20 17:24:41 2010
@@ -57,7 +57,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.util.Base64;
+import org.apache.directory.shared.util.Base64;
 import org.apache.directory.shared.ldap.util.UnixCrypt;
 import org.apache.directory.shared.util.CharConstants;
 import org.apache.directory.shared.util.Strings;

Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java (original)
+++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java Mon Dec 20 17:24:41 2010
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.cursor.ListCursor;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
 
 
 /**
@@ -464,7 +464,7 @@ public class MemoryChangeLogStore implem
     public ChangeLogEvent log( LdapPrincipal principal, LdifEntry forward, LdifEntry reverse ) throws Exception
     {
         currentRevision++;
-        ChangeLogEvent event = new ChangeLogEvent( currentRevision, DateUtils.getGeneralizedTime(), 
+        ChangeLogEvent event = new ChangeLogEvent( currentRevision, DateUtils.getGeneralizedTime(),
                 principal, forward, reverse );
         events.add( event );
         return event;

Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Mon Dec 20 17:24:41 2010
@@ -63,7 +63,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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=1051214&r1=1051213&r2=1051214&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 17:24:41 2010
@@ -57,6 +57,7 @@ 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.util.DateUtils;
 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;
@@ -93,7 +94,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
-import org.apache.directory.shared.ldap.util.DateUtils;
 import org.apache.directory.shared.ldap.util.NamespaceTools;
 import org.apache.directory.shared.ldap.util.tree.DnNode;
 import org.slf4j.Logger;

Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java (original)
+++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java Mon Dec 20 17:24:41 2010
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.SchemaObject;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
 
 
 /**

Modified: directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Mon Dec 20 17:24:41 2010
@@ -52,7 +52,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
 import org.apache.directory.shared.ldap.schema.parsers.SyntaxCheckerDescription;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
-import org.apache.directory.shared.ldap.util.Base64;
+import org.apache.directory.shared.util.Base64;
 
 
 /**

Modified: directory/apacheds/branches/alex_refactoring/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java Mon Dec 20 17:24:41 2010
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
 import org.apache.directory.shared.util.Strings;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

Modified: directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Mon Dec 20 17:24:41 2010
@@ -48,9 +48,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.AddResponse;
 import org.apache.directory.shared.ldap.message.BindResponse;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.SearchResultEntry;
 import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Mon Dec 20 17:24:41 2010
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ModifyResponse;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: directory/apacheds/branches/alex_refactoring/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original)
+++ directory/apacheds/branches/alex_refactoring/service/src/main/java/org/apache/directory/server/ApacheDsService.java Mon Dec 20 17:24:41 2010
@@ -74,7 +74,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.CsnSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.GeneralizedTimeSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.UuidSyntaxChecker;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.util.DateUtils;
 import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java Mon Dec 20 17:24:41 2010
@@ -36,7 +36,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.util.Base64;
+import org.apache.directory.shared.util.Base64;
 import org.apache.directory.shared.util.Strings;
 import org.dom4j.Document;
 import org.dom4j.Element;
@@ -167,7 +167,7 @@ public final class ParserUtils
         }
         else if ( value instanceof String )
         {
-            return new String( Base64.encode( Strings.getBytesUtf8((String) value) ) );
+            return new String( Base64.encode(Strings.getBytesUtf8((String) value)) );
         }
 
         return "";

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Mon Dec 20 17:24:41 2010
@@ -71,7 +71,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.util.Base64;
+import org.apache.directory.shared.util.Base64;
 import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.util.Strings;
 import org.xmlpull.v1.XmlPullParser;

Modified: directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/branches/alex_refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Mon Dec 20 17:24:41 2010
@@ -78,7 +78,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
-import org.apache.directory.shared.ldap.util.Base64;
+import org.apache.directory.shared.util.Base64;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -1446,7 +1446,7 @@ public final class Dsmlv2Grammar extends
                 {
                     if ( ParserUtils.isBase64BinaryValue( xpp, typeValue ) )
                     {
-                        compareRequest.setAssertionValue( Base64.decode( nextText.trim().toCharArray() ) );
+                        compareRequest.setAssertionValue( Base64.decode(nextText.trim().toCharArray()) );
                     }
                     else
                     {

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=1051214&r1=1051213&r2=1051214&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 17:24:41 2010
@@ -57,7 +57,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.registries.DefaultSchema;
 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.util.Base64;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -272,7 +272,7 @@ public class SchemaEntityFactory impleme
         {
             classLoader.setAttribute( byteCode );
             clazz = classLoader.loadClass( className );
-            byteCodeStr = new String( Base64.encode( byteCode.getBytes() ) );
+            byteCodeStr = new String( Base64.encode(byteCode.getBytes()) );
         }
 
         // Create the syntaxChecker instance

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=1051214&r1=1051213&r2=1051214&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 17:24:41 2010
@@ -43,6 +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.util.Base64;
 import org.apache.directory.shared.util.exception.NotImplementedException;
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -53,7 +54,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.DnParser;
 import org.apache.directory.shared.ldap.name.RDN;
-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;
@@ -515,7 +515,7 @@ public class LdifReader implements Itera
 
                     try
                     {
-                        dn = new String( Base64.decode( trimmedLine.toCharArray() ), "UTF-8" );
+                        dn = new String( Base64.decode(trimmedLine.toCharArray()), "UTF-8" );
                     }
                     catch ( UnsupportedEncodingException uee )
                     {

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java Mon Dec 20 17:24:41 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
-import org.apache.directory.shared.ldap.util.Base64;
+import org.apache.directory.shared.util.Base64;
 import org.apache.directory.shared.util.Strings;
 
 
@@ -867,7 +867,7 @@ public final class LdifUtils
                 else if ( ava instanceof byte[] )
                 {
                     sb.append( ":: " );
-                    sb.append( new String( Base64.encode( ( byte[] ) ava ) ) );
+                    sb.append( new String( Base64.encode((byte[]) ava) ) );
                     sb.append( '\n' );
                 }
                 else

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryAndOptionalComponentsMonitor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryAndOptionalComponentsMonitor.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryAndOptionalComponentsMonitor.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryAndOptionalComponentsMonitor.java Mon Dec 20 17:24:41 2010
@@ -26,6 +26,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.util.ComponentsMonitor;
 
 
 /**

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryComponentsMonitor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryComponentsMonitor.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryComponentsMonitor.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryComponentsMonitor.java Mon Dec 20 17:24:41 2010
@@ -21,6 +21,8 @@
 package org.apache.directory.shared.ldap.util;
 
 
+import org.apache.directory.shared.util.AbstractSimpleComponentsMonitor;
+
 /**
  * A components monitor for manadatory components.
  *

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/OptionalComponentsMonitor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/OptionalComponentsMonitor.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/OptionalComponentsMonitor.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/OptionalComponentsMonitor.java Mon Dec 20 17:24:41 2010
@@ -21,6 +21,8 @@
 package org.apache.directory.shared.ldap.util;
 
 
+import org.apache.directory.shared.util.AbstractSimpleComponentsMonitor;
+
 /**
  * A components monitor for optional components.
  *

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/PreferencesDictionary.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/PreferencesDictionary.java?rev=1051214&r1=1051213&r2=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/PreferencesDictionary.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/PreferencesDictionary.java Mon Dec 20 17:24:41 2010
@@ -27,6 +27,7 @@ import java.util.prefs.BackingStoreExcep
 
 import org.apache.commons.lang.exception.NestableRuntimeException;
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.util.ArrayEnumeration;
 
 
 /**

Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/AbstractSimpleComponentsMonitor.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/AbstractSimpleComponentsMonitor.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/AbstractSimpleComponentsMonitor.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/AbstractSimpleComponentsMonitor.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/AbstractSimpleComponentsMonitor.java&r1=1049962&r2=1051214&rev=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/AbstractSimpleComponentsMonitor.java (original)
+++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/AbstractSimpleComponentsMonitor.java Mon Dec 20 17:24:41 2010
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.util;
+package org.apache.directory.shared.util;
 
 
 import java.util.Arrays;

Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/AbstractSimpleComponentsMonitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ArrayEnumeration.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ArrayEnumeration.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ArrayEnumeration.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ArrayEnumeration.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ArrayEnumeration.java&r1=1049962&r2=1051214&rev=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ArrayEnumeration.java (original)
+++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ArrayEnumeration.java Mon Dec 20 17:24:41 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.util;
+package org.apache.directory.shared.util;
 
 
 import java.util.Enumeration;

Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ArrayEnumeration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Base32.java (from r1051130, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base32.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Base32.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Base32.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base32.java&r1=1051130&r2=1051214&rev=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base32.java (original)
+++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Base32.java Mon Dec 20 17:24:41 2010
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.util;
+package org.apache.directory.shared.util;
 
 
 import org.apache.directory.shared.util.Strings;

Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Base32.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Base64.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base64.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Base64.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Base64.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base64.java&r1=1049962&r2=1051214&rev=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base64.java (original)
+++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Base64.java Mon Dec 20 17:24:41 2010
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.util;
+package org.apache.directory.shared.util;
 
 
 import org.apache.directory.shared.i18n.I18n;

Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Base64.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ByteBuffer.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ByteBuffer.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ByteBuffer.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ByteBuffer.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ByteBuffer.java&r1=1049962&r2=1051214&rev=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ByteBuffer.java (original)
+++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ByteBuffer.java Mon Dec 20 17:24:41 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.util;
+package org.apache.directory.shared.util;
 
 import org.apache.directory.shared.i18n.I18n;
 

Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ByteBuffer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ComponentsMonitor.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ComponentsMonitor.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ComponentsMonitor.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ComponentsMonitor.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ComponentsMonitor.java&r1=1049962&r2=1051214&rev=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/ComponentsMonitor.java (original)
+++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ComponentsMonitor.java Mon Dec 20 17:24:41 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.util;
+package org.apache.directory.shared.util;
 
 
 import java.util.List;

Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ComponentsMonitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/DateUtils.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/DateUtils.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/DateUtils.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/DateUtils.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/DateUtils.java&r1=1049962&r2=1051214&rev=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/DateUtils.java (original)
+++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/DateUtils.java Mon Dec 20 17:24:41 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.util;
+package org.apache.directory.shared.util;
 
 
 import java.text.SimpleDateFormat;

Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/DateUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/ArrayEnumerationTest.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/ArrayEnumerationTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/ArrayEnumerationTest.java?p2=directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/ArrayEnumerationTest.java&p1=directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/ArrayEnumerationTest.java&r1=1049962&r2=1051214&rev=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/ArrayEnumerationTest.java (original)
+++ directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/ArrayEnumerationTest.java Mon Dec 20 17:24:41 2010
@@ -17,13 +17,14 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.util;
+package org.apache.directory.shared.util;
 
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import org.junit.Assert;
 
 import java.util.NoSuchElementException;
 
@@ -32,6 +33,7 @@ import org.apache.directory.junit.tools.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+
 /**
  * Tests the ArrayEnumeration class.
  * 
@@ -50,13 +52,13 @@ public class ArrayEnumerationTest
 
         ArrayEnumeration list = new ArrayEnumeration( array );
 
-        assertFalse( list.hasMoreElements() );
+        Assert.assertFalse(list.hasMoreElements());
 
         try
         {
             list.nextElement();
 
-            fail( "should never get here due to a NoSuchElementException" );
+            Assert.fail("should never get here due to a NoSuchElementException");
         }
         catch ( NoSuchElementException e )
         {
@@ -68,15 +70,15 @@ public class ArrayEnumerationTest
 
         list = new ArrayEnumeration( array );
 
-        assertFalse( list.hasMoreElements() );
+        Assert.assertFalse(list.hasMoreElements());
 
-        assertFalse( list.hasMoreElements() );
+        Assert.assertFalse(list.hasMoreElements());
 
         try
         {
             list.nextElement();
 
-            fail( "should never get here due to a NoSuchElementException" );
+            Assert.fail("should never get here due to a NoSuchElementException");
         }
         catch ( NoSuchElementException e )
         {
@@ -89,17 +91,17 @@ public class ArrayEnumerationTest
 
         list = new ArrayEnumeration( array );
 
-        assertTrue( list.hasMoreElements() );
+        Assert.assertTrue(list.hasMoreElements());
 
-        assertNotNull( list.nextElement() );
+        Assert.assertNotNull(list.nextElement());
 
-        assertFalse( list.hasMoreElements() );
+        Assert.assertFalse(list.hasMoreElements());
 
         try
         {
             list.nextElement();
 
-            fail( "should never get here due to a NoSuchElementException" );
+            Assert.fail("should never get here due to a NoSuchElementException");
         }
         catch ( NoSuchElementException e )
         {
@@ -112,21 +114,21 @@ public class ArrayEnumerationTest
 
         list = new ArrayEnumeration( array );
 
-        assertTrue( list.hasMoreElements() );
+        Assert.assertTrue(list.hasMoreElements());
 
-        assertNotNull( list.nextElement() );
+        Assert.assertNotNull(list.nextElement());
 
-        assertTrue( list.hasMoreElements() );
+        Assert.assertTrue(list.hasMoreElements());
 
-        assertNotNull( list.nextElement() );
+        Assert.assertNotNull(list.nextElement());
 
-        assertFalse( list.hasMoreElements() );
+        Assert.assertFalse(list.hasMoreElements());
 
         try
         {
             list.nextElement();
 
-            fail( "should never get here due to a NoSuchElementException" );
+            Assert.fail("should never get here due to a NoSuchElementException");
         }
         catch ( NoSuchElementException e )
         {
@@ -139,25 +141,25 @@ public class ArrayEnumerationTest
 
         list = new ArrayEnumeration( array );
 
-        assertTrue( list.hasMoreElements() );
+        Assert.assertTrue(list.hasMoreElements());
 
-        assertNotNull( list.nextElement() );
+        Assert.assertNotNull(list.nextElement());
 
-        assertTrue( list.hasMoreElements() );
+        Assert.assertTrue(list.hasMoreElements());
 
-        assertNotNull( list.nextElement() );
+        Assert.assertNotNull(list.nextElement());
 
-        assertTrue( list.hasMoreElements() );
+        Assert.assertTrue(list.hasMoreElements());
 
-        assertNotNull( list.nextElement() );
+        Assert.assertNotNull(list.nextElement());
 
-        assertFalse( list.hasMoreElements() );
+        Assert.assertFalse(list.hasMoreElements());
 
         try
         {
             list.nextElement();
 
-            fail( "should never get here due to a NoSuchElementException" );
+            Assert.fail("should never get here due to a NoSuchElementException");
         }
         catch ( NoSuchElementException e )
         {

Propchange: directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/ArrayEnumerationTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/Base32Test.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/Base32Test.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/Base32Test.java?p2=directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/Base32Test.java&p1=directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/Base32Test.java&r1=1049962&r2=1051214&rev=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/Base32Test.java (original)
+++ directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/Base32Test.java Mon Dec 20 17:24:41 2010
@@ -17,15 +17,19 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.util;
+package org.apache.directory.shared.util;
+
 
 import static org.junit.Assert.assertEquals;
+import org.junit.Assert;
+
 
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+
 @RunWith(ConcurrentJunitRunner.class)
 @Concurrent()
 public class Base32Test
@@ -42,7 +46,7 @@ public class Base32Test
         
             String res = Base32.encode( in );
             
-            assertEquals( expected[i], res );
+            Assert.assertEquals(expected[i], res);
         }
     }
 }

Propchange: directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/Base32Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/ByteBufferTest.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/ByteBufferTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/ByteBufferTest.java?p2=directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/ByteBufferTest.java&p1=directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/ByteBufferTest.java&r1=1049962&r2=1051214&rev=1051214&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/ByteBufferTest.java (original)
+++ directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/ByteBufferTest.java Mon Dec 20 17:24:41 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.util;
+package org.apache.directory.shared.util;
 
 
 import static org.junit.Assert.assertEquals;
@@ -26,6 +26,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.Assert;
 
 
 /**
@@ -41,48 +42,48 @@ public class ByteBufferTest
     public void testByteBufferGrowth()
     {
         ByteBuffer buf = new ByteBuffer();
-        assertEquals( 10, buf.capacity() );
+        Assert.assertEquals(10, buf.capacity());
         
         for ( int ii = 0; ii < 20; ii++ )
         {
             buf.append( ii );
-            assertEquals( ii, buf.get( ii ) );
-            assertEquals( ii, buf.buffer()[ii] );
+            Assert.assertEquals(ii, buf.get(ii));
+            Assert.assertEquals(ii, buf.buffer()[ii]);
         }
         
-        assertEquals( 20, buf.capacity() );
+        Assert.assertEquals(20, buf.capacity());
         buf.append( 20 );
-        assertEquals( 30, buf.capacity() );
+        Assert.assertEquals(30, buf.capacity());
 
         // -------------------------------------------------------------------
         
         buf = new ByteBuffer( 5 );
-        assertEquals( 5, buf.capacity() );
+        Assert.assertEquals(5, buf.capacity());
         
         for ( int ii = 0; ii < 5; ii++ )
         {
             buf.append( ii );
-            assertEquals( ii, buf.get( ii ) );
-            assertEquals( ii, buf.buffer()[ii] );
+            Assert.assertEquals(ii, buf.get(ii));
+            Assert.assertEquals(ii, buf.buffer()[ii]);
         }
         
-        assertEquals( 5, buf.capacity() );
+        Assert.assertEquals(5, buf.capacity());
         buf.append( 5 );
-        assertEquals( 10, buf.capacity() );
+        Assert.assertEquals(10, buf.capacity());
     }
     
     public void testCopyOfUsedBytes()
     {
         ByteBuffer buf = new ByteBuffer();
         byte[] bytes = buf.copyOfUsedBytes();
-        assertEquals( 0, bytes.length );
+        Assert.assertEquals(0, bytes.length);
         
         for ( int ii = 0; ii < 20; ii++ )
         {
             buf.append( ii );
-            assertEquals( ii, buf.get( ii ) );
-            assertEquals( ii, buf.buffer()[ii] );
-            assertEquals( ii, buf.copyOfUsedBytes()[ii] );
+            Assert.assertEquals(ii, buf.get(ii));
+            Assert.assertEquals(ii, buf.buffer()[ii]);
+            Assert.assertEquals(ii, buf.copyOfUsedBytes()[ii]);
         }
     }
     
@@ -92,9 +93,9 @@ public class ByteBufferTest
         buf.append( new byte[]{ 0, 1, 2, 3, 4 } );
         for ( int ii = 0; ii < 5; ii++ )
         {
-            assertEquals( ii, buf.get( ii ) );
-            assertEquals( ii, buf.buffer()[ii] );
-            assertEquals( ii, buf.copyOfUsedBytes()[ii] );
+            Assert.assertEquals(ii, buf.get(ii));
+            Assert.assertEquals(ii, buf.buffer()[ii]);
+            Assert.assertEquals(ii, buf.copyOfUsedBytes()[ii]);
         }
     }
 }

Propchange: directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/ByteBufferTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message