From commits-return-17364-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Tue Mar 04 16:35:59 2008 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 10908 invoked from network); 4 Mar 2008 16:35:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Mar 2008 16:35:59 -0000 Received: (qmail 3848 invoked by uid 500); 4 Mar 2008 16:35:55 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 3804 invoked by uid 500); 4 Mar 2008 16:35:55 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 3792 invoked by uid 99); 4 Mar 2008 16:35:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Mar 2008 08:35:55 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Mar 2008 16:35:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4EC211A983E; Tue, 4 Mar 2008 08:35:30 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r633535 [2/4] - in /directory: apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/ apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ apacheds/branches/bigbang/c... Date: Tue, 04 Mar 2008 16:35:19 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080304163530.4EC211A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java (original) +++ directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java Tue Mar 4 08:35:12 2008 @@ -44,6 +44,7 @@ import org.apache.directory.server.schema.registries.OidRegistry; import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.message.AttributesImpl; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.AttributeType; @@ -567,7 +568,7 @@ /** - * Test the put( AT, ServerValue... ) method + * Test the put( AT, Value... ) method */ @Test public void tesPutAtSVs() throws NamingException { @@ -576,7 +577,7 @@ // Adding a null value to an attribute AttributeType atCN = registries.getAttributeTypeRegistry().lookup( "cn" ); - entry.put( atCN, (ServerValue)null ); + entry.put( atCN, (Value)null ); assertEquals( 1, entry.size() ); assertEquals( "cn", entry.get( atCN ).getUpId() ); @@ -584,7 +585,7 @@ // Check that we can't use invalid arguments try { - entry.put( (AttributeType)null, (ServerValue)null ); + entry.put( (AttributeType)null, (Value)null ); fail(); } catch( IllegalArgumentException iae ) @@ -594,7 +595,7 @@ // Add a single value atCN = registries.getAttributeTypeRegistry().lookup( "cn" ); - ServerValue ssv = new ServerStringValue( atCN, "test" ); + Value ssv = new ServerStringValue( atCN, "test" ); entry.put( atCN, ssv ); assertEquals( 1, entry.size() ); @@ -917,7 +918,7 @@ // Test that we get an error when the ID or AT are null try { - entry.put( null, (AttributeType)null, (ServerValue)null ); + entry.put( null, (AttributeType)null, (Value)null ); fail(); } catch( IllegalArgumentException iae ) @@ -926,21 +927,21 @@ } // Test an empty AT - entry.put( "commonName", atCN, (ServerValue)null ); + entry.put( "commonName", atCN, (Value)null ); assertEquals( 1, entry.size() ); assertEquals( "commonName", entry.get( atCN ).getUpId() ); assertEquals( "cn", entry.get( atCN ).getType().getName() ); assertNull( entry.get( atCN ).get().get() ); // Check that we can use a null AttributeType - entry.put( "commonName", (AttributeType)null, (ServerValue)null ); + entry.put( "commonName", (AttributeType)null, (Value)null ); assertEquals( 1, entry.size() ); assertEquals( "commonName", entry.get( atCN ).getUpId() ); assertEquals( "cn", entry.get( atCN ).getType().getName() ); assertNull( entry.get( atCN ).get().get() ); // Test that we can use a null upId - entry.put( null, atCN, (ServerValue)null ); + entry.put( null, atCN, (Value)null ); assertEquals( 1, entry.size() ); assertEquals( "cn", entry.get( atCN ).getUpId() ); assertEquals( "cn", entry.get( atCN ).getType().getName() ); @@ -950,7 +951,7 @@ // with the AT try { - entry.put( "sn", atCN, (ServerValue)null ); + entry.put( "sn", atCN, (Value)null ); fail(); } catch( IllegalArgumentException iae ) @@ -959,9 +960,9 @@ } // Test that we can add some new attributes with values - ServerValue test1 = new ServerStringValue( atCN, "test1" ); - ServerValue test2 = new ServerStringValue( atCN, "test2" ); - ServerValue test3 = new ServerStringValue( atCN, "test3" ); + Value test1 = new ServerStringValue( atCN, "test1" ); + Value test2 = new ServerStringValue( atCN, "test2" ); + Value test3 = new ServerStringValue( atCN, "test3" ); ServerAttribute result = entry.put( "CN", atCN, test1, test2, test3 ); assertNotNull( result ); @@ -988,7 +989,7 @@ // Test that we get an error when the ID or AT are null try { - entry.put( (String)null, (ServerValue)null ); + entry.put( (String)null, (Value)null ); fail(); } catch( IllegalArgumentException iae ) @@ -997,16 +998,16 @@ } // Test an null valued AT - entry.put( "commonName", (ServerValue)null ); + entry.put( "commonName", (Value)null ); assertEquals( 1, entry.size() ); assertEquals( "commonName", entry.get( atCN ).getUpId() ); assertEquals( "cn", entry.get( atCN ).getType().getName() ); assertNull( entry.get( atCN ).get().get() ); // Test that we can add some new attributes with values - ServerValue test1 = new ServerStringValue( atCN, "test1" ); - ServerValue test2 = new ServerStringValue( atCN, "test2" ); - ServerValue test3 = new ServerStringValue( atCN, "test3" ); + Value test1 = new ServerStringValue( atCN, "test1" ); + Value test2 = new ServerStringValue( atCN, "test2" ); + Value test3 = new ServerStringValue( atCN, "test3" ); ServerAttribute result = entry.put( "CN", test1, test2, test3 ); assertNotNull( result ); @@ -1154,13 +1155,13 @@ byte[] b2 = StringTools.getBytesUtf8( "test2" ); byte[] b3 = StringTools.getBytesUtf8( "test3" ); - ServerValue test1 = new ServerStringValue( atCN, "test1" ); - ServerValue test2 = new ServerStringValue( atCN, "test2" ); - ServerValue test3 = new ServerStringValue( atCN, "test3" ); - - ServerValue testB1 = new ServerBinaryValue( atPassword, b1 ); - ServerValue testB2 = new ServerBinaryValue( atPassword, b2 ); - ServerValue testB3 = new ServerBinaryValue( atPassword, b3 ); + Value test1 = new ServerStringValue( atCN, "test1" ); + Value test2 = new ServerStringValue( atCN, "test2" ); + Value test3 = new ServerStringValue( atCN, "test3" ); + + Value testB1 = new ServerBinaryValue( atPassword, b1 ); + Value testB2 = new ServerBinaryValue( atPassword, b2 ); + Value testB3 = new ServerBinaryValue( atPassword, b3 ); // Test a simple addition in atCN entry.add( atCN, test1 ); @@ -1385,13 +1386,13 @@ byte[] b2 = StringTools.getBytesUtf8( "test2" ); byte[] b3 = StringTools.getBytesUtf8( "test3" ); - ServerValue test1 = new ServerStringValue( atCN, "test1" ); - ServerValue test2 = new ServerStringValue( atCN, "test2" ); - ServerValue test3 = new ServerStringValue( atCN, "test3" ); - - ServerValue testB1 = new ServerBinaryValue( atPassword, b1 ); - ServerValue testB2 = new ServerBinaryValue( atPassword, b2 ); - ServerValue testB3 = new ServerBinaryValue( atPassword, b3 ); + Value test1 = new ServerStringValue( atCN, "test1" ); + Value test2 = new ServerStringValue( atCN, "test2" ); + Value test3 = new ServerStringValue( atCN, "test3" ); + + Value testB1 = new ServerBinaryValue( atPassword, b1 ); + Value testB2 = new ServerBinaryValue( atPassword, b2 ); + Value testB3 = new ServerBinaryValue( atPassword, b3 ); // Test a simple addition in atCN entry.add( "cN", test1 ); @@ -1619,13 +1620,13 @@ byte[] b2 = StringTools.getBytesUtf8( "test2" ); byte[] b3 = StringTools.getBytesUtf8( "test3" ); - ServerValue test1 = new ServerStringValue( atCN, "test1" ); - ServerValue test2 = new ServerStringValue( atCN, "test2" ); - ServerValue test3 = new ServerStringValue( atCN, "test3" ); - - ServerValue testB1 = new ServerBinaryValue( atPassword, b1 ); - ServerValue testB2 = new ServerBinaryValue( atPassword, b2 ); - ServerValue testB3 = new ServerBinaryValue( atPassword, b3 ); + Value test1 = new ServerStringValue( atCN, "test1" ); + Value test2 = new ServerStringValue( atCN, "test2" ); + Value test3 = new ServerStringValue( atCN, "test3" ); + + Value testB1 = new ServerBinaryValue( atPassword, b1 ); + Value testB2 = new ServerBinaryValue( atPassword, b2 ); + Value testB3 = new ServerBinaryValue( atPassword, b3 ); // Test a simple addition in atCN entry.add( "cN", atCN, test1 ); @@ -1749,11 +1750,11 @@ byte[] b2 = StringTools.getBytesUtf8( "test2" ); byte[] b3 = StringTools.getBytesUtf8( "test3" ); - ServerValue test1 = new ServerStringValue( atCN, "test1" ); - ServerValue test2 = new ServerStringValue( atCN, "test2" ); + Value test1 = new ServerStringValue( atCN, "test1" ); + Value test2 = new ServerStringValue( atCN, "test2" ); - ServerValue testB1 = new ServerBinaryValue( atPassword, b1 ); - ServerValue testB2 = new ServerBinaryValue( atPassword, b2 ); + Value testB1 = new ServerBinaryValue( atPassword, b1 ); + Value testB2 = new ServerBinaryValue( atPassword, b2 ); // test a removal of an non existing attribute List removed = entry.remove( atCN ); Modified: directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java (original) +++ directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java Tue Mar 4 08:35:12 2008 @@ -184,12 +184,12 @@ ServerBinaryValue value = new ServerBinaryValue( at, new byte[]{0x01, (byte)0x82} ); - assertTrue( Arrays.equals( new byte[]{0x01, (byte)0x02}, value.getNormalizedReference() ) ); - assertTrue( Arrays.equals( new byte[]{0x01, (byte)0x02}, value.getNormalizedCopy() ) ); + assertTrue( Arrays.equals( new byte[]{0x01, (byte)0x02}, value.getNormalizedValueReference() ) ); + assertTrue( Arrays.equals( new byte[]{0x01, (byte)0x02}, value.getNormalizedValueCopy() ) ); value = new ServerBinaryValue( at, null ); - assertNull( value.getNormalizedReference() ); + assertNull( value.getNormalizedValueReference() ); } @@ -253,7 +253,7 @@ ServerBinaryValue sv = new ServerBinaryValue( at, v1 ); sv.normalize(); - byte[] normalized = sv.getNormalizedReference(); + byte[] normalized = sv.getNormalizedValueReference(); assertTrue( Arrays.equals( v1Norm, normalized ) ); assertTrue( Arrays.equals( v1, sv.getReference() ) ); @@ -287,7 +287,7 @@ ServerBinaryValue sv = new ServerBinaryValue( at, v1 ); sv.normalize(); - byte[] normalized = sv.getNormalizedReference(); + byte[] normalized = sv.getNormalizedValueReference(); assertTrue( Arrays.equals( v1Norm, normalized ) ); assertTrue( Arrays.equals( v1, sv.get() ) ); @@ -319,7 +319,7 @@ ServerBinaryValue sv = new ServerBinaryValue( at ); sv.normalize(); - byte[] normalized = sv.getNormalizedReference(); + byte[] normalized = sv.getNormalizedValueReference(); assertEquals( null, normalized ); assertEquals( null, sv.get() ); @@ -351,7 +351,7 @@ ServerBinaryValue sv = new ServerBinaryValue( at, StringTools.EMPTY_BYTES ); sv.normalize(); - byte[] normalized = sv.getNormalizedReference(); + byte[] normalized = sv.getNormalizedValueReference(); assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, normalized ) ); assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, sv.get() ) ); Modified: directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java (original) +++ directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java Tue Mar 4 08:35:12 2008 @@ -20,6 +20,7 @@ package org.apache.directory.server.core.entry; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.DeepTrimToLowerNormalizer; import org.apache.directory.shared.ldap.schema.NoOpNormalizer; @@ -40,6 +41,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashSet; +import java.util.List; import jdbm.helper.StringComparator; @@ -68,10 +70,8 @@ static private TestServerEntryUtils.S s; static private TestServerEntryUtils.AT at; static private TestServerEntryUtils.MR mr; - - - + /** * Initialize an AttributeType and the associated MatchingRule * and Syntax @@ -170,11 +170,11 @@ ServerStringValue value = new ServerStringValue( at, "TEST" ); - assertEquals( "test", value.getNormalized() ); + assertEquals( "test", value.getNormalizedValue() ); value = new ServerStringValue( at, null ); - assertNull( value.getNormalized() ); + assertNull( value.getNormalizedValue() ); } @@ -230,7 +230,7 @@ /** * Presumes an attribute which constrains it's values to some constant - * strings: LOW, MEDUIM, HIGH. Normalization does nothing. MatchingRules + * strings: LOW, MEDIUM, HIGH. Normalization does nothing. MatchingRules * are exact case matching. * * @throws Exception on errors @@ -342,7 +342,7 @@ assertTrue( "since v4.equals( v5 ) and v4 was added then this should be true", set.contains( v5 ) ); // check ordering based on the comparator - ArrayList> list = new ArrayList>(); + List> list = new ArrayList>(); list.add( v1 ); list.add( v3 ); list.add( v5 ); @@ -488,7 +488,7 @@ ServerStringValue sv = new ServerStringValue( at, " Test Test " ); sv.normalize(); - String normalized = sv.getNormalized(); + String normalized = sv.getNormalizedValue(); assertEquals( "test test", normalized ); assertEquals( " Test Test ", sv.get() ); @@ -519,7 +519,7 @@ ServerStringValue sv = new ServerStringValue( at, "test" ); sv.normalize(); - String normalized = sv.getNormalized(); + String normalized = sv.getNormalizedValue(); assertEquals( "test", normalized ); assertEquals( "test", sv.get() ); @@ -551,7 +551,7 @@ ServerStringValue sv = new ServerStringValue( at ); sv.normalize(); - String normalized = sv.getNormalized(); + String normalized = sv.getNormalizedValue(); assertEquals( null, normalized ); assertEquals( null, sv.get() ); @@ -583,7 +583,7 @@ ServerStringValue sv = new ServerStringValue( at, "" ); sv.normalize(); - String normalized = sv.getNormalized(); + String normalized = sv.getNormalizedValue(); assertEquals( "", normalized ); assertEquals( "", sv.get() ); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Tue Mar 4 08:35:12 2008 @@ -51,13 +51,13 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerStringValue; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.event.EventInterceptor; import org.apache.directory.server.core.trigger.TriggerInterceptor; import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.shared.ldap.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.constants.LdapSecurityConstants; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapAuthenticationException; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.util.ArrayUtils; @@ -603,7 +603,7 @@ throw e; } - ServerValue userPassword; + Value userPassword; ServerAttribute userPasswordAttr = userEntry.get( SchemaConstants.USER_PASSWORD_AT ); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Tue Mar 4 08:35:12 2008 @@ -28,7 +28,6 @@ import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerEntryUtils; import org.apache.directory.server.core.entry.ServerSearchResult; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.enumeration.SearchResultFilter; import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration; import org.apache.directory.server.core.interceptor.BaseInterceptor; @@ -62,6 +61,7 @@ import org.apache.directory.shared.ldap.aci.MicroOperation; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapNamingException; import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; @@ -223,7 +223,7 @@ enabled = directoryService.isAccessControlEnabled(); // stuff for dealing with subentries (garbage for now) - ServerValue subschemaSubentry = + Value subschemaSubentry = directoryService.getPartitionNexus().getRootDSE( null ). get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); LdapDN subschemaSubentryDnName = new LdapDN( (String)(subschemaSubentry.get()) ); @@ -297,7 +297,7 @@ return; } - for ( ServerValue value:subentries ) + for ( Value value:subentries ) { String subentryDn = ( String ) value.get(); tuples.addAll( tupleCache.getACITuples( subentryDn ) ); @@ -322,7 +322,7 @@ return; } - for ( ServerValue value:entryAci ) + for ( Value value:entryAci ) { String aciString = ( String ) value.get(); ACIItem item; @@ -382,7 +382,7 @@ return; } - for ( ServerValue value:subentryAci ) + for ( Value value:subentryAci ) { String aciString = ( String ) value.get(); ACIItem item; @@ -478,7 +478,7 @@ // now we must check if attribute type and value scope permission is granted for ( ServerAttribute attribute:serverEntry ) { - for ( ServerValue value:attribute ) + for ( Value value:attribute ) { engine.checkPermission( registries, proxy, userGroups, principalDn, principal.getAuthenticationLevel(), name, attribute .getUpId(), value.get(), ADD_PERMS, tuples, serverEntry, null ); @@ -650,7 +650,7 @@ */ entryView = ServerEntryUtils.getTargetEntry( mod, entryView, registries ); - for ( ServerValue value:attr ) + for ( Value value:attr ) { engine.checkPermission( registries, proxy, userGroups, principalDn, principal.getAuthenticationLevel(), name, attr.getId(), value, perms, tuples, entry, entryView ); @@ -739,7 +739,7 @@ for ( ServerAttribute attribute:entry ) { - for ( ServerValue value:attribute ) + for ( Value value:attribute ) { engine.checkPermission( registries, @@ -1196,10 +1196,10 @@ continue; } - List> valueToRemove = new ArrayList>(); + List> valueToRemove = new ArrayList>(); // attribute type scope is ok now let's determine value level scope - for ( ServerValue value:attr ) + for ( Value value:attr ) { if ( !engine.hasPermission( registries, @@ -1219,7 +1219,7 @@ } } - for ( ServerValue value:valueToRemove ) + for ( Value value:valueToRemove ) { attr.remove( value ); } Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Tue Mar 4 08:35:12 2008 @@ -25,7 +25,6 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerSearchResult; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.enumeration.SearchResultFilter; import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration; import org.apache.directory.server.core.interceptor.BaseInterceptor; @@ -46,6 +45,7 @@ import org.apache.directory.server.schema.registries.AttributeTypeRegistry; import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.AttributeType; @@ -156,7 +156,7 @@ ServerAttribute uniqueMember = adminGroup.get( uniqueMemberAT ); - for ( ServerValue value:uniqueMember ) + for ( Value value:uniqueMember ) { LdapDN memberDn = new LdapDN( ( String ) value.get() ); memberDn.normalize( normalizerMapping ); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Tue Mar 4 08:35:12 2008 @@ -31,7 +31,6 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerSearchResult; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.server.schema.registries.AttributeTypeRegistry; @@ -39,6 +38,7 @@ import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.filter.BranchNode; import org.apache.directory.shared.ldap.filter.EqualityNode; import org.apache.directory.shared.ldap.filter.OrNode; @@ -223,7 +223,7 @@ */ private void addMembers( Set memberSet, ServerAttribute members ) throws NamingException { - for ( ServerValue value:members ) + for ( Value value:members ) { // get and normalize the DN of the member @@ -252,7 +252,7 @@ */ private void removeMembers( Set memberSet, ServerAttribute members ) throws NamingException { - for ( ServerValue value:members ) + for ( Value value:members ) { // get and normalize the DN of the member String memberDn = (String)value.get(); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Tue Mar 4 08:35:12 2008 @@ -23,7 +23,6 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerSearchResult; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.server.schema.ConcreteNameComponentNormalizer; @@ -35,6 +34,7 @@ import org.apache.directory.shared.ldap.aci.ACITuple; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; import org.apache.directory.shared.ldap.filter.EqualityNode; import org.apache.directory.shared.ldap.filter.ExprNode; @@ -194,7 +194,7 @@ List entryTuples = new ArrayList(); - for ( ServerValue value:aciAttr ) + for ( Value value:aciAttr ) { String aci = (String)value.get(); ACIItem item = null; Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java Tue Mar 4 08:35:12 2008 @@ -21,7 +21,6 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntryUtils; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.interceptor.BaseInterceptor; import org.apache.directory.server.core.interceptor.NextInterceptor; import org.apache.directory.server.core.interceptor.context.AddOperationContext; @@ -34,6 +33,7 @@ import org.apache.directory.server.core.jndi.ServerContext; import org.apache.directory.server.schema.registries.AttributeTypeRegistry; import org.apache.directory.shared.ldap.entry.Modification; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.ldif.ChangeType; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.apache.directory.shared.ldap.ldif.LdifUtils; @@ -453,7 +453,7 @@ if ( isBinary ) { - for ( ServerValue value:attr ) + for ( Value value:attr ) { buf.append( "\n" ); buf.append( id ); @@ -482,7 +482,7 @@ } else { - for ( ServerValue value:attr ) + for ( Value value:attr ) { buf.append( "\n" ); buf.append( id ); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Tue Mar 4 08:35:12 2008 @@ -25,7 +25,6 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerSearchResult; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.enumeration.SearchResultFilter; import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration; import org.apache.directory.server.core.interceptor.BaseInterceptor; @@ -41,6 +40,7 @@ import org.apache.directory.server.schema.registries.AttributeTypeRegistry; import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.AttributeType; @@ -168,7 +168,7 @@ exclusions = new HashSet(); - for ( ServerValue value:collectiveExclusions ) + for ( Value value:collectiveExclusions ) { AttributeType attrType = atRegistry.lookup( ( String ) value.get() ); exclusions.add( attrType.getOid() ); @@ -208,7 +208,7 @@ * attributes of the subentry and copy collective attributes from the * subentry into the entry. */ - for ( ServerValue value:caSubentries ) + for ( Value value:caSubentries ) { String subentryDnStr = ( String ) value.get(); LdapDN subentryDn = new LdapDN( subentryDnStr ); @@ -276,7 +276,7 @@ * Add all the collective attribute values in the subentry * to the currently processed collective attribute in the entry. */ - for ( ServerValue subentryColVal:subentryColAttr ) + for ( Value subentryColVal:subentryColAttr ) { entryColAttr.add( (String)subentryColVal.get() ); } Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java Tue Mar 4 08:35:12 2008 @@ -31,7 +31,6 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerSearchResult; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.server.core.referral.ReferralLut; @@ -39,6 +38,7 @@ import org.apache.directory.shared.ldap.codec.util.LdapURL; import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.OidNormalizer; @@ -200,7 +200,7 @@ List list = new ArrayList( refs.size() ); - for ( ServerValue value:refs ) + for ( Value value:refs ) { String val = (String)value.get(); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Tue Mar 4 08:35:12 2008 @@ -26,10 +26,10 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.schema.registries.AttributeTypeRegistry; import org.apache.directory.server.schema.registries.OidRegistry; import org.apache.directory.shared.ldap.NotImplementedException; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.filter.ApproximateNode; import org.apache.directory.shared.ldap.filter.EqualityNode; import org.apache.directory.shared.ldap.filter.ExprNode; @@ -182,7 +182,7 @@ */ if ( isGreaterOrLesser == COMPARE_GREATER ) { - for ( ServerValue value:attr ) + for ( Value value:attr ) { Object normValue = normalizer.normalize( value ); @@ -195,7 +195,7 @@ } else { - for ( ServerValue value:attr ) + for ( Value value:attr ) { Object normValue = normalizer.normalize( value ); @@ -290,7 +290,7 @@ * a lookup to work. For each value we normalize and use the comparator * to determine if a match exists. */ - for( ServerValue value:attr ) + for( Value value:attr ) { Object normValue = normalizer.normalize( value.get() ); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/event/SubstringEvaluator.java Tue Mar 4 08:35:12 2008 @@ -27,9 +27,9 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.schema.registries.AttributeTypeRegistry; import org.apache.directory.server.schema.registries.OidRegistry; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.SubstringNode; import org.apache.directory.shared.ldap.schema.AttributeType; @@ -111,7 +111,7 @@ * substring matching rule. */ - for ( ServerValue value: attr ) + for ( Value value: attr ) { String normValue = ( String ) normalizer.normalize( value ); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Tue Mar 4 08:35:12 2008 @@ -24,7 +24,6 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerSearchResult; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.interceptor.BaseInterceptor; import org.apache.directory.server.core.interceptor.NextInterceptor; import org.apache.directory.server.core.interceptor.context.AddOperationContext; @@ -47,6 +46,7 @@ import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException; import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException; import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException; @@ -125,7 +125,7 @@ { nexus = directoryService.getPartitionNexus(); normalizerMap = directoryService.getRegistries().getAttributeTypeRegistry().getNormalizerMapping(); - ServerValue attr = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); + Value attr = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); subschemSubentryDn = new LdapDN( ( String ) attr.get() ); subschemSubentryDn.normalize( normalizerMap ); registries = directoryService.getRegistries(); @@ -329,7 +329,7 @@ if ( entryAttr != null ) { - for ( ServerValue value:modAttr ) + for ( Value value:modAttr ) { if ( entryAttr.contains( value ) ) { Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Tue Mar 4 08:35:12 2008 @@ -33,7 +33,6 @@ import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerModification; import org.apache.directory.server.core.entry.ServerSearchResult; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.enumeration.SearchResultFilter; import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration; import org.apache.directory.server.core.interceptor.BaseInterceptor; @@ -54,6 +53,7 @@ import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.name.AttributeTypeAndValue; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.name.Rdn; @@ -138,7 +138,7 @@ atRegistry = registries.getAttributeTypeRegistry(); // stuff for dealing with subentries (garbage for now) - ServerValue subschemaSubentry = service.getPartitionNexus() + Value subschemaSubentry = service.getPartitionNexus() .getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); subschemaSubentryDn = new LdapDN( (String)subschemaSubentry.get() ); subschemaSubentryDn.normalize( directoryService.getRegistries().getAttributeTypeRegistry().getNormalizerMapping() ); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Tue Mar 4 08:35:12 2008 @@ -28,7 +28,6 @@ import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerEntryUtils; import org.apache.directory.server.core.entry.ServerSearchResult; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext; import org.apache.directory.server.core.interceptor.context.AddOperationContext; import org.apache.directory.server.core.interceptor.context.BindOperationContext; @@ -61,6 +60,7 @@ import org.apache.directory.shared.ldap.NotImplementedException; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.constants.SupportedSASLMechanisms; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException; import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException; import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException; @@ -613,7 +613,7 @@ Normalizer normalizer = attrType.getEquality().getNormalizer(); Object reqVal = normalizer.normalize( compareContext.getValue() ); - for ( ServerValue value:attr ) + for ( Value value:attr ) { Object attrValObj = normalizer.normalize( value.get() ); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Tue Mar 4 08:35:12 2008 @@ -35,7 +35,6 @@ import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerSearchResult; import org.apache.directory.server.core.entry.ServerStringValue; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.enumeration.ReferralHandlingEnumeration; import org.apache.directory.server.core.enumeration.SearchResultFilter; import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration; @@ -72,6 +71,7 @@ import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapNamingException; import org.apache.directory.shared.ldap.exception.LdapReferralException; import org.apache.directory.shared.ldap.filter.EqualityNode; @@ -171,7 +171,7 @@ throw new NamingException( message ); } - for ( ServerValue value:refAttr ) + for ( Value value:refAttr ) { ServerStringValue ref = (ServerStringValue)value; @@ -272,7 +272,7 @@ // handle referral here List list = new ArrayList( refs.size() ); - for ( ServerValue value:refs ) + for ( Value value:refs ) { String val = (String)value.get(); @@ -1040,7 +1040,7 @@ // handle referral here List list = new ArrayList( refs.size() ); - for ( ServerValue value:refs ) + for ( Value value:refs ) { String val = ( String ) value.get(); @@ -1107,7 +1107,7 @@ // handle referral here List list = new ArrayList( refs.size() ); - for ( ServerValue value:refs ) + for ( Value value:refs ) { String val = ( String ) value.get(); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AttributeClassLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AttributeClassLoader.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AttributeClassLoader.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AttributeClassLoader.java Tue Mar 4 08:35:12 2008 @@ -27,7 +27,7 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerBinaryValue; -import org.apache.directory.server.core.entry.ServerValue; +import org.apache.directory.shared.ldap.entry.Value; /** @@ -62,7 +62,7 @@ { byte[] classBytes = null; - ServerValue value = attribute.get(); + Value value = attribute.get(); if ( value instanceof ServerBinaryValue ) { Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java Tue Mar 4 08:35:12 2008 @@ -27,9 +27,9 @@ import org.apache.directory.server.constants.MetaSchemaConstants; import org.apache.directory.server.core.entry.ServerAttribute; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException; import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; @@ -144,7 +144,7 @@ int pos = 0; - for ( ServerValue value:attr ) + for ( Value value:attr ) { try { @@ -176,7 +176,7 @@ int pos = 0; - for ( ServerValue value:attr ) + for ( Value value:attr ) { try { @@ -207,7 +207,7 @@ int pos = 0; - for ( ServerValue value:attr ) + for ( Value value:attr ) { try { @@ -246,7 +246,7 @@ int pos = 0; - for ( ServerValue value:attr ) + for ( Value value:attr ) { AttributeTypeDescription desc = null; @@ -381,7 +381,7 @@ int pos = 0; - for ( ServerValue value:attr ) + for ( Value value:attr ) { ObjectClassDescription desc = null; @@ -482,7 +482,7 @@ int pos = 0; - for ( ServerValue value:attr ) + for ( Value value:attr ) { MatchingRuleUseDescription desc = null; @@ -529,7 +529,7 @@ int pos = 0; - for ( ServerValue value:attr ) + for ( Value value:attr ) { LdapSyntaxDescription desc = null; @@ -583,7 +583,7 @@ int pos = 0; - for ( ServerValue value:attr ) + for ( Value value:attr ) { MatchingRuleDescription desc = null; @@ -636,7 +636,7 @@ int pos = 0; - for ( ServerValue value:attr ) + for ( Value value:attr ) { DITStructureRuleDescription desc = null; @@ -685,7 +685,7 @@ int pos = 0; - for ( ServerValue value:attr ) + for ( Value value:attr ) { DITContentRuleDescription desc = null; @@ -736,7 +736,7 @@ int pos = 0; - for ( ServerValue value:attr ) + for ( Value value:attr ) { NameFormDescription desc = null; Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java Tue Mar 4 08:35:12 2008 @@ -24,13 +24,13 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerEntryUtils; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.schema.bootstrap.Schema; import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.server.schema.registries.SchemaObjectRegistry; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapInvalidNameException; import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; @@ -499,7 +499,7 @@ // check to make sure all the dependencies are also enabled Map loaded = globalRegistries.getLoadedSchemas(); - for ( ServerValue value:dependencies ) + for ( Value value:dependencies ) { String dependency = ( String ) value.get(); @@ -515,7 +515,7 @@ { Set allSchemas = loader.getSchemaNames(); - for ( ServerValue value:dependencies ) + for ( Value value:dependencies ) { String dependency = ( String ) value.get(); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Tue Mar 4 08:35:12 2008 @@ -40,7 +40,6 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerSearchResult; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.interceptor.context.EntryOperationContext; import org.apache.directory.server.core.interceptor.context.ListOperationContext; import org.apache.directory.server.core.interceptor.context.LookupOperationContext; @@ -51,6 +50,7 @@ import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.server.schema.registries.SchemaLoader; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.Normalizer; @@ -206,7 +206,7 @@ ServerAttribute names = entry.get( mNameAT ); targetRegistries.getOidRegistry().register( oid, oid ); - for ( ServerValue value:names ) + for ( Value value:names ) { targetRegistries.getOidRegistry().register( ( String ) value.get(), oid ); } Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java Tue Mar 4 08:35:12 2008 @@ -22,11 +22,11 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.schema.registries.ObjectClassRegistry; import org.apache.directory.server.schema.registries.OidRegistry; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.ModificationOperation; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.LdapDN; @@ -104,7 +104,7 @@ } // check that there is at least one structural objectClass in the replacement set - for ( ServerValue value:attribute ) + for ( Value value:attribute ) { ObjectClass ocType = registry.lookup( ( String ) value.get() ); @@ -214,10 +214,10 @@ // check if there is any attribute value as "". // if there is remove it so that it will be considered as not even provided. - List> removed = new ArrayList>(); + List> removed = new ArrayList>(); // Fist gather the value to remove - for ( ServerValue value:attribute ) + for ( Value value:attribute ) { if ( ((String)value.get()).length() == 0 ) { @@ -226,7 +226,7 @@ } // Now remove the values from the attribute - for ( ServerValue value:removed ) + for ( Value value:removed ) { attribute.remove( value ); } @@ -251,13 +251,13 @@ ServerAttribute cloned = ( ServerAttribute ) entryObjectClasses.clone(); - for ( ServerValue value:attribute ) + for ( Value value:attribute ) { cloned.remove( value ); } // check resultant set of objectClass values for a structural objectClass - for ( ServerValue objectClass:cloned ) + for ( Value objectClass:cloned ) { ObjectClass oc = registry.lookup( (String)objectClass.get() ); @@ -568,7 +568,7 @@ // are used by the Rdn attribute value pair for the name of the entry String rdnValue = getRdnValue( id, name, oidRegistry ); - for ( ServerValue value:attribute ) + for ( Value value:attribute ) { if ( rdnValue.equals( (String)value.get() ) ) { @@ -642,7 +642,7 @@ String rdnValue = getRdnValue( id, name, oidRegistry ); ServerAttribute rdnAttr = entry.get( id ); - for ( ServerValue value:rdnAttr ) + for ( Value value:rdnAttr ) { if ( rdnValue.equals( (String)value.get() ) ) { Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java Tue Mar 4 08:35:12 2008 @@ -33,10 +33,10 @@ import org.apache.directory.server.core.entry.DefaultServerAttribute; import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.schema.bootstrap.Schema; import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapNamingException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.schema.AttributeType; @@ -126,7 +126,7 @@ Set depsSet = new HashSet(); ServerAttribute depsAttr = entry.get( MetaSchemaConstants.M_DEPENDENCIES_AT ); - for ( ServerValue value:depsAttr ) + for ( Value value:depsAttr ) { depsSet.add( (String)value.get() ); } @@ -589,7 +589,7 @@ int pos = 0; - for ( ServerValue value:attr ) + for ( Value value:attr ) { strings[pos++] = (String)value.get(); } @@ -713,7 +713,7 @@ { List values = new ArrayList(); - for ( ServerValue name:names ) + for ( Value name:names ) { values.add( (String)name.get() ); } Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Tue Mar 4 08:35:12 2008 @@ -30,7 +30,6 @@ import org.apache.directory.server.core.entry.ServerEntryUtils; import org.apache.directory.server.core.entry.ServerSearchResult; import org.apache.directory.server.core.entry.ServerStringValue; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.enumeration.SearchResultFilter; import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration; import org.apache.directory.server.core.interceptor.BaseInterceptor; @@ -54,6 +53,7 @@ import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException; import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException; import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException; @@ -209,7 +209,7 @@ schemaManager = directoryService.getSchemaService().getSchemaControl(); // stuff for dealing with subentries (garbage for now) - ServerValue subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); + Value subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); LdapDN subschemaSubentryDn = new LdapDN( (String)(subschemaSubentry.get()) ); subschemaSubentryDn.normalize( atRegistry.getNormalizerMapping() ); subschemaSubentryDnNorm = subschemaSubentryDn.getNormName(); @@ -822,7 +822,7 @@ String attrOid = oidRegistry.getOid( attrId ); - for ( ServerValue objectClass:objectClasses ) + for ( Value objectClass:objectClasses ) { ObjectClass ocSpec = registry.lookup( ( String ) objectClass.get() ); @@ -862,7 +862,7 @@ // if nothing is left. ServerAttribute changedEntryAttr = ( ServerAttribute ) entry.get( change.getUpId() ).clone(); - for ( ServerValue value:change ) + for ( Value value:change ) { changedEntryAttr.remove( value ); } @@ -904,7 +904,7 @@ switch ( modOp ) { case ADD_ATTRIBUTE : - for ( ServerValue value:changes ) + for ( Value value:changes ) { existing.add( value ); } @@ -915,7 +915,7 @@ return ( ServerAttribute ) changes.clone(); case REMOVE_ATTRIBUTE : - for ( ServerValue value:changes ) + for ( Value value:changes ) { existing.remove( value ); } @@ -937,7 +937,7 @@ // but including all the inherited ObjectClasses boolean hasExtensibleObject = false; - for ( ServerValue objectClass:objectClasses ) + for ( Value objectClass:objectClasses ) { String objectClassName = (String)objectClass.get(); @@ -973,7 +973,7 @@ Set must = new HashSet(); // Loop on all objectclasses - for ( ServerValue value:objectClasses ) + for ( Value value:objectClasses ) { String ocName = (String)value.get(); ObjectClass oc = registries.getObjectClassRegistry().lookup( ocName ); @@ -1001,7 +1001,7 @@ allowed.add( registries.getOidRegistry().getOid( SchemaConstants.OBJECT_CLASS_AT ) ); // Loop on all objectclasses - for ( ServerValue objectClass:objectClasses ) + for ( Value objectClass:objectClasses ) { String ocName = (String)objectClass.get(); ObjectClass oc = registries.getObjectClassRegistry().lookup( ocName ); @@ -1042,7 +1042,7 @@ objectClassesUP.add( SchemaConstants.TOP_OC ); // Construct the new list of ObjectClasses - for ( ServerValue ocValue:objectClassAttr ) + for ( Value ocValue:objectClassAttr ) { String ocName = (String)ocValue.get(); @@ -1202,7 +1202,7 @@ keybuf.append( mod.getOperation() ); keybuf.append( mod.getAttribute().getId() ); - for ( ServerValue value:(ServerAttribute)mod.getAttribute() ) + for ( Value value:(ServerAttribute)mod.getAttribute() ) { keybuf.append( value.get() ); } @@ -1279,7 +1279,7 @@ if ( attr != null ) { - for ( ServerValue value:change ) + for ( Value value:change ) { attr.add( value ); } @@ -1288,7 +1288,7 @@ { attr = new DefaultServerAttribute( change.getUpId(), attributeType ); - for ( ServerValue value:change ) + for ( Value value:change ) { attr.add( value ); } @@ -1330,7 +1330,7 @@ ServerAttribute modified = tmpEntry.remove( change.getUpId() ).get(0); // And inject back the values except the ones to remove - for ( ServerValue value:change ) + for ( Value value:change ) { modified.remove( value ); } @@ -1372,7 +1372,7 @@ if ( change.size() != 0 ) { - for ( ServerValue value:change ) + for ( Value value:change ) { attr.add( value ); } @@ -1405,7 +1405,7 @@ ocMods.remove( SchemaConstants.TOP_OC ); } - for ( ServerValue value:alteredObjectClass ) + for ( Value value:alteredObjectClass ) { if ( !objectClass.contains( value ) ) { @@ -1416,7 +1416,7 @@ break; case REMOVE_ATTRIBUTE : - for ( ServerValue value:alteredObjectClass ) + for ( Value value:alteredObjectClass ) { if ( !objectClass.contains( value ) ) { @@ -1427,7 +1427,7 @@ break; case REPLACE_ATTRIBUTE : - for ( ServerValue value:alteredObjectClass ) + for ( Value value:alteredObjectClass ) { if ( !objectClass.contains( value ) ) { @@ -1506,7 +1506,7 @@ { List binaries = new ArrayList(); - for ( ServerValue value:attribute ) + for ( Value value:attribute ) { Object attrValue = value.get(); @@ -1830,7 +1830,7 @@ } // Then loop on all values - for ( ServerValue value:attribute ) + for ( Value value:attribute ) { try { @@ -1859,7 +1859,7 @@ boolean isModified = false; // Loop on each values - for ( ServerValue value:attribute ) + for ( Value value:attribute ) { if ( value instanceof ServerStringValue ) { @@ -1900,7 +1900,7 @@ boolean isModified = false; // Loop on each values - for ( ServerValue value:attribute ) + for ( Value value:attribute ) { if ( value instanceof ServerBinaryValue ) { Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaOperationControl.java Tue Mar 4 08:35:12 2008 @@ -38,7 +38,6 @@ import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerModification; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.exception.ExceptionInterceptor; import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; import org.apache.directory.server.core.invocation.Invocation; @@ -54,6 +53,7 @@ import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapInvalidNameException; import org.apache.directory.shared.ldap.exception.LdapNamingException; import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException; @@ -290,7 +290,7 @@ { ServerAttribute oc = entry.get( objectClassAT ); - for ( ServerValue value:oc ) + for ( Value value:oc ) { String oid = registries.getOidRegistry().getOid( ( String ) value.get() ); @@ -339,7 +339,7 @@ { ServerAttribute oc = entry.get( objectClassAT ); - for ( ServerValue value:oc ) + for ( Value value:oc ) { String oid = registries.getOidRegistry().getOid( ( String ) value.get() ); @@ -388,7 +388,7 @@ { ServerAttribute oc = entry.get( objectClassAT ); - for ( ServerValue value:oc ) + for ( Value value:oc ) { String oid = registries.getOidRegistry().getOid( ( String ) value.get() ); @@ -417,7 +417,7 @@ { ServerAttribute oc = entry.get( objectClassAT ); - for ( ServerValue value:oc ) + for ( Value value:oc ) { String oid = registries.getOidRegistry().getOid( ( String ) value.get() ); @@ -448,7 +448,7 @@ { ServerAttribute oc = entry.get( objectClassAT ); - for ( ServerValue value:oc ) + for ( Value value:oc ) { String oid = registries.getOidRegistry().getOid( ( String ) value.get() ); @@ -477,7 +477,7 @@ { ServerAttribute oc = entry.get( objectClassAT ); - for ( ServerValue value:oc ) + for ( Value value:oc ) { String oid = registries.getOidRegistry().getOid( ( String ) value.get() ); @@ -506,7 +506,7 @@ { ServerAttribute oc = entry.get( objectClassAT ); - for ( ServerValue value:oc ) + for ( Value value:oc ) { String oid = registries.getOidRegistry().getOid( ( String ) value.get() ); Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Tue Mar 4 08:35:12 2008 @@ -30,7 +30,6 @@ import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerModification; import org.apache.directory.server.core.entry.ServerSearchResult; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.enumeration.SearchResultFilter; import org.apache.directory.server.core.enumeration.SearchResultFilteringEnumeration; import org.apache.directory.server.core.interceptor.NextInterceptor; @@ -52,6 +51,7 @@ import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException; import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException; import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; @@ -986,7 +986,7 @@ switch ( mod.getOperation() ) { case ADD_ATTRIBUTE : - for ( ServerValue value:(ServerAttribute)mod.getAttribute() ) + for ( Value value:(ServerAttribute)mod.getAttribute() ) { ocFinalState.add( (String)value.get() ); } @@ -994,7 +994,7 @@ break; case REMOVE_ATTRIBUTE : - for ( ServerValue value:(ServerAttribute)mod.getAttribute() ) + for ( Value value:(ServerAttribute)mod.getAttribute() ) { ocFinalState.remove( (String)value.get() ); } @@ -1335,14 +1335,14 @@ ServerAttribute opAttrAdditions = operational.get( attributeType ); ServerAttribute opAttrInEntry = entry.get( attributeType ); - for ( ServerValue value:opAttrAdditions ) + for ( Value value:opAttrAdditions ) { result.add( value ); } if ( opAttrInEntry != null && opAttrInEntry.size() > 0 ) { - for ( ServerValue value:opAttrInEntry ) + for ( Value value:opAttrInEntry ) { result.add( value ); } Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Tue Mar 4 08:35:12 2008 @@ -24,7 +24,6 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.interceptor.BaseInterceptor; import org.apache.directory.server.core.interceptor.InterceptorChain; import org.apache.directory.server.core.interceptor.NextInterceptor; @@ -47,6 +46,7 @@ import org.apache.directory.server.schema.registries.AttributeTypeRegistry; import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.shared.ldap.constants.SchemaConstants; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapNamingException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.LdapDN; @@ -147,7 +147,7 @@ return; } - for ( ServerValue value:subentries ) + for ( Value value:subentries ) { String subentryDn = ( String ) value.get(); triggerSpecs.addAll( triggerSpecCache.getSubentryTriggerSpecs( subentryDn ) ); @@ -172,7 +172,7 @@ return; } - for ( ServerValue value:entryTrigger ) + for ( Value value:entryTrigger ) { String triggerString = ( String ) value.get(); TriggerSpecification item; Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original) +++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Tue Mar 4 08:35:12 2008 @@ -25,7 +25,6 @@ import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerSearchResult; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.interceptor.context.ModifyOperationContext; import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.partition.PartitionNexus; @@ -33,6 +32,7 @@ import org.apache.directory.server.schema.registries.Registries; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.filter.EqualityNode; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.message.AliasDerefMode; @@ -161,7 +161,7 @@ List subentryTriggerSpecs = new ArrayList(); - for ( ServerValue value:triggerSpec ) + for ( Value value:triggerSpec ) { TriggerSpecification item = null; Modified: directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=633535&r1=633534&r2=633535&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original) +++ directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Tue Mar 4 08:35:12 2008 @@ -57,7 +57,6 @@ import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerModification; import org.apache.directory.server.core.entry.ServerStringValue; -import org.apache.directory.server.core.entry.ServerValue; import org.apache.directory.server.core.event.EventInterceptor; import org.apache.directory.server.core.trigger.TriggerInterceptor; import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType; @@ -72,6 +71,7 @@ import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; +import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapAuthenticationException; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.util.StringTools; @@ -150,7 +150,7 @@ log.debug( "Adding Attribute id : 'userPassword', Values : [ {} ]", sb.toString() ); } - ServerValue principalNameValue = entry.get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ).get(); + Value principalNameValue = entry.get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ).get(); String principalName = (String)principalNameValue.get();