directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r664295 [1/5] - in /directory/apacheds/branches/bigbang: ./ apacheds-jdbm/src/examples/ apacheds-jdbm/src/main/java/jdbm/ apacheds-jdbm/src/main/java/jdbm/btree/ bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/p...
Date Sat, 07 Jun 2008 07:48:20 GMT
Author: akarasulu
Date: Sat Jun  7 00:48:16 2008
New Revision: 664295

URL: http://svn.apache.org/viewvc?rev=664295&view=rev
Log:
[MERGE] from trunk since last copy

Removed:
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerAttributeSerializerUtils.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializerUtils.java
    directory/apacheds/branches/bigbang/core-plugin/src/main/antlr/openldap.g
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmAuthenticationResult.java
Modified:
    directory/apacheds/branches/bigbang/LAST_BIG_BANG_MERGE
    directory/apacheds/branches/bigbang/apacheds-jdbm/src/examples/Primes.java
    directory/apacheds/branches/bigbang/apacheds-jdbm/src/main/java/jdbm/RecordManagerFactory.java
    directory/apacheds/branches/bigbang/apacheds-jdbm/src/main/java/jdbm/btree/BTree.java
    directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
    directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/SchemaPartitionExtractor.java
    directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceException.java
    directory/apacheds/branches/bigbang/bootstrap-extract/src/test/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceTest.java
    directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
    directory/apacheds/branches/bigbang/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerAttribute.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntry.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
    directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java
    directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java
    directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java
    directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java
    directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java
    directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
    directory/apacheds/branches/bigbang/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/AttributeTypes.template
    directory/apacheds/branches/bigbang/core-plugin/src/main/resources/org/apache/directory/server/core/tools/schema/ObjectClasses.template
    directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/LdapPrincipal.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassImpl.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java
    directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
    directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java
    directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags/TicketFlags.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/CSNVector.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultUUID.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/Replica.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/configuration/ReplicationConfiguration.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BaseMessage.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesAckMessage.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesMessage.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesAckMessage.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesMessage.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryAckMessage.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryMessage.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginAckMessage.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginMessage.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/ResponseMessage.java
    directory/apacheds/branches/bigbang/pom.xml
    directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessage.java
    directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java
    directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/ByteOption.java
    directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/IntOption.java
    directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/ShortOption.java
    directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/UnrecognizedOption.java
    directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
    directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/AbstractDhcpService.java
    directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/DnsMessage.java
    directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/QuestionRecord.java
    directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordImpl.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/ShutdownDialog.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/ShutdownProgress.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbstractLdapHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DefaultBindHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DefaultModifyHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DefaultSearchHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmProvider.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerSettingsTest.java
    directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
    directory/apacheds/branches/bigbang/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java
    directory/apacheds/branches/bigbang/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaMatchingRuleProducer.java
    directory/apacheds/branches/bigbang/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/ApachemetaSyntaxProducer.java
    directory/apacheds/branches/bigbang/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/NameOrNumericIdMatch.java
    directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/DnComparator.java
    directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDComparator.java
    directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java
    directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultMatchingRuleRegistry.java
    directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultObjectClassRegistry.java
    directory/apacheds/branches/bigbang/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultOidRegistry.java
    directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
    directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
    directory/apacheds/branches/bigbang/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/DITUtilitiesSP.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/DeleteIllegalDNITest.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SearchITest.java
    directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ssl/StartTlsITest.java
    directory/apacheds/branches/bigbang/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java

Modified: directory/apacheds/branches/bigbang/LAST_BIG_BANG_MERGE
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/LAST_BIG_BANG_MERGE?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/LAST_BIG_BANG_MERGE (original)
+++ directory/apacheds/branches/bigbang/LAST_BIG_BANG_MERGE Sat Jun  7 00:48:16 2008
@@ -7,6 +7,7 @@
    https://svn.apache.org/repos/asf/directory/apacheds/branches/bigbang/
 
 
+Sat Jun  7 02:28:42 EDT 2008
 ----------------------------
-svn merge -r : https://svn.apache.org/repos/asf/directory/apacheds/trunk .
+svn merge -r 654375:664290 https://svn.apache.org/repos/asf/directory/apacheds/trunk .
 

Modified: directory/apacheds/branches/bigbang/apacheds-jdbm/src/examples/Primes.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/apacheds-jdbm/src/examples/Primes.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/apacheds-jdbm/src/examples/Primes.java (original)
+++ directory/apacheds/branches/bigbang/apacheds-jdbm/src/examples/Primes.java Sat Jun  7 00:48:16 2008
@@ -138,15 +138,15 @@
     {
         Tuple         tuple;
         TupleBrowser  browser;
-		Long          largest;
+        Long          largest;
         Long          current;
 
         if ( number.longValue() <= 0L ) {
             throw new IllegalArgumentException( "Number must be greater than zero" );
         }
         if ( number.longValue() == 1 ) {
-	    	return true;
-		}
+            return true;
+        }
         tuple = new Tuple();
         browser = _primes.browse();
         while ( browser.getNext( tuple ) ) {
@@ -223,7 +223,7 @@
         Primes  primes;
         int     count;
         Long    number;
-		Long    largest;
+        Long    largest;
             
         try {
             primes = new Primes( args );
@@ -242,10 +242,10 @@
                     } else {
                         number = new Long( _random.nextLong() );
                     }
-				    largest = primes.getLargestPrime();
-		    		if ( number.longValue() > primes.getLargestPrime().longValue() ) {
-						throw new IllegalArgumentException( "Number is larger than largest known prime in database." );
-		    		}
+                    largest = primes.getLargestPrime();
+                    if ( number.longValue() > primes.getLargestPrime().longValue() ) {
+                        throw new IllegalArgumentException( "Number is larger than largest known prime in database." );
+                    }
                     if ( primes.isPrime( number ) ) {
                         System.out.println( "The number " + number + " is a prime." );
                     } else {

Modified: directory/apacheds/branches/bigbang/apacheds-jdbm/src/main/java/jdbm/RecordManagerFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/apacheds-jdbm/src/main/java/jdbm/RecordManagerFactory.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/apacheds-jdbm/src/main/java/jdbm/RecordManagerFactory.java (original)
+++ directory/apacheds/branches/bigbang/apacheds-jdbm/src/main/java/jdbm/RecordManagerFactory.java Sat Jun  7 00:48:16 2008
@@ -102,7 +102,7 @@
                                         "jdbm.recman.Provider" );
 
         try {
-            clazz = Class.forName( provider );
+            clazz = Thread.currentThread().getContextClassLoader().loadClass( provider );
             factory = (RecordManagerProvider) clazz.newInstance();
         } catch ( Exception except ) {
             throw new IllegalArgumentException( "Invalid record manager provider: "

Modified: directory/apacheds/branches/bigbang/apacheds-jdbm/src/main/java/jdbm/btree/BTree.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/apacheds-jdbm/src/main/java/jdbm/btree/BTree.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/apacheds-jdbm/src/main/java/jdbm/btree/BTree.java (original)
+++ directory/apacheds/branches/bigbang/apacheds-jdbm/src/main/java/jdbm/btree/BTree.java Sat Jun  7 00:48:16 2008
@@ -562,7 +562,7 @@
 
     public void setValueSerializer( Serializer valueSerializer )
     {
-    	_valueSerializer = valueSerializer;
+        _valueSerializer = valueSerializer;
     }
     
     

Modified: directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java (original)
+++ directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java Sat Jun  7 00:48:16 2008
@@ -22,15 +22,15 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.Enumeration;
-import java.net.URL;
 
 
 /**
@@ -78,8 +78,13 @@
     {
 
         boolean userIndexMode = false;
-        String line;
-        BufferedReader in = new BufferedReader( new InputStreamReader( getUniqueResourceAsStream( "DBFILES", "bootstrap partition database file list.  Be sure there is exactly one bootstrap partition jar in your classpath." ) ) );
+        String line = null;
+        BufferedReader in = new BufferedReader( 
+            new InputStreamReader( 
+                getUniqueResourceAsStream( 
+                    "DBFILES", 
+                    "bootstrap partition database file list. " + 
+                    "Be sure there is exactly one bootstrap partition jar in your classpath." ) ) );
         try
         {
             while ( ( line = in.readLine() ) != null )

Modified: directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/SchemaPartitionExtractor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/SchemaPartitionExtractor.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/SchemaPartitionExtractor.java (original)
+++ directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/SchemaPartitionExtractor.java Sat Jun  7 00:48:16 2008
@@ -58,6 +58,7 @@
         }
 
         Iterator<String> ii = listing.iterator();
+        
         while ( ii.hasNext() )
         {
             extract( ii.next() );

Modified: directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceException.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceException.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceException.java (original)
+++ directory/apacheds/branches/bigbang/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceException.java Sat Jun  7 00:48:16 2008
@@ -27,11 +27,12 @@
 import java.util.List;
 
 /**
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$ $Date$
  */
 public class UniqueResourceException extends RuntimeException
 {
-    public static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     private final String resourceName;
     private final List<URL> urls;

Modified: directory/apacheds/branches/bigbang/bootstrap-extract/src/test/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/bootstrap-extract/src/test/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceTest.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/bootstrap-extract/src/test/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceTest.java (original)
+++ directory/apacheds/branches/bigbang/bootstrap-extract/src/test/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceTest.java Sat Jun  7 00:48:16 2008
@@ -23,6 +23,7 @@
 import junit.framework.TestCase;
 
 /**
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$ $Date$
  */
 public class UniqueResourceTest extends TestCase

Modified: directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Sat Jun  7 00:48:16 2008
@@ -20,6 +20,24 @@
 package org.apache.directory.server.core.bootstrap.plugin;
 
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.naming.NamingException;
+
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.constants.MetaSchemaConstants;
 import org.apache.directory.server.constants.ServerDNConstants;
@@ -66,24 +84,6 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.codehaus.plexus.util.FileUtils;
 
-import javax.naming.NamingException;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 
 /**
  * A plugin used to pre-load meta schema entries into the schema partition.

Modified: directory/apacheds/branches/bigbang/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java (original)
+++ directory/apacheds/branches/bigbang/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java Sat Jun  7 00:48:16 2008
@@ -27,6 +27,14 @@
  */
 public class ServerDNConstants
 {
+    /**
+     * A private constructor to protect this class containing only constants
+     */
+    private ServerDNConstants()
+    {
+        
+    }
+    
     /** The administrators group DN */
     public static final String ADMINISTRATORS_GROUP_DN = "cn=Administrators,ou=groups,ou=system";
 
@@ -34,34 +42,34 @@
     public static final String SYSTEM_DN = "ou=system";
     
     /** the default user principal or DN */
-    public final static String ADMIN_SYSTEM_DN = "uid=admin,ou=system";
+    public static final String ADMIN_SYSTEM_DN = "uid=admin,ou=system";
     
     /** the normalized user principal or DN */
-    public final static String ADMIN_SYSTEM_DN_NORMALIZED = "0.9.2342.19200300.100.1.1=admin,2.5.4.11=system";
+    public static final String ADMIN_SYSTEM_DN_NORMALIZED = "0.9.2342.19200300.100.1.1=admin,2.5.4.11=system";
 
     /** the DN for the global schema subentry */
-    public final static String CN_SCHEMA_DN = "cn=schema";
+    public static final String CN_SCHEMA_DN = "cn=schema";
     
     /** The DN for the gloval schema subentry normalized */
     public static final String CN_SCHEMA_DN_NORMALIZED = "2.5.4.3=schema";
    
     /** the DN for the global schema subentry */
-    public final static String OU_SCHEMA_DN = "ou=schema";
+    public static final String OU_SCHEMA_DN = "ou=schema";
     
     /** the base dn under which all users reside */
-    public final static String USERS_SYSTEM_DN = "ou=users,ou=system";
+    public static final String USERS_SYSTEM_DN = "ou=users,ou=system";
     
     /** The default change password base DN. */
-    public final static String USER_EXAMPLE_COM_DN = "ou=users,dc=example,dc=com";
+    public static final String USER_EXAMPLE_COM_DN = "ou=users,dc=example,dc=com";
     
     
     /** the base dn under which all groups reside */
-    public final static String GROUPS_SYSTEM_DN = "ou=groups,ou=system";
+    public static final String GROUPS_SYSTEM_DN = "ou=groups,ou=system";
     
     /** the dn base of the system preference hierarchy */
-    public final static String SYSPREFROOT_SYSTEM_DN = "prefNodeName=sysPrefRoot,ou=system";
+    public static final String SYSPREFROOT_SYSTEM_DN = "prefNodeName=sysPrefRoot,ou=system";
     
     /** The ldifDile base which stores the name of the loaded ldif files */
-    public final static String LDIF_FILES_DN = "ou=loadedLdifFiles,ou=configuration,ou=system";
+    public static final String LDIF_FILES_DN = "ou=loadedLdifFiles,ou=configuration,ou=system";
 
 }

Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java Sat Jun  7 00:48:16 2008
@@ -19,6 +19,9 @@
 package org.apache.directory.server.core.entry;
 
 
+import javax.naming.NamingException;
+import javax.naming.directory.InvalidAttributeValueException;
+
 import org.apache.directory.shared.asn1.primitives.OID;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
@@ -30,9 +33,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.naming.NamingException;
-import javax.naming.directory.InvalidAttributeValueException;
-
 
 /**
  * A server side entry attribute aware of schema.
@@ -42,59 +42,32 @@
  */
 public final class DefaultServerAttribute extends DefaultClientAttribute implements ServerAttribute
 {
-    /** Used for serialization */
-    public static final long serialVersionUID = 2L;
-    
     /** logger for reporting errors that might not be handled properly upstream */
     private static final Logger LOG = LoggerFactory.getLogger( DefaultServerAttribute.class );
     
     /** The associated AttributeType */
-    protected transient AttributeType attributeType;
+    private AttributeType attributeType;
     
     
     // -----------------------------------------------------------------------
     // utility methods
     // -----------------------------------------------------------------------
     /**
-     *  Check the attributeType member. It should not be null, 
-     *  and it should contains a syntax.
-     */
-    protected String getErrorMessage( AttributeType attributeType )
-    {
-        try
-        {
-            if ( attributeType == null )
-            {
-                return "The AttributeType parameter should not be null";
-            }
-            
-            if ( attributeType.getSyntax() == null )
-            {
-                return "There is no Syntax associated with this attributeType";
-            }
-
-            return null;
-        }
-        catch ( NamingException ne )
-        {
-            return "This AttributeType is incorrect";
-        }
-    }
-    
-    
-    /**
      * Private helper method used to set an UpId from an attributeType
+     * 
+     * @param at The attributeType for which we want the upID
+     * @return the ID of the given attributeType
      */
-    private String getUpId( AttributeType attributeType )
+    private String getUpId( AttributeType at )
     {
-        String upId = attributeType.getName();
+        String atUpId = at.getName();
         
-        if ( upId == null )
+        if ( atUpId == null )
         {
-            upId = attributeType.getOid();
+            atUpId = at.getOid();
         }
         
-        return upId;
+        return atUpId;
     }
     
     
@@ -123,7 +96,7 @@
         
         String normId = StringTools.lowerCaseAscii( trimmedId );
         
-        for ( String name:attributeType.getNames() )
+        for ( String name:attributeType.getNamesRef() )
         {
             if ( normId.equalsIgnoreCase( name ) )
             {
@@ -171,7 +144,7 @@
                 // In this case, it must be equals to the attributeType OID.
                 String normId = StringTools.lowerCaseAscii( StringTools.trim( id ) );
                 
-                for ( String atName:attributeType.getNames() )
+                for ( String atName:attributeType.getNamesRef() )
                 {
                     if ( atName.equalsIgnoreCase( normId ) )
                     {
@@ -190,7 +163,8 @@
                 else
                 {
                     // The id is incorrect : this is not allowed 
-                    throw new IllegalArgumentException( "The ID '" + id + "'is incompatible with the AttributeType's id '" + attributeType.getName() + "'" );
+                    throw new IllegalArgumentException( "The ID '" + id + "'is incompatible with the AttributeType's id '" + 
+                        attributeType.getName() + "'" );
                 }
             }
         }
@@ -239,9 +213,9 @@
                 // In this case, it must be equals to the attributeType OID.
                 String normUpId = StringTools.lowerCaseAscii( StringTools.trim( upId ) );
                 
-                for ( String id:attributeType.getNames() )
+                for ( String atId:attributeType.getNamesRef() )
                 {
-                    if ( id.equalsIgnoreCase( normUpId ) )
+                    if ( atId.equalsIgnoreCase( normUpId ) )
                     {
                         // Found ! We can store the upId and get out
                         super.setUpId( upId );
@@ -317,9 +291,9 @@
                 // In this case, it must be equals to the attributeType OID.
                 String normUpId = StringTools.lowerCaseAscii( StringTools.trim( upId ) );
                 
-                for ( String id:attributeType.getNames() )
+                for ( String atId:attributeType.getNamesRef() )
                 {
-                    if ( id.equalsIgnoreCase( normUpId ) )
+                    if ( atId.equalsIgnoreCase( normUpId ) )
                     {
                         // Found ! We can store the upId and get out
                         super.setUpId( upId );
@@ -406,6 +380,8 @@
     // an initial value as a string or a byte[]
     /**
      * Create a new instance of a EntryAttribute, without ID nor value.
+     * 
+     * @param attributeType the attributeType for the empty attribute added into the entry
      */
     public DefaultServerAttribute( AttributeType attributeType )
     {
@@ -420,6 +396,9 @@
 
     /**
      * Create a new instance of a EntryAttribute, without value.
+     * 
+     * @param upId the ID for the added attributeType
+     * @param attributeType the added AttributeType
      */
     public DefaultServerAttribute( String upId, AttributeType attributeType )
     {
@@ -444,7 +423,6 @@
      *
      * @param attributeType the attribute type according to the schema
      * @param vals an initial set of values for this attribute
-     * @throws NamingException if there are problems creating the new attribute
      */
     public DefaultServerAttribute( AttributeType attributeType, Value<?>... vals )
     {
@@ -461,10 +439,9 @@
      * 
      * Otherwise, the value is stored, but as a reference. It's not a copy.
      *
-     * @param upId
+     * @param upId the ID of the added attribute
      * @param attributeType the attribute type according to the schema
      * @param vals an initial set of values for this attribute
-     * @throws NamingException if there are problems creating the new attribute
      */
     public DefaultServerAttribute( String upId, AttributeType attributeType, Value<?>... vals )
     {
@@ -481,6 +458,9 @@
 
     /**
      * Create a new instance of a EntryAttribute, without ID but with some values.
+     * 
+     * @param attributeType The attributeType added on creation
+     * @param vals The added value for this attribute
      */
     public DefaultServerAttribute( AttributeType attributeType, String... vals )
     {
@@ -490,6 +470,10 @@
 
     /**
      * Create a new instance of a EntryAttribute.
+     * 
+     * @param upId the ID for the added attribute
+     * @param attributeType The attributeType added on creation
+     * @param vals the added values for this attribute
      */
     public DefaultServerAttribute( String upId, AttributeType attributeType, String... vals )
     {
@@ -506,6 +490,9 @@
 
     /**
      * Create a new instance of a EntryAttribute, with some byte[] values.
+     * 
+     * @param attributeType The attributeType added on creation
+     * @param vals The value for the added attribute
      */
     public DefaultServerAttribute( AttributeType attributeType, byte[]... vals )
     {
@@ -515,6 +502,10 @@
 
     /**
      * Create a new instance of a EntryAttribute, with some byte[] values.
+     * 
+     * @param upId the ID for the added attribute
+     * @param attributeType the AttributeType to be added
+     * @param vals the values for the added attribute
      */
     public DefaultServerAttribute( String upId, AttributeType attributeType, byte[]... vals )
     {
@@ -533,6 +524,8 @@
      * Clone an attribute. All the element are duplicated, so a modification on
      * the original object won't affect the cloned object, as a modification
      * on the cloned object has no impact on the original object
+     * 
+     * @return a clone of the current attribute
      */
     public ServerAttribute clone()
     {
@@ -595,6 +588,8 @@
 
     /**
      * @see EntryAttribute#add(org.apache.directory.shared.ldap.entry.Value...)
+     * 
+     * @return the number of added values into this attribute
      */
     public int add( Value<?>... vals )
     {
@@ -947,6 +942,8 @@
     
     /**
      * @see EntryAttribute#remove(org.apache.directory.shared.ldap.entry.Value...)
+     * 
+     * @return <code>true</code> if all the values shave been removed from this attribute
      */
     public boolean remove( Value<?>... vals )
     {
@@ -1000,6 +997,8 @@
 
     /**
      * @see EntryAttribute#remove(byte[]...)
+     * 
+     * @return <code>true</code> if all the values shave been removed from this attribute
      */
     public boolean remove( byte[]... vals )
     {
@@ -1022,6 +1021,8 @@
 
     /**
      * @see EntryAttribute#remove(String...)
+     * 
+     * @return <code>true</code> if all the values shave been removed from this attribute
      */
     public boolean remove( String... vals )
     {
@@ -1050,6 +1051,8 @@
      * on the internal values.
      *  
      * @see Object#hashCode()
+     * 
+     * @return the instance's hash code 
      */
     public int hashCode()
     {
@@ -1066,6 +1069,8 @@
 
     /**
      * @see Object#equals(Object)
+     * 
+     * @return <code>true</code> if the two objects are equal
      */
     public boolean equals( Object obj )
     {
@@ -1104,7 +1109,9 @@
     
     
     /**
-     * @see Object#toString() 
+     * @see Object#toString()
+     * 
+     * @return A String representation of this instance
      */
     public String toString()
     {

Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java Sat Jun  7 00:48:16 2008
@@ -29,6 +29,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.naming.NamingException;
+
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.NotImplementedException;
@@ -43,9 +45,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.naming.NamingException;
-import javax.naming.directory.InvalidAttributeValueException;
-
 
 /**
  * A default implementation of a ServerEntry which should suite most
@@ -59,7 +58,7 @@
 public final class DefaultServerEntry extends AbstractEntry<AttributeType> implements ServerEntry, Externalizable
 {
     /** Used for serialization */
-    public static final long serialVersionUID = 2L;
+    private static final long serialVersionUID = 2L;
     
     /** The logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( DefaultServerEntry.class );
@@ -71,7 +70,7 @@
     private static transient AttributeType OBJECT_CLASS_AT;
     
     /** A mutex to manage synchronization*/
-    private transient static Object MUTEX = new Object();
+    private static transient Object MUTEX = new Object();
 
 
     //-------------------------------------------------------------------------
@@ -96,7 +95,7 @@
     /**
      * Get the UpId if it was null.
      */
-    public static String getUpId( String upId, AttributeType attributeType ) throws NamingException
+    public static String getUpId( String upId, AttributeType attributeType )
     {
         String normUpId = StringTools.trim( upId );
 
@@ -159,7 +158,7 @@
      * 
      * Updates the serverAttributeMap.
      */
-    private void createAttribute( String upId, AttributeType attributeType, byte[]... values ) throws NamingException, InvalidAttributeValueException
+    private void createAttribute( String upId, AttributeType attributeType, byte[]... values ) 
     {
         ServerAttribute attribute = new DefaultServerAttribute( attributeType, values );
         attribute.setUpId( upId, attributeType );
@@ -173,7 +172,7 @@
      * 
      * Updates the serverAttributeMap.
      */
-    private void createAttribute( String upId, AttributeType attributeType, String... values ) throws NamingException, InvalidAttributeValueException
+    private void createAttribute( String upId, AttributeType attributeType, String... values ) 
     {
         ServerAttribute attribute = new DefaultServerAttribute( attributeType, values );
         attribute.setUpId( upId, attributeType );
@@ -187,7 +186,7 @@
      * 
      * Updates the serverAttributeMap.
      */
-    private void createAttribute( String upId, AttributeType attributeType, Value<?>... values ) throws NamingException, InvalidAttributeValueException
+    private void createAttribute( String upId, AttributeType attributeType, Value<?>... values ) 
     {
         ServerAttribute attribute = new DefaultServerAttribute( attributeType, values );
         attribute.setUpId( upId, attributeType );
@@ -1032,7 +1031,7 @@
     /**
      * Returns the attribute associated with an AttributeType
      * 
-     * @param the AttributeType we are looking for
+     * @param attributeType the AttributeType we are looking for
      * @return the associated attribute
      */
     public EntryAttribute get( AttributeType attributeType )
@@ -2289,6 +2288,7 @@
     * Gets the hashCode of this ServerEntry.
     *
     * @see java.lang.Object#hashCode()
+     * @return the instance's hash code 
      */
     public int hashCode()
     {

Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerAttribute.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerAttribute.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerAttribute.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerAttribute.java Sat Jun  7 00:48:16 2008
@@ -19,12 +19,12 @@
 package org.apache.directory.server.core.entry;
 
 
-import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.entry.client.ClientAttribute;
-
 import javax.naming.NamingException;
 import javax.naming.directory.InvalidAttributeValueException;
 
+import org.apache.directory.shared.ldap.entry.client.ClientAttribute;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+
 
 /**
  * The server specific interface extending the EntryAttribute interface. It adds
@@ -95,7 +95,7 @@
      * @param upId The attribute ID
      * @param attributeType The associated attributeType
      */
-    public void setUpId( String upId, AttributeType attributeType );
+    void setUpId( String upId, AttributeType attributeType );
     
     
     /**

Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java Sat Jun  7 00:48:16 2008
@@ -19,6 +19,15 @@
 package org.apache.directory.server.core.entry;
 
 
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Comparator;
+
+import javax.naming.NamingException;
+
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
@@ -30,15 +39,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.naming.NamingException;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Arrays;
-import java.util.Comparator;
-
 
 /**
  * A server side schema aware wrapper around a binary attribute value.
@@ -52,7 +52,7 @@
 public class ServerBinaryValue extends ClientBinaryValue
 {
     /** Used for serialization */
-    public static final long serialVersionUID = 2L;
+    private static final long serialVersionUID = 2L;
     
     /** logger for reporting errors that might not be handled properly upstream */
     private static final Logger LOG = LoggerFactory.getLogger( ServerBinaryValue.class );
@@ -168,7 +168,8 @@
      * @param wrapped the value to wrap which can be null
      * @param normalizedValue the normalized value
      */
-    /** No protection */ ServerBinaryValue( AttributeType attributeType, byte[] wrapped, byte[] normalizedValue, boolean same, boolean valid )
+    /** No protection */ 
+    ServerBinaryValue( AttributeType attributeType, byte[] wrapped, byte[] normalizedValue, boolean same, boolean valid )
     {
         super( wrapped );
         this.normalized = true;
@@ -233,7 +234,6 @@
      * to the wrapped value result in attempts to normalize the wrapped value.
      *
      * @return a reference to the normalized version of the wrapped value
-     * @throws NamingException with failures to normalize
      */
     public byte[] getNormalizedValueReference()
     {
@@ -269,7 +269,6 @@
      * to the wrapped value result in attempts to normalize the wrapped value.
      *
      * @return gets the normalized value
-     * @throws NamingException if the value cannot be properly normalized
      */
     public byte[] getNormalizedValue() 
     {
@@ -303,7 +302,6 @@
      * determine how to properly normalize the wrapped value.
      *
      * @return the normalized version of the wrapped value
-     * @throws NamingException if schema entity resolution fails or normalization fails
      */
     public byte[] getNormalizedValueCopy()
     {
@@ -420,7 +418,8 @@
                 }
                 else
                 {
-                    return ByteArrayComparator.INSTANCE.compare( getNormalizedValueReference(), binaryValue.getNormalizedValueReference() );
+                    return ByteArrayComparator.INSTANCE.compare( getNormalizedValueReference(), 
+                        binaryValue.getNormalizedValueReference() );
                 }
             }
             catch ( NamingException e )
@@ -476,8 +475,7 @@
     // -----------------------------------------------------------------------
     /**
      * @see Object#hashCode()
-     * @throws IllegalStateException on failures to extract the comparator, or the
-     * normalizers needed to perform the required comparisons based on the schema
+     * @return the instance's hash code 
      */
     public int hashCode()
     {
@@ -693,7 +691,7 @@
         else
         {
             int wrappedLength = in.readInt();
-            byte[] wrapped = null;
+            byte[] wrappedBytes = null;
             
             switch ( wrappedLength )
             {
@@ -705,15 +703,15 @@
                     
                 case 0 :
                     // Empty value, so is the normalized value
-                    wrapped = StringTools.EMPTY_BYTES;
-                    normalizedValue = wrapped;
+                    wrappedBytes = StringTools.EMPTY_BYTES;
+                    normalizedValue = wrappedBytes;
                     setNormalized( true );
                     same = true;
                     break;
                     
                 default :
-                    wrapped = new byte[wrappedLength];
-                    in.readFully( wrapped );
+                    wrappedBytes = new byte[wrappedLength];
+                    in.readFully( wrappedBytes );
                     
                     int normalizedLength = in.readInt();
                     
@@ -743,7 +741,7 @@
                     break;
             }
             
-            set( wrapped );
+            set( wrappedBytes );
         }
     }
 }

Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntry.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntry.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntry.java Sat Jun  7 00:48:16 2008
@@ -19,16 +19,16 @@
 package org.apache.directory.server.core.entry;
 
 
+import java.util.List;
+import java.util.Set;
+
+import javax.naming.NamingException;
+
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 
-import javax.naming.NamingException;
-
-import java.util.List;
-import java.util.Set;
-
 
 /**
  * A server side entry which is schema aware.
@@ -550,5 +550,5 @@
     /**
      * A clone method to produce a clone of the current object
      */
-    public Entry clone();
+    Entry clone();
 }

Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java Sat Jun  7 00:48:16 2008
@@ -19,17 +19,6 @@
  */
 package org.apache.directory.server.core.entry;
 
-import org.apache.directory.shared.ldap.ldif.LdifComposer;
-import org.apache.directory.shared.ldap.ldif.LdifComposerImpl;
-import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
-import org.apache.directory.shared.ldap.util.MultiMap;
-import org.apache.directory.shared.ldap.util.StringTools;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorSupport;
 import java.io.BufferedReader;
@@ -39,6 +28,18 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+
+import org.apache.directory.shared.ldap.ldif.LdifComposer;
+import org.apache.directory.shared.ldap.ldif.LdifComposerImpl;
+import org.apache.directory.shared.ldap.ldif.LdifReader;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.util.MultiMap;
+import org.apache.directory.shared.ldap.util.StringTools;
+
 
 /**
  * A JavaBeans {@link PropertyEditor} that can convert {@link ServerEntry} to

Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java Sat Jun  7 00:48:16 2008
@@ -19,7 +19,6 @@
  */
 package org.apache.directory.server.core.entry;
 
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -30,25 +29,25 @@
 
 import javax.naming.NamingException;
 
-import jdbm.helper.Serializer;
-
 import org.apache.directory.server.schema.registries.Registries;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDNSerializer;
 import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.LdapDNSerializer;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jdbm.helper.Serializer;
+
 
 /**
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
+ * @version $Rev$, $Date$
  */
 public class ServerEntrySerializer implements Serializer
 {
-    public static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     /** the logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( ServerEntrySerializer.class );
@@ -62,10 +61,10 @@
     private transient Registries registries;
 
     /** Flag used for ServerStringValue */
-    private transient static final boolean HR_VALUE = true;
+    private static final transient boolean HR_VALUE = true;
 
     /** Flag used for streamed values */
-    private transient static final boolean STREAMED_VALUE = true;
+    private static final transient boolean STREAMED_VALUE = true;
 
 
     /**
@@ -120,7 +119,7 @@
         // Then the attributes.
         out.writeInt( entry.size() );
 
-        // Iterate through the attrbutes. We store the Attribute
+        // Iterate through the attributes. We store the Attribute
         // here, to be able to restore it in the readExternal :
         // we need access to the registries, which are not available
         // in the ServerAttribute class.
@@ -188,7 +187,7 @@
 
             if ( ssv.get() == null )
             {
-                // Write two empry string for UP nad normalized
+                // Write two empty string for UP and normalized
                 out.writeUTF( "" );
                 out.writeUTF( "" );
             }
@@ -245,8 +244,7 @@
      *  [UP value]
      *  [Norm value] (will be null if normValue == upValue)
      */
-    private Value<?> deserializeValue( ObjectInput in, AttributeType attributeType ) throws IOException,
-        NamingException
+    private Value<?> deserializeValue( ObjectInput in, AttributeType attributeType ) throws IOException
     {
         boolean isValid = in.readBoolean();
         boolean isHR = in.readBoolean();
@@ -374,11 +372,6 @@
 
             return serverEntry;
         }
-        catch ( ClassNotFoundException cnfe )
-        {
-            // TODO Handle this exception
-            return null;
-        }
         catch ( NamingException ne )
         {
             // TODO Handle this exception

Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java Sat Jun  7 00:48:16 2008
@@ -19,7 +19,7 @@
 package org.apache.directory.server.core.entry;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Set;
@@ -80,7 +80,7 @@
             EntryAttribute attr = entry.get( attributeType );
             
             // Deal with a special case : an entry without any ObjectClass
-            if ( attributeType.getOid() == SchemaConstants.OBJECT_CLASS_AT_OID )
+            if ( attributeType.getOid().equals( SchemaConstants.OBJECT_CLASS_AT_OID ) )
             {
                 if ( attr.size() == 0 )
                 {
@@ -91,9 +91,8 @@
             
             Attribute attribute = new AttributeImpl( attributeType.getName() );
             
-            for ( Iterator<Value<?>> iter = attr.iterator(); iter.hasNext();)
+            for ( Value<?> value: attr )
             {
-                Value<?> value = iter.next();
                 attribute.add( value.get() );
             }
             
@@ -114,7 +113,6 @@
      * @throws InvalidAttributeIdentifierException If we had an incorrect attribute
      */
     public static ServerAttribute toServerAttribute( Attribute attribute, AttributeType attributeType )
-            throws InvalidAttributeIdentifierException
     {
         if ( attribute == null )
         {
@@ -370,7 +368,7 @@
      *         arguments
      * @throws NamingException if there are problems accessing attribute values
      */
-    public static ServerAttribute getUnion( ServerAttribute attr0, ServerAttribute attr1 ) throws NamingException
+    public static ServerAttribute getUnion( ServerAttribute attr0, ServerAttribute attr1 )
     {
         if ( attr0 == null && attr1 == null )
         {
@@ -391,12 +389,9 @@
 
         ServerAttribute attr = (ServerAttribute)attr0.clone();
 
-        if ( attr0 != null )
+        for ( Value<?> value:attr1 )
         {
-            for ( Value<?> value:attr1 )
-            {
-                attr.add( value );
-            }
+            attr.add( value );
         }
 
         return attr;
@@ -414,7 +409,7 @@
     }
 
 
-    public static Modification toModification( ModificationItemImpl modificationImpl, AttributeType attributeType ) throws InvalidAttributeIdentifierException
+    public static Modification toModification( ModificationItemImpl modificationImpl, AttributeType attributeType ) 
     {
         Modification modification = new ServerModification( 
             modificationImpl.getModificationOp(),
@@ -445,8 +440,8 @@
     }
     
     
-    public static List<Modification> toServerModification( List<ModificationItemImpl> modificationImpls, AttributeTypeRegistry atRegistry )
-        throws NamingException
+    public static List<Modification> toServerModification( List<ModificationItemImpl> modificationImpls, 
+        AttributeTypeRegistry atRegistry ) throws NamingException
     {
         if ( modificationImpls != null )
         {
@@ -470,48 +465,48 @@
     public static List<Modification> toServerModification( ModificationItem[] modifications, 
         AttributeTypeRegistry atRegistry ) throws NamingException
     {
-	    if ( modifications != null )
-	    {
-	        List<Modification> modificationsList = new ArrayList<Modification>();
-	
-	        for ( ModificationItem modification: modifications )
-	        {
-	            String attributeId = modification.getAttribute().getID();
-                String id = SchemaUtils.stripOptions( attributeId );
-	            Set<String> options = SchemaUtils.getOptions( attributeId );
-
-	            // -------------------------------------------------------------------
-	            // DIRSERVER-646 Fix: Replacing an unknown attribute with no values 
-	            // (deletion) causes an error
-	            // -------------------------------------------------------------------
-	            
+        if ( modifications != null )
+        {
+            List<Modification> modificationsList = new ArrayList<Modification>();
+    
+            for ( ModificationItem modification: modifications )
+            {
+                String attributeId = modification.getAttribute().getID();
+                String id = stripOptions( attributeId );
+                Set<String> options = getOptions( attributeId );
+
+                // -------------------------------------------------------------------
+                // DIRSERVER-646 Fix: Replacing an unknown attribute with no values 
+                // (deletion) causes an error
+                // -------------------------------------------------------------------
+                
                 // TODO - after removing JNDI we need to make the server handle 
-	            // this in the codec
+                // this in the codec
+                
+                if ( ! atRegistry.hasAttributeType( id ) 
+                     && modification.getAttribute().size() == 0 
+                     && modification.getModificationOp() == DirContext.REPLACE_ATTRIBUTE )
+                {
+                    continue;
+                }
+
+                // -------------------------------------------------------------------
+                // END DIRSERVER-646 Fix
+                // -------------------------------------------------------------------
                 
-	            if ( ! atRegistry.hasAttributeType( id ) 
-	                 && modification.getAttribute().size() == 0 
-	                 && modification.getModificationOp() == DirContext.REPLACE_ATTRIBUTE )
-	            {
-	                continue;
-	            }
-
-	            // -------------------------------------------------------------------
-	            // END DIRSERVER-646 Fix
-	            // -------------------------------------------------------------------
-	            
-	            
-	            // TODO : handle options
-	            AttributeType attributeType = atRegistry.lookup( id );
-	            modificationsList.add( toModification( (ModificationItemImpl)modification, attributeType ) );
-	        }
-	    
-	        return modificationsList;
-	    }
-	    else
-	    {
-	        return null;
-	    }
-	}
+                
+                // TODO : handle options
+                AttributeType attributeType = atRegistry.lookup( id );
+                modificationsList.add( toModification( (ModificationItemImpl)modification, attributeType ) );
+            }
+        
+            return modificationsList;
+        }
+        else
+        {
+            return null;
+        }
+    }
 
 
     /**
@@ -564,79 +559,138 @@
      */
     public static NamingEnumeration<SearchResult> toSearchResultEnum( final NamingEnumeration<ServerSearchResult> result )
     {
-    	if ( result instanceof EmptyEnumeration<?> )
-    	{
-    		return new EmptyEnumeration<SearchResult>();
-    	}
-    	
-    	return new NamingEnumeration<SearchResult> ()
-    	{
-    	    public void close() throws NamingException
-    	    {
-    	        result.close();
-    	    }
-
-
-    	    /**
-    	     * @see javax.naming.NamingEnumeration#hasMore()
-    	     */
-    	    public boolean hasMore() throws NamingException
-    	    {
-    	        return result.hasMore();
-    	    }
-
-
-    	    /**
-    	     * @see javax.naming.NamingEnumeration#next()
-    	     */
-    	    public SearchResult next() throws NamingException
-    	    {
-    	        ServerSearchResult rec = result.next();
-    	        
-    	        SearchResult searchResult = new SearchResult( 
-    	        		rec.getDn().getUpName(), 
-    	        		rec.getObject(), 
-    	        		toAttributesImpl( rec.getServerEntry() ), 
-    	        		rec.isRelative() );
-    	        
-    	        return searchResult;
-    	    }
-    	    
-    	    
-    	    /**
-    	     * @see java.util.Enumeration#hasMoreElements()
-    	     */
-    	    public boolean hasMoreElements()
-    	    {
-    	        return result.hasMoreElements();
-    	    }
-
-
-    	    /**
-    	     * @see java.util.Enumeration#nextElement()
-    	     */
-    	    public SearchResult nextElement()
-    	    {
-    	    	try
-    	    	{
-	    	    	ServerSearchResult rec = result.next();
-	
-	    	        SearchResult searchResult = new SearchResult( 
-	    	        		rec.getDn().getUpName(), 
-	    	        		rec.getObject(), 
-	    	        		toAttributesImpl( rec.getServerEntry() ), 
-	    	        		rec.isRelative() );
-	    	        
-	    	        return searchResult;
-    	    	}
-    	    	catch ( NamingException ne )
-    	    	{
-    	            NoSuchElementException nsee = 
-    	                new NoSuchElementException( "Encountered NamingException on underlying enumeration." );
-    	            nsee.initCause( ne );
-    	            throw nsee;
-    	    	}
-    	    }
-    	};
+        if ( result instanceof EmptyEnumeration<?> )
+        {
+            return new EmptyEnumeration<SearchResult>();
+        }
+        
+        return new NamingEnumeration<SearchResult> ()
+        {
+            public void close() throws NamingException
+            {
+                result.close();
+            }
+
+
+            /**
+             * @see javax.naming.NamingEnumeration#hasMore()
+             */
+            public boolean hasMore() throws NamingException
+            {
+                return result.hasMore();
+            }
+
+
+            /**
+             * @see javax.naming.NamingEnumeration#next()
+             */
+            public SearchResult next() throws NamingException
+            {
+                ServerSearchResult rec = result.next();
+                
+                SearchResult searchResult = new SearchResult( 
+                        rec.getDn().getUpName(), 
+                        rec.getObject(), 
+                        toAttributesImpl( rec.getServerEntry() ), 
+                        rec.isRelative() );
+                
+                return searchResult;
+            }
+            
+            
+            /**
+             * @see java.util.Enumeration#hasMoreElements()
+             */
+            public boolean hasMoreElements()
+            {
+                return result.hasMoreElements();
+            }
+
+
+            /**
+             * @see java.util.Enumeration#nextElement()
+             */
+            public SearchResult nextElement()
+            {
+                try
+                {
+                    ServerSearchResult rec = result.next();
+    
+                    SearchResult searchResult = new SearchResult( 
+                            rec.getDn().getUpName(), 
+                            rec.getObject(), 
+                            toAttributesImpl( rec.getServerEntry() ), 
+                            rec.isRelative() );
+                    
+                    return searchResult;
+                }
+                catch ( NamingException ne )
+                {
+                    NoSuchElementException nsee = 
+                        new NoSuchElementException( "Encountered NamingException on underlying enumeration." );
+                    nsee.initCause( ne );
+                    throw nsee;
+                }
+            }
+        };
+    }
+    
+    
+    /**
+     * Remove the options from the attributeType, and returns the ID.
+     * 
+     * RFC 4512 :
+     * attributedescription = attributetype options
+     * attributetype = oid
+     * options = *( SEMI option )
+     * option = 1*keychar
+     */
+    private static String stripOptions( String attributeId )
+    {
+        int optionsPos = attributeId.indexOf( ";" ); 
+        
+        if ( optionsPos != -1 )
+        {
+            return attributeId.substring( 0, optionsPos );
+        }
+        else
+        {
+            return attributeId;
+        }
+    }
+    
+
+    /**
+     * Get the options from the attributeType.
+     * 
+     * For instance, given :
+     * jpegphoto;binary;lang=jp
+     * 
+     * your get back a set containing { "binary", "lang=jp" }
+     */
+    private static Set<String> getOptions( String attributeId )
+    {
+        int optionsPos = attributeId.indexOf( ";" ); 
+
+        if ( optionsPos != -1 )
+        {
+            Set<String> options = new HashSet<String>();
+            
+            String[] res = attributeId.substring( optionsPos + 1 ).split( ";" );
+            
+            for ( String option:res )
+            {
+                if ( !StringTools.isEmpty( option ) )
+                {
+                    options.add( option );
+                }
+            }
+            
+            return options;
+        }
+        else
+        {
+            return null;
+        }
     }
 }

Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java Sat Jun  7 00:48:16 2008
@@ -34,8 +34,6 @@
  */
 public class ServerModification implements Modification
 {
-    public static final long serialVersionUID = 1L;
-    
     /** The modification operation */
     private ModificationOperation operation;
     
@@ -123,6 +121,7 @@
     
     /**
      * Compute the modification @see Object#hashCode
+     * @return the instance's hash code 
      */
     public int hashCode()
     {

Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java Sat Jun  7 00:48:16 2008
@@ -20,7 +20,6 @@
 package org.apache.directory.server.core.entry;
 
 
-import javax.naming.InvalidNameException;
 
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -31,11 +30,8 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ServerSearchResult // extends SearchResult
+public class ServerSearchResult
 {
-    /** Unique serial UID */
-    public static final long serialVersionUID = 1L;
-
     /** Distinguished name for this result */
     private LdapDN dn;
     
@@ -49,7 +45,7 @@
     private Object object;
     
 
-    public ServerSearchResult( LdapDN dn, Object obj, ServerEntry serverEntry ) throws InvalidNameException
+    public ServerSearchResult( LdapDN dn, Object obj, ServerEntry serverEntry )
     {
         this.dn = dn;
         this.serverEntry = serverEntry;
@@ -57,7 +53,7 @@
     }
 
 
-    public ServerSearchResult( LdapDN dn, Object obj, ServerEntry serverEntry, boolean isRelative ) throws InvalidNameException
+    public ServerSearchResult( LdapDN dn, Object obj, ServerEntry serverEntry, boolean isRelative )
     {
         this.dn = dn;
         this.serverEntry = serverEntry;
@@ -66,7 +62,7 @@
     }
 
 
-    public ServerSearchResult( LdapDN dn, String className, Object obj, ServerEntry serverEntry ) throws InvalidNameException
+    public ServerSearchResult( LdapDN dn, String className, Object obj, ServerEntry serverEntry )
     {
         this.dn = dn;
         this.serverEntry = serverEntry;
@@ -74,7 +70,7 @@
     }
 
 
-    public ServerSearchResult( LdapDN dn, String className, Object obj, ServerEntry serverEntry, boolean isRelative ) throws InvalidNameException
+    public ServerSearchResult( LdapDN dn, String className, Object obj, ServerEntry serverEntry, boolean isRelative ) 
     {
         this.dn = dn;
         this.serverEntry = serverEntry;
@@ -96,46 +92,46 @@
      */
     public ServerEntry getServerEntry()
     {
-    	return serverEntry;
+        return serverEntry;
     }
 
 
-	public boolean isRelative() 
-	{
-		return isRelative;
-	}
+    public boolean isRelative() 
+    {
+        return isRelative;
+    }
 
 
-	public void setRelative( boolean isRelative ) 
-	{
-		this.isRelative = isRelative;
-	}
+    public void setRelative( boolean isRelative ) 
+    {
+        this.isRelative = isRelative;
+    }
 
 
-	public void setServerEntry( ServerEntry serverEntry ) 
-	{
-		this.serverEntry = serverEntry;
-	}
+    public void setServerEntry( ServerEntry serverEntry ) 
+    {
+        this.serverEntry = serverEntry;
+    }
 
 
-	public Object getObject() 
-	{
-		return object;
-	}
+    public Object getObject() 
+    {
+        return object;
+    }
 
 
-	public void setObject( Object object ) 
-	{
-		this.object = object;
-	}
-	
-	
-	/**
-	 * @see Object#toString()
-	 */
-	public String toString()
-	{
-		String name = (dn == null ? "null" : ( dn == LdapDN.EMPTY_LDAPDN ? "\"\"" : dn.getUpName() ) );
-		return "ServerSearchResult : " + name + "\n" + serverEntry;
-	}
+    public void setObject( Object object ) 
+    {
+        this.object = object;
+    }
+    
+    
+    /**
+     * @see Object#toString()
+     */
+    public String toString()
+    {
+        String name = (dn == null ? "null" : ( dn == LdapDN.EMPTY_LDAPDN ? "\"\"" : dn.getUpName() ) );
+        return "ServerSearchResult : " + name + "\n" + serverEntry;
+    }
 }

Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java Sat Jun  7 00:48:16 2008
@@ -19,6 +19,14 @@
 package org.apache.directory.server.core.entry;
 
 
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Comparator;
+
+import javax.naming.NamingException;
+
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
@@ -28,14 +36,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.naming.NamingException;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Comparator;
-
 
 /**
  * A server side schema aware wrapper around a String attribute value.
@@ -49,7 +49,7 @@
 public class ServerStringValue extends ClientStringValue
 {
     /** Used for serialization */
-    public static final long serialVersionUID = 2L;
+    private static final long serialVersionUID = 2L;
     
     /** logger for reporting errors that might not be handled properly upstream */
     private static final Logger LOG = LoggerFactory.getLogger( ServerStringValue.class );
@@ -513,6 +513,7 @@
      * @see Object#hashCode()
      * @throws IllegalStateException on failures to extract the comparator, or the
      * normalizers needed to perform the required comparisons based on the schema
+     * @return the instance's hash code 
      */
     public int hashCode()
     {

Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java Sat Jun  7 00:48:16 2008
@@ -49,7 +49,7 @@
      */
     static class AT extends AbstractAttributeType
     {
-        public static final long serialVersionUID = 0L;
+        private static final long serialVersionUID = 0L;
         AttributeType superior;
         Syntax syntax;
         MatchingRule equality;
@@ -126,7 +126,7 @@
      */
     static class MR extends AbstractMatchingRule
     {
-        public static final long serialVersionUID = 0L;
+        private static final long serialVersionUID = 0L;
         Syntax syntax;
         Comparator comparator;
         Normalizer normalizer;
@@ -177,7 +177,7 @@
      */
     static class S extends AbstractSyntax
     {
-        public static final long serialVersionUID = 0L;
+        private static final long serialVersionUID = 0L;
         SyntaxChecker checker;
 
         public S( String oid, boolean humanReadible )
@@ -266,7 +266,7 @@
         
         mr.normalizer = new Normalizer()
         {
-            public static final long serialVersionUID = 1L;
+            private static final long serialVersionUID = 1L;
 
             public Object normalize( Object value ) throws NamingException
             {
@@ -325,24 +325,6 @@
         };
         
         mr.normalizer = new DeepTrimToLowerNormalizer();
-        /*{
-            public static final long serialVersionUID = 1L;
-            
-            public Object normalize( Object value ) throws NamingException
-            {
-                if ( value == null )
-                {  
-                    return null;
-                }
-                
-                if ( value instanceof String )
-                {
-                    return ( ( String ) value ).toLowerCase();
-                }
-
-                throw new IllegalStateException( "expected string to normalize" );
-            }
-        };*/
         
         at.setEquality( mr );
         at.setSyntax( s );
@@ -390,7 +372,7 @@
         
         mr.normalizer = new Normalizer()
         {
-            public static final long serialVersionUID = 1L;
+            private static final long serialVersionUID = 1L;
             
             public Object normalize( Object value ) throws NamingException
             {

Modified: directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java Sat Jun  7 00:48:16 2008
@@ -56,6 +56,15 @@
 import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.util.StringTools;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -225,6 +234,7 @@
         assertNull( ((ServerStringValue)value).get() );
     }
     
+
     @Test public void testGetAttribute() throws Exception
     {
         AttributeType at = TestServerEntryUtils.getIA5StringAttributeType();
@@ -1166,7 +1176,7 @@
      * Test method put( Value... )
      */
     @Test
-    public void testPutValueArray() throws InvalidAttributeValueException, Exception
+    public void testPutValueArray() throws Exception
     {
         ServerAttribute attr1 = new DefaultServerAttribute( atCN );
         
@@ -1299,7 +1309,7 @@
      * Test method remove( Value... )
      */
     @Test
-    public void testRemoveValueArray() throws InvalidAttributeValueException, Exception
+    public void testRemoveValueArray() throws Exception
     {
         ServerAttribute attr1 = new DefaultServerAttribute( atCN );
 
@@ -1369,7 +1379,7 @@
      * Test method remove( byte... )
      */
     @Test
-    public void testRemoveByteArray() throws InvalidAttributeValueException, Exception
+    public void testRemoveByteArray() throws Exception
     {
         ServerAttribute attr1 = new DefaultServerAttribute( atPwd );
 
@@ -1399,7 +1409,7 @@
      * Test method remove( String... )
      */
     @Test
-    public void testRemoveStringArray() throws InvalidAttributeValueException, Exception
+    public void testRemoveStringArray() throws Exception
     {
         ServerAttribute attr1 = new DefaultServerAttribute( atCN );
 
@@ -1638,7 +1648,6 @@
     public void testGetAttributeType() throws Exception
     {
         ServerAttribute attr = new DefaultServerAttribute( atSN );
-        
         assertEquals( atSN, attr.getAttributeType() );
     }
 



Mime
View raw message