svn commit: r1051234 - in /directory: apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/authn/ apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/security/ shared/branches/alex_re...

[ak...@apache.org]

Author: akarasulu
Date: Mon Dec 20 18:30:45 2010
New Revision: 1051234

URL: http://svn.apache.org/viewvc?rev=1051234&view=rev
Log:
moving more non-ldap related utility classes to shared-util

Added:
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/NoDuplicateKeysMap.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/NoDuplicateKeysMap.java
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/Position.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/Position.java
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/PropertiesUtils.java   (contents, props changed)
      - copied, changed from r1051137, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/SingletonEnumeration.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/SingletonEnumeration.java
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/UniversalContextFactory.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/UniversalContextFactory.java
    directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/UnixCrypt.java   (contents, props changed)
      - copied, changed from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/UnixCrypt.java
Removed:
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/NoDuplicateKeysMap.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/Position.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/SingletonEnumeration.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/UniversalContextFactory.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/UnixCrypt.java
Modified:
    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/security/CoreKeyStoreSpi.java
    directory/shared/branches/alex_refactoring/ldap/src/checkstyle/suppressions.xml
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
    directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.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/test/java/org/apache/directory/shared/util/JoinIteratorTest.java

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=1051234&r1=1051233&r2=1051234&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 18:30:45 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Value;
 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.UnixCrypt;
 import org.apache.directory.shared.util.Strings;
 
 
@@ -302,8 +302,8 @@ public class PasswordUtil
                 return digest( LdapSecurityConstants.HASH_METHOD_MD5, credentials, salt );
 
             case HASH_METHOD_CRYPT:
-                String saltWithCrypted = UnixCrypt.crypt( Strings.utf8ToString(credentials), Strings
-                    .utf8ToString(salt) );
+                String saltWithCrypted = UnixCrypt.crypt(Strings.utf8ToString(credentials), Strings
+                        .utf8ToString(salt));
                 String crypted = saltWithCrypted.substring( 2 );
 
                 return Strings.getBytesUtf8(crypted);

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=1051234&r1=1051233&r2=1051234&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 18:30:45 2010
@@ -58,7 +58,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.util.Base64;
-import org.apache.directory.shared.ldap.util.UnixCrypt;
+import org.apache.directory.shared.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/security/CoreKeyStoreSpi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java?rev=1051234&r1=1051233&r2=1051234&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java (original)
+++ directory/apacheds/branches/alex_refactoring/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java Mon Dec 20 18:30:45 2010
@@ -45,7 +45,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.util.SingletonEnumeration;
+import org.apache.directory.shared.util.SingletonEnumeration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/branches/alex_refactoring/ldap/src/checkstyle/suppressions.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/checkstyle/suppressions.xml?rev=1051234&r1=1051233&r2=1051234&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/checkstyle/suppressions.xml (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/checkstyle/suppressions.xml Mon Dec 20 18:30:45 2010
@@ -25,7 +25,7 @@
 
 <suppressions>
     <!-- UnixCrypt is from external, no formatting is applied -->
-    <suppress files="org.apache.directory.shared.ldap.util.UnixCrypt" checks="[A-Za-z0-9]" />
+    <suppress files="org.apache.directory.shared.util.UnixCrypt" checks="[A-Za-z0-9]" />
     
     <!-- hashcode() is final in super class -->
     <suppress files="org.apache.directory.shared.ldap.schema.SyntaxChecker" checks="EqualsHashCode" />

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java?rev=1051234&r1=1051233&r2=1051234&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java Mon Dec 20 18:30:45 2010
@@ -29,7 +29,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.util.AttributeUtils;
-import org.apache.directory.shared.ldap.util.Position;
+import org.apache.directory.shared.util.Position;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 
@@ -721,7 +721,7 @@ public class FilterParser
      *                    / ( [dnattrs]
      *                         matchingrule COLON EQUALS assertionvalue )
      */
-    private static ExprNode parseFilterComp( SchemaManager schemaManager, String filter, Position pos ) 
+    private static ExprNode parseFilterComp( SchemaManager schemaManager, String filter, Position pos )
         throws ParseException, LdapException
     {
         ExprNode node = null;

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java?rev=1051234&r1=1051233&r2=1051234&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java Mon Dec 20 18:30:45 2010
@@ -27,7 +27,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.util.Position;
+import org.apache.directory.shared.util.Position;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java?rev=1051234&r1=1051233&r2=1051234&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java Mon Dec 20 18:30:45 2010
@@ -47,6 +47,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
+import org.apache.directory.shared.util.Position;
 import org.apache.directory.shared.util.Strings;
 
 

Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.java?rev=1051234&r1=1051233&r2=1051234&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.java Mon Dec 20 18:30:45 2010
@@ -20,6 +20,7 @@
 package org.apache.directory.shared.ldap.util;
 
 
+import org.apache.directory.shared.util.Position;
 import org.apache.directory.shared.util.Strings;
 
 /**

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=1051234&r1=1051233&r2=1051234&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 18:30:45 2010
@@ -31,7 +31,6 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
@@ -43,6 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.UuidSyntaxChecker;
 import org.apache.directory.shared.util.CharConstants;
+import org.apache.directory.shared.util.Position;
 import org.apache.directory.shared.util.Strings;
 
 

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

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

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

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

Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/PropertiesUtils.java (from r1051137, 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/util/src/main/java/org/apache/directory/shared/util/PropertiesUtils.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/PropertiesUtils.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java&r1=1051137&r2=1051234&rev=1051234&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/util/src/main/java/org/apache/directory/shared/util/PropertiesUtils.java Mon Dec 20 18:30:45 2010
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.util;
+package org.apache.directory.shared.util;
 
 
 import java.io.File;

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

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

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

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

Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/UniversalContextFactory.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/UnixCrypt.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/UnixCrypt.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/UnixCrypt.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/UnixCrypt.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/UnixCrypt.java&r1=1049962&r2=1051234&rev=1051234&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/UnixCrypt.java (original)
+++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/UnixCrypt.java Mon Dec 20 18:30:45 2010
@@ -38,7 +38,7 @@
  * by Iris Van den Broeke, Daniel Deville
  */
 
-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/UnixCrypt.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java?rev=1051234&r1=1051233&r2=1051234&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java (original)
+++ directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java Mon Dec 20 18:30:45 2010
@@ -20,11 +20,7 @@
 package org.apache.directory.shared.util;
 
 
-import static org.junit.Assert.assertEquals;
-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.ArrayList;
 import java.util.Collections;