You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2008/03/31 18:20:08 UTC
svn commit: r643046 [5/8] - in /directory:
apacheds/branches/bigbang/benchmarks/
apacheds/branches/bigbang/core-constants/src/main/java/org/apache/directory/server/constants/
apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/serve...
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -48,7 +48,6 @@
import org.apache.directory.server.core.schema.SchemaInterceptor;
import org.apache.directory.server.core.subtree.SubentryInterceptor;
import org.apache.directory.server.core.collective.CollectiveAttributeInterceptor;
-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.event.EventInterceptor;
@@ -57,6 +56,7 @@
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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -605,7 +605,7 @@
Value<?> userPassword;
- ServerAttribute userPasswordAttr = userEntry.get( SchemaConstants.USER_PASSWORD_AT );
+ EntryAttribute userPasswordAttr = userEntry.get( SchemaConstants.USER_PASSWORD_AT );
// ---- assert that credentials match
if ( userPasswordAttr == null )
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -60,6 +60,7 @@
import org.apache.directory.shared.ldap.aci.ACITuple;
import org.apache.directory.shared.ldap.aci.MicroOperation;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapNamingException;
@@ -272,7 +273,7 @@
private void addPerscriptiveAciTuples( PartitionNexusProxy proxy, Collection<ACITuple> tuples, LdapDN dn,
ServerEntry entry ) throws NamingException
{
- ServerAttribute oc = entry.get( objectClassType );
+ EntryAttribute oc = entry.get( objectClassType );
/*
* If the protected entry is a subentry, then the entry being evaluated
@@ -290,7 +291,7 @@
entry = proxy.lookup( new LookupOperationContext( registries, parentDn), PartitionNexusProxy.LOOKUP_BYPASS );
}
- ServerAttribute subentries = entry.get( acSubentryType );
+ EntryAttribute subentries = entry.get( acSubentryType );
if ( subentries == null )
{
@@ -315,7 +316,7 @@
*/
private void addEntryAciTuples( Collection<ACITuple> tuples, ServerEntry entry ) throws NamingException
{
- ServerAttribute entryAci = entry.get( entryAciType );
+ EntryAttribute entryAci = entry.get( entryAciType );
if ( entryAci == null )
{
@@ -375,7 +376,7 @@
{ SchemaConstants.SUBENTRY_ACI_AT }) ,
PartitionNexusProxy.LOOKUP_BYPASS );
- ServerAttribute subentryAci = administrativeEntry.get( subentryAciType );
+ EntryAttribute subentryAci = administrativeEntry.get( subentryAciType );
if ( subentryAci == null )
{
@@ -456,7 +457,7 @@
SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() );
ServerEntry subentryAttrs = subentryInterceptor.getSubentryAttributes( name, serverEntry );
- for ( ServerAttribute attribute:serverEntry )
+ for ( EntryAttribute attribute:serverEntry )
{
subentryAttrs.put( attribute );
}
@@ -476,7 +477,7 @@
ADD_PERMS, tuples, subentryAttrs, null );
// now we must check if attribute type and value scope permission is granted
- for ( ServerAttribute attribute:serverEntry )
+ for ( EntryAttribute attribute:serverEntry )
{
for ( Value<?> value:attribute )
{
@@ -615,7 +616,7 @@
case REMOVE_ATTRIBUTE :
perms = REMOVE_PERMS;
- ServerAttribute entryAttr = entry.get( attr.getId() );
+ EntryAttribute entryAttr = entry.get( attr.getId() );
if ( entryAttr != null )
{
@@ -736,7 +737,7 @@
LOOKUP_PERMS, tuples, entry, null );
// check that we have read access to every attribute type and value
- for ( ServerAttribute attribute:entry )
+ for ( EntryAttribute attribute:entry )
{
for ( Value<?> value:attribute )
@@ -897,7 +898,7 @@
SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() );
ServerEntry subentryAttrs = subentryInterceptor.getSubentryAttributes( newName, importedEntry );
- for ( ServerAttribute attribute:importedEntry )
+ for ( EntryAttribute attribute:importedEntry )
{
subentryAttrs.put( attribute );
}
@@ -976,7 +977,7 @@
SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class.getName() );
ServerEntry subentryAttrs = subentryInterceptor.getSubentryAttributes( newName, importedEntry );
- for ( ServerAttribute attribute:importedEntry )
+ for ( EntryAttribute attribute:importedEntry )
{
subentryAttrs.put( attribute );
}
@@ -1175,7 +1176,7 @@
{
// if attribute type scope access is not allowed then remove the attribute and continue
String id = attributeType.getName();
- ServerAttribute attr = resultEntry.get( attributeType );
+ EntryAttribute attr = resultEntry.get( attributeType );
if ( !engine.hasPermission(
registries,
@@ -1232,7 +1233,7 @@
for ( AttributeType attributeType:attributeToRemove )
{
- resultEntry.remove( attributeType );
+ resultEntry.removeAttributes( attributeType );
}
result.setServerEntry( resultEntry );
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -22,7 +22,6 @@
import org.apache.directory.server.constants.ServerDNConstants;
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.ServerSearchResult;
import org.apache.directory.server.core.enumeration.SearchResultFilter;
@@ -45,6 +44,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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -154,7 +154,7 @@
return;
}
- ServerAttribute uniqueMember = adminGroup.get( uniqueMemberAT );
+ EntryAttribute uniqueMember = adminGroup.get( uniqueMemberAT );
for ( Value<?> value:uniqueMember )
{
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -36,6 +36,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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.Value;
@@ -144,7 +145,7 @@
{
ServerSearchResult result = results.next();
LdapDN groupDn = result.getDn().normalize( normalizerMap );
- ServerAttribute members = getMemberAttribute( result.getServerEntry() );
+ EntryAttribute members = getMemberAttribute( result.getServerEntry() );
if ( members != null )
{
@@ -175,20 +176,20 @@
* @param entry the entry inspected for member attributes
* @return the member attribute
*/
- private ServerAttribute getMemberAttribute( ServerEntry entry ) throws NamingException
+ private EntryAttribute getMemberAttribute( ServerEntry entry ) throws NamingException
{
- ServerAttribute oc = entry.get( SchemaConstants.OBJECT_CLASS_AT );
+ EntryAttribute oc = entry.get( SchemaConstants.OBJECT_CLASS_AT );
if ( oc == null )
{
- ServerAttribute member = entry.get( memberAT );
+ EntryAttribute member = entry.get( memberAT );
if ( member != null )
{
return member;
}
- ServerAttribute uniqueMember = entry.get( uniqueMemberAT );
+ EntryAttribute uniqueMember = entry.get( uniqueMemberAT );
if ( uniqueMember != null )
{
@@ -221,7 +222,7 @@
* @param members the member attribute values being added
* @throws NamingException if there are problems accessing the attr values
*/
- private void addMembers( Set<String> memberSet, ServerAttribute members ) throws NamingException
+ private void addMembers( Set<String> memberSet, EntryAttribute members ) throws NamingException
{
for ( Value<?> value:members )
{
@@ -250,7 +251,7 @@
* @param members the set of member values
* @throws NamingException if there are problems accessing the attr values
*/
- private void removeMembers( Set<String> memberSet, ServerAttribute members ) throws NamingException
+ private void removeMembers( Set<String> memberSet, EntryAttribute members ) throws NamingException
{
for ( Value<?> value:members )
{
@@ -281,7 +282,7 @@
*/
public void groupAdded( LdapDN name, ServerEntry entry ) throws NamingException
{
- ServerAttribute members = getMemberAttribute( entry );
+ EntryAttribute members = getMemberAttribute( entry );
if ( members == null )
{
@@ -308,7 +309,7 @@
*/
public void groupDeleted( LdapDN name, ServerEntry entry ) throws NamingException
{
- ServerAttribute members = getMemberAttribute( entry );
+ EntryAttribute members = getMemberAttribute( entry );
if ( members == null )
{
@@ -333,7 +334,7 @@
* @param members the members being added, removed or replaced
* @throws NamingException if there are problems accessing attribute values
*/
- private void modify( Set<String> memberSet, ModificationOperation modOp, ServerAttribute members ) throws NamingException
+ private void modify( Set<String> memberSet, ModificationOperation modOp, EntryAttribute members ) throws NamingException
{
switch ( modOp )
@@ -372,9 +373,9 @@
*/
public void groupModified( LdapDN name, List<Modification> mods, ServerEntry entry, Registries registries ) throws NamingException
{
- ServerAttribute members = null;
+ EntryAttribute members = null;
String memberAttrId = null;
- ServerAttribute oc = entry.get( SchemaConstants.OBJECT_CLASS_AT );
+ EntryAttribute oc = entry.get( SchemaConstants.OBJECT_CLASS_AT );
if ( oc.contains( SchemaConstants.GROUP_OF_NAMES_OC ) )
{
@@ -429,7 +430,7 @@
*/
public void groupModified( LdapDN name, ModificationOperation modOp, ServerEntry mods ) throws NamingException
{
- ServerAttribute members = getMemberAttribute( mods );
+ EntryAttribute members = getMemberAttribute( mods );
if ( members == null )
{
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -33,6 +33,7 @@
import org.apache.directory.shared.ldap.aci.ACIItemParser;
import org.apache.directory.shared.ldap.aci.ACITuple;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -140,7 +141,7 @@
ServerSearchResult result = results.next();
LdapDN subentryDn = result.getDn().normalize( normalizerMap );
ServerEntry serverEntry = result.getServerEntry();
- ServerAttribute aci = serverEntry.get( prescriptiveAciAT );
+ EntryAttribute aci = serverEntry.get( prescriptiveAciAT );
if ( aci == null )
{
@@ -160,7 +161,7 @@
private boolean hasPrescriptiveACI( ServerEntry entry ) throws NamingException
{
// only do something if the entry contains prescriptiveACI
- ServerAttribute aci = entry.get( prescriptiveAciAT );
+ EntryAttribute aci = entry.get( prescriptiveAciAT );
if ( aci == null )
{
@@ -185,7 +186,7 @@
public void subentryAdded( LdapDN normName, ServerEntry entry ) throws NamingException
{
// only do something if the entry contains prescriptiveACI
- ServerAttribute aciAttr = entry.get( prescriptiveAciAT );
+ EntryAttribute aciAttr = entry.get( prescriptiveAciAT );
if ( !hasPrescriptiveACI( entry ) )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java Mon Mar 31 09:19:45 2008
@@ -25,7 +25,6 @@
import javax.naming.NamingException;
-import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.server.schema.registries.Registries;
@@ -34,6 +33,7 @@
import org.apache.directory.shared.ldap.aci.ProtectedItem;
import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -111,7 +111,7 @@
MaxValueCountItem mvcItem = k.next();
if ( attrId.equalsIgnoreCase( mvcItem.getAttributeType() ) )
{
- ServerAttribute attr = entryView.get( attrId );
+ EntryAttribute attr = entryView.get( attrId );
int attrCount = attr == null ? 0 : attr.size();
if ( attrCount > mvcItem.getMaxCount() )
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Mon Mar 31 09:19:45 2008
@@ -26,7 +26,6 @@
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
-import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.event.Evaluator;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
@@ -41,6 +40,7 @@
import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -265,7 +265,7 @@
String svItem = j.next();
if ( oid.equals( oidRegistry.getOid( svItem ) ) )
{
- ServerAttribute attr = entry.get( oid );
+ EntryAttribute attr = entry.get( oid );
if ( ( attr != null ) &&
( ( attr.contains( userName.toNormName() ) ||
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java Mon Mar 31 09:19:45 2008
@@ -25,7 +25,6 @@
import javax.naming.NamingException;
-import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.server.schema.registries.Registries;
@@ -34,6 +33,7 @@
import org.apache.directory.shared.ldap.aci.ProtectedItem;
import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -108,7 +108,7 @@
// TODO Fix DIRSEVER-832
if ( attrId.equalsIgnoreCase( rbItem.getAttributeType() ) )
{
- ServerAttribute attr = entry.get( rbItem.getValuesIn() );
+ EntryAttribute attr = entry.get( rbItem.getValuesIn() );
// TODO Fix DIRSEVER-832
if ( ( attr == null ) || !attr.contains( attrValue ) )
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -22,7 +22,6 @@
import org.apache.directory.server.core.DirectoryService;
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.ServerSearchResult;
import org.apache.directory.server.core.enumeration.SearchResultFilter;
@@ -40,6 +39,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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -122,7 +122,7 @@
*/
private void addCollectiveAttributes( LdapDN normName, ServerEntry entry, String[] retAttrs ) throws NamingException
{
- ServerAttribute caSubentries;
+ EntryAttribute caSubentries;
//noinspection StringEquality
if ( ( retAttrs == null ) || ( retAttrs.length != 1 ) || ( retAttrs[0] != SchemaConstants.ALL_USER_ATTRIBUTES ) )
@@ -151,7 +151,7 @@
* OID values in the exclusions set instead of regular names that
* may have case variance.
*/
- ServerAttribute collectiveExclusions = entry.get( SchemaConstants.COLLECTIVE_EXCLUSIONS_AT );
+ EntryAttribute collectiveExclusions = entry.get( SchemaConstants.COLLECTIVE_EXCLUSIONS_AT );
Set<String> exclusions = new HashSet<String>();
if ( collectiveExclusions != null )
@@ -260,8 +260,8 @@
continue;
}
- ServerAttribute subentryColAttr = subentry.get( attrId );
- ServerAttribute entryColAttr = entry.get( attrId );
+ EntryAttribute subentryColAttr = subentry.get( attrId );
+ EntryAttribute entryColAttr = entry.get( attrId );
/*
* If entry does not have attribute for collective attribute then create it.
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java Mon Mar 31 09:19:45 2008
@@ -33,6 +33,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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -85,7 +86,7 @@
normName,
registries);
- ServerAttribute targetObjectClasses = targetEntry.get( SchemaConstants.OBJECT_CLASS_AT );
+ EntryAttribute targetObjectClasses = targetEntry.get( SchemaConstants.OBJECT_CLASS_AT );
if ( targetObjectClasses.contains( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRY_OC ) )
{
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -29,7 +29,6 @@
import javax.naming.NamingException;
import javax.naming.directory.SearchControls;
-import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerSearchResult;
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
@@ -38,6 +37,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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -183,7 +183,7 @@
public void doReferralExceptionOnSearchBase( Registries registries ) throws NamingException
{
// the refs attribute may be filtered out so we might need to lookup the entry
- ServerAttribute refs = prefetched.getServerEntry().get( SchemaConstants.REF_AT );
+ EntryAttribute refs = prefetched.getServerEntry().get( SchemaConstants.REF_AT );
if ( refs == null )
{
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -24,11 +24,11 @@
import javax.naming.NamingException;
-import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.filter.ApproximateNode;
import org.apache.directory.shared.ldap.filter.EqualityNode;
@@ -160,7 +160,7 @@
// get the attribute associated with the node
AttributeType type = attributeTypeRegistry.lookup( oidRegistry.getOid( attrId ) );
- ServerAttribute attr = entry.get( type );
+ EntryAttribute attr = entry.get( type );
// If we do not have the attribute just return false
if ( null == attr )
@@ -246,7 +246,7 @@
Comparator comparator = getComparator( node.getAttribute() );
// get the attribute associated with the node
- ServerAttribute attr = entry.get( node.getAttribute() );
+ EntryAttribute attr = entry.get( node.getAttribute() );
// If we do not have the attribute just return false
if ( null == attr )
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -25,10 +25,10 @@
import javax.naming.NamingException;
-import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.server.schema.registries.OidRegistry;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.SubstringNode;
@@ -84,7 +84,7 @@
// get the attribute
- ServerAttribute attr = entry.get( snode.getAttribute() );
+ EntryAttribute attr = entry.get( snode.getAttribute() );
// if the attribute does not exist just return false
if ( null == attr )
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -44,6 +44,7 @@
import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.Value;
@@ -188,7 +189,7 @@
throw e2;
}
- ServerAttribute objectClass = attrs.get( SchemaConstants.OBJECT_CLASS_AT );
+ EntryAttribute objectClass = attrs.get( SchemaConstants.OBJECT_CLASS_AT );
if ( objectClass.contains( SchemaConstants.ALIAS_OC ) )
{
@@ -324,8 +325,8 @@
{
if ( item.getOperation() == ModificationOperation.ADD_ATTRIBUTE )
{
- ServerAttribute modAttr = (ServerAttribute)item.getAttribute();
- ServerAttribute entryAttr = entry.get( modAttr.getId() );
+ EntryAttribute modAttr = (ServerAttribute)item.getAttribute();
+ EntryAttribute entryAttr = entry.get( modAttr.getId() );
if ( entryAttr != null )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Mon Mar 31 09:19:45 2008
@@ -24,7 +24,7 @@
import javax.naming.NamingException;
-import org.apache.directory.server.core.entry.ServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.entry.ServerModification;
import org.apache.directory.server.schema.registries.Registries;
@@ -108,7 +108,7 @@
{
List<Modification> items = new ArrayList<Modification>( serverEntry.size() );
- for ( ServerAttribute attribute:serverEntry )
+ for ( EntryAttribute attribute:serverEntry )
{
items.add( new ServerModification( modOp, attribute ) );
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Mon Mar 31 09:19:45 2008
@@ -24,7 +24,7 @@
import org.apache.directory.server.core.authn.AuthenticationInterceptor;
import org.apache.directory.server.core.authn.LdapPrincipal;
import org.apache.directory.server.core.entry.DefaultServerEntry;
-import org.apache.directory.server.core.entry.ServerAttribute;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.entry.ServerEntryUtils;
import org.apache.directory.server.core.entry.ServerSearchResult;
@@ -349,7 +349,7 @@
if ( ( serverEntry.get( SchemaConstants.OBJECT_CLASS_AT ) != null ) &&
(serverEntry.get( SchemaConstants.OBJECT_CLASS_AT ).size() == 0 ) )
{
- serverEntry.remove( SchemaConstants.OBJECT_CLASS_AT );
+ serverEntry.removeAttributes( SchemaConstants.OBJECT_CLASS_AT );
}
}
@@ -738,7 +738,7 @@
if ( ( outServerEntry != null ) && ( outServerEntry.size() > 0 ) )
{
- for ( ServerAttribute serverAttribute:outServerEntry )
+ for ( EntryAttribute serverAttribute:outServerEntry )
{
serverEntry.put( serverAttribute );
}
@@ -758,7 +758,7 @@
if ( ( outServerEntry != null ) && ( outServerEntry.size() > 0 ) )
{
- for ( ServerAttribute serverAttribute:outServerEntry )
+ for ( EntryAttribute serverAttribute:outServerEntry )
{
serverEntry.put( serverAttribute );
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Mon Mar 31 09:19:45 2008
@@ -22,12 +22,12 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.authn.LdapPrincipal;
-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.interceptor.context.EntryOperationContext;
import org.apache.directory.server.core.partition.PartitionNexusProxy;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.filter.AndNode;
import org.apache.directory.shared.ldap.filter.BranchNode;
@@ -289,7 +289,7 @@
if ( ( outServerEntry != null ) && ( outServerEntry.size() > 0 ) )
{
- for ( ServerAttribute attribute:outServerEntry )
+ for ( EntryAttribute attribute:outServerEntry )
{
clone.put( attribute );
}
@@ -318,7 +318,7 @@
if ( outServerEntry != null && outServerEntry.size() > 0 )
{
- for ( ServerAttribute attribute:outServerEntry )
+ for ( EntryAttribute attribute:outServerEntry )
{
clone.put( attribute );
}
@@ -335,7 +335,7 @@
if ( ( outServerEntry != null ) && ( outServerEntry.size() > 0 ) )
{
- for ( ServerAttribute attribute:outServerEntry )
+ for ( EntryAttribute attribute:outServerEntry )
{
entry.put( attribute );
}
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -51,6 +51,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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.Value;
@@ -349,7 +350,7 @@
// Now remove the attributes which are not USERs
for ( AttributeType attributeType:removedAttributes )
{
- attributes.remove( attributeType );
+ attributes.removeAttributes( attributeType );
}
return true;
@@ -376,7 +377,7 @@
{
if ( !ids.contains( attributeType.getOid() ) )
{
- entry.remove( attributeType );
+ entry.removeAttributes( attributeType );
}
}
}
@@ -393,7 +394,7 @@
{
if ( service.isDenormalizeOpAttrsEnabled() )
{
- ServerAttribute attr = entry.get( SchemaConstants.CREATORS_NAME_AT );
+ EntryAttribute attr = entry.get( SchemaConstants.CREATORS_NAME_AT );
if ( attr != null )
{
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -60,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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
@@ -374,7 +375,7 @@
if ( override != null )
{
ServerEntry systemEntry = override.getContextEntry();
- ServerAttribute objectClassAttr = systemEntry.get( SchemaConstants.OBJECT_CLASS_AT );
+ EntryAttribute objectClassAttr = systemEntry.get( SchemaConstants.OBJECT_CLASS_AT );
if ( objectClassAttr == null )
{
@@ -478,7 +479,7 @@
{
partitions.put( key, system );
partitionLookupTree.recursivelyAddPartition( partitionLookupTree, system.getSuffixDn(), 0, system );
- ServerAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
+ EntryAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
if ( namingContexts == null )
{
@@ -582,7 +583,7 @@
AttributeType attrType = registry.lookup( compareContext.getOid() );
- ServerAttribute attr = partition.lookup( new LookupOperationContext( registries, compareContext.getDn() ) ).get( attrType.getName() );
+ EntryAttribute attr = partition.lookup( new LookupOperationContext( registries, compareContext.getDn() ) ).get( attrType.getName() );
// complain if the attribute being compared does not exist in the entry
if ( attr == null )
@@ -674,7 +675,7 @@
partitions.put( partitionSuffix.toString(), partition );
partitionLookupTree.recursivelyAddPartition( partitionLookupTree, partition.getSuffixDn(), 0, partition );
- ServerAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
+ EntryAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
LdapDN partitionUpSuffix = partition.getUpSuffixDn();
@@ -707,7 +708,7 @@
throw new NameNotFoundException( "No partition with suffix: " + key );
}
- ServerAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
+ EntryAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
if ( namingContexts != null )
{
@@ -821,7 +822,7 @@
*/
private void unregister( Partition partition ) throws NamingException
{
- ServerAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
+ EntryAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
if ( namingContexts != null )
{
@@ -983,7 +984,7 @@
ServerEntry rootDSE = getRootDSE( new GetRootDSEOperationContext( registries ) );
- for ( ServerAttribute attribute:rootDSE )
+ for ( EntryAttribute attribute:rootDSE )
{
AttributeType type = atRegistry.lookup( attribute.getUpId() );
@@ -1030,7 +1031,7 @@
if ( opContext.getAttrsId().contains( oid ) )
{
- ServerAttribute attr = rootDSE.get( oid );
+ EntryAttribute attr = rootDSE.get( oid );
retval.put( (ServerAttribute)attr.clone() );
}
@@ -1042,7 +1043,7 @@
{
String id = attributeType.getName();
- ServerAttribute attr = rootDSE.get( id );
+ EntryAttribute attr = rootDSE.get( id );
retval.put( (ServerAttribute)attr.clone() );
}
}
@@ -1159,7 +1160,7 @@
public void registerSupportedExtensions( Set<String> extensionOids ) throws NamingException
{
- ServerAttribute supportedExtension = rootDSE.get( SchemaConstants.SUPPORTED_EXTENSION_AT );
+ EntryAttribute supportedExtension = rootDSE.get( SchemaConstants.SUPPORTED_EXTENSION_AT );
if ( supportedExtension == null )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/Partition.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/Partition.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/Partition.java Mon Mar 31 09:19:45 2008
@@ -245,7 +245,7 @@
* retrieval.
*
* @param opContext the context containing the distinguished/absolute name for the search/listing
- * @return a NamingEnumeration containing objects of type {@link ServerSearchResult}
+ * @return a NamingEnumeration containing objects of type {@link SearchResult}
* @throws NamingException if there are any problems
*/
NamingEnumeration<ServerSearchResult> list( ListOperationContext opContext ) throws NamingException;
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Mon Mar 31 09:19:45 2008
@@ -21,7 +21,6 @@
import org.apache.directory.server.core.entry.DefaultServerEntry;
-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.ServerSearchResult;
@@ -40,6 +39,7 @@
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.impl.btree.gui.PartitionViewer;
import org.apache.directory.server.schema.registries.Registries;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
import org.apache.directory.shared.ldap.message.AttributesImpl;
@@ -342,7 +342,7 @@
for ( String attrId:opContext.getAttrsId() )
{
- ServerAttribute attr = entry.get( attrId );
+ EntryAttribute attr = entry.get( attrId );
if ( attr != null )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java Mon Mar 31 09:19:45 2008
@@ -36,6 +36,7 @@
import org.apache.directory.server.core.enumeration.SearchResultEnumeration;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.UsageEnum;
@@ -219,7 +220,7 @@
break;
}
- ServerAttribute attr = attrs.get( registries.getAttributeTypeRegistry().lookup( attrId ) );
+ EntryAttribute attr = attrs.get( registries.getAttributeTypeRegistry().lookup( attrId ) );
// there is no attribute by that name in the entry so we continue
if ( null == attr )
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -70,6 +70,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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapNamingException;
@@ -147,7 +148,7 @@
static boolean isReferral( ServerEntry entry ) throws NamingException
{
- ServerAttribute oc = entry.get( SchemaConstants.OBJECT_CLASS_AT );
+ EntryAttribute oc = entry.get( SchemaConstants.OBJECT_CLASS_AT );
if ( oc == null )
{
@@ -161,7 +162,7 @@
// valid, accordingly to the RFC
// Get the 'ref' attributeType
- ServerAttribute refAttr = entry.get( SchemaConstants.REF_AT );
+ EntryAttribute refAttr = entry.get( SchemaConstants.REF_AT );
if ( refAttr == null )
{
@@ -267,7 +268,7 @@
}
- public void doReferralException( LdapDN farthest, LdapDN targetUpdn, ServerAttribute refs ) throws NamingException
+ public void doReferralException( LdapDN farthest, LdapDN targetUpdn, EntryAttribute refs ) throws NamingException
{
// handle referral here
List<String> list = new ArrayList<String>( refs.size() );
@@ -386,7 +387,7 @@
PartitionNexusProxy.LOOKUP_BYPASS );
AttributeType refsType = atRegistry.lookup( oidRegistry.getOid( SchemaConstants.REF_AT ) );
- ServerAttribute refs = referral.get( refsType );
+ EntryAttribute refs = referral.get( refsType );
doReferralException( farthest, new LdapDN( name.getUpName() ), refs );
}
else if ( refval.equals( FOLLOW ) )
@@ -428,7 +429,7 @@
new LookupOperationContext( registries, farthest ),
PartitionNexusProxy.LOOKUP_BYPASS );
- ServerAttribute refs = referral.get( SchemaConstants.REF_AT );
+ EntryAttribute refs = referral.get( SchemaConstants.REF_AT );
doReferralException( farthest, new LdapDN( name.getUpName() ), refs );
// we really can't get here since doReferralException will throw an exception
@@ -486,7 +487,7 @@
new LookupOperationContext( registries, farthest ),
PartitionNexusProxy.LOOKUP_BYPASS );
- ServerAttribute refs = referral.get( SchemaConstants.REF_AT );
+ EntryAttribute refs = referral.get( SchemaConstants.REF_AT );
doReferralException( farthest, new LdapDN( name.getUpName() ), refs );
}
@@ -562,7 +563,7 @@
new LookupOperationContext( registries, farthestSrc ),
PartitionNexusProxy.LOOKUP_BYPASS );
- ServerAttribute refs = referral.get( SchemaConstants.REF_AT );
+ EntryAttribute refs = referral.get( SchemaConstants.REF_AT );
doReferralException( farthestSrc, new LdapDN( oldName.getUpName() ), refs );
}
else if ( farthestDst != null )
@@ -636,7 +637,7 @@
new LookupOperationContext( registries, farthestSrc ),
PartitionNexusProxy.LOOKUP_BYPASS );
- ServerAttribute refs = referral.get( SchemaConstants.REF_AT );
+ EntryAttribute refs = referral.get( SchemaConstants.REF_AT );
doReferralException( farthestSrc, new LdapDN( oldName.getUpName() ), refs );
}
@@ -716,7 +717,7 @@
new LookupOperationContext( registries, farthestSrc ),
PartitionNexusProxy.LOOKUP_BYPASS );
- ServerAttribute refs = referral.get( SchemaConstants.REF_AT );
+ EntryAttribute refs = referral.get( SchemaConstants.REF_AT );
doReferralException( farthestSrc, new LdapDN( oldName.getUpName() ), refs );
}
@@ -848,7 +849,7 @@
new LookupOperationContext( registries, farthest ),
PartitionNexusProxy.LOOKUP_BYPASS );
- ServerAttribute refs = referral.get( SchemaConstants.REF_AT );
+ EntryAttribute refs = referral.get( SchemaConstants.REF_AT );
doReferralException( farthest, new LdapDN( name.getUpName() ), refs );
}
else if ( refval.equals( FOLLOW ) )
@@ -974,7 +975,7 @@
if ( lut.isReferral( base ) )
{
ServerEntry referral = invocation.getProxy().lookup( new LookupOperationContext( registries, base ), PartitionNexusProxy.LOOKUP_BYPASS );
- ServerAttribute refs = referral.get( SchemaConstants.REF_AT );
+ EntryAttribute refs = referral.get( SchemaConstants.REF_AT );
doReferralExceptionOnSearchBase( base, refs, controls.getSearchScope() );
}
@@ -986,7 +987,7 @@
}
ServerEntry referral = invocation.getProxy().lookup( new LookupOperationContext( registries, farthest ), PartitionNexusProxy.LOOKUP_BYPASS );
- ServerAttribute refs = referral.get( SchemaConstants.REF_AT );
+ EntryAttribute refs = referral.get( SchemaConstants.REF_AT );
doReferralExceptionOnSearchBase( farthest, new LdapDN( base.getUpName() ), refs, controls.getSearchScope() );
throw new IllegalStateException( "Should never get here: shutting up compiler" );
}
@@ -996,7 +997,7 @@
if ( lut.isReferral( base ) )
{
ServerEntry referral = invocation.getProxy().lookup( new LookupOperationContext( registries, base ), PartitionNexusProxy.LOOKUP_BYPASS );
- ServerAttribute refs = referral.get( SchemaConstants.REF_AT );
+ EntryAttribute refs = referral.get( SchemaConstants.REF_AT );
doReferralExceptionOnSearchBase( base, refs, controls.getSearchScope() );
}
@@ -1010,7 +1011,7 @@
}
ServerEntry referral = invocation.getProxy().lookup( new LookupOperationContext( registries, farthest ), PartitionNexusProxy.LOOKUP_BYPASS );
- ServerAttribute refs = referral.get( SchemaConstants.REF_AT );
+ EntryAttribute refs = referral.get( SchemaConstants.REF_AT );
doReferralExceptionOnSearchBase( farthest, new LdapDN( base.getUpName() ), refs, controls.getSearchScope() );
throw new IllegalStateException( "Should never get here: shutting up compiler" );
}
@@ -1035,7 +1036,7 @@
}
- public void doReferralExceptionOnSearchBase( LdapDN base, ServerAttribute refs, int scope ) throws NamingException
+ public void doReferralExceptionOnSearchBase( LdapDN base, EntryAttribute refs, int scope ) throws NamingException
{
// handle referral here
List<String> list = new ArrayList<String>( refs.size() );
@@ -1101,7 +1102,7 @@
}
- public void doReferralExceptionOnSearchBase( LdapDN farthest, LdapDN targetUpdn, ServerAttribute refs, int scope )
+ public void doReferralExceptionOnSearchBase( LdapDN farthest, LdapDN targetUpdn, EntryAttribute refs, int scope )
throws NamingException
{
// handle referral here
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java Mon Mar 31 09:19:45 2008
@@ -21,11 +21,11 @@
import org.apache.directory.server.constants.MetaSchemaConstants;
-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.schema.bootstrap.Schema;
import org.apache.directory.server.schema.registries.Registries;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.exception.LdapNamingException;
@@ -132,7 +132,7 @@
protected String getOid( ServerEntry entry ) throws NamingException
{
- ServerAttribute oid = entry.get( m_oidAT );
+ EntryAttribute oid = entry.get( m_oidAT );
if ( oid == null )
{
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -27,6 +27,7 @@
import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerBinaryValue;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
@@ -47,14 +48,14 @@
}
- public void setAttribute( ServerAttribute attribute ) throws NamingException
+ public void setAttribute( EntryAttribute attribute ) throws NamingException
{
- if ( attribute.getAttributeType().getSyntax().isHumanReadable() )
+ if ( ((ServerAttribute)attribute).getAttributeType().getSyntax().isHumanReadable() )
{
throw new InvalidAttributeValueException( "The attribute must be binary" );
}
- this.attribute = attribute;
+ this.attribute = (ServerAttribute)attribute;
}
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -26,9 +26,9 @@
import javax.naming.NamingException;
import org.apache.directory.server.constants.MetaSchemaConstants;
-import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
@@ -133,7 +133,7 @@
}
- public SyntaxCheckerDescription[] parseSyntaxCheckers( ServerAttribute attr ) throws NamingException
+ public SyntaxCheckerDescription[] parseSyntaxCheckers( EntryAttribute attr ) throws NamingException
{
if ( attr == null || attr.size() == 0 )
{
@@ -165,7 +165,7 @@
}
- public NormalizerDescription[] parseNormalizers( ServerAttribute attr ) throws NamingException
+ public NormalizerDescription[] parseNormalizers( EntryAttribute attr ) throws NamingException
{
if ( attr == null || attr.size() == 0 )
{
@@ -196,7 +196,7 @@
}
- public ComparatorDescription[] parseComparators( ServerAttribute attr ) throws NamingException
+ public ComparatorDescription[] parseComparators( EntryAttribute attr ) throws NamingException
{
if ( attr == null || attr.size() == 0 )
{
@@ -235,7 +235,7 @@
* @return the set of attributeType objects for the descriptions
* @throws NamingException if there are problems parsing the descriptions
*/
- public AttributeType[] parseAttributeTypes( ServerAttribute attr ) throws NamingException
+ public AttributeType[] parseAttributeTypes( EntryAttribute attr ) throws NamingException
{
if ( attr == null || attr.size() == 0 )
{
@@ -370,7 +370,7 @@
* @return the set of objectClass objects for the descriptions
* @throws NamingException if there are problems parsing the descriptions
*/
- public ObjectClass[] parseObjectClasses( ServerAttribute attr ) throws NamingException
+ public ObjectClass[] parseObjectClasses( EntryAttribute attr ) throws NamingException
{
if ( attr == null || attr.size() == 0 )
{
@@ -471,7 +471,7 @@
* @return the set of matchingRuleUse objects for the descriptions
* @throws NamingException if there are problems parsing the descriptions
*/
- public MatchingRuleUse[] parseMatchingRuleUses( ServerAttribute attr ) throws NamingException
+ public MatchingRuleUse[] parseMatchingRuleUses( EntryAttribute attr ) throws NamingException
{
if ( attr == null || attr.size() == 0 )
{
@@ -518,7 +518,7 @@
* @return the set of Syntax objects for the descriptions
* @throws NamingException if there are problems parsing the descriptions
*/
- public Syntax[] parseSyntaxes( ServerAttribute attr ) throws NamingException
+ public Syntax[] parseSyntaxes( EntryAttribute attr ) throws NamingException
{
if ( attr == null || attr.size() == 0 )
{
@@ -572,7 +572,7 @@
* @return the set of matchingRule objects for the descriptions
* @throws NamingException if there are problems parsing the descriptions
*/
- public MatchingRule[] parseMatchingRules( ServerAttribute attr ) throws NamingException
+ public MatchingRule[] parseMatchingRules( EntryAttribute attr ) throws NamingException
{
if ( attr == null || attr.size() == 0 )
{
@@ -625,7 +625,7 @@
* @return the set of DITStructureRule objects for the descriptions
* @throws NamingException if there are problems parsing the descriptions
*/
- public DITStructureRule[] parseDitStructureRules( ServerAttribute attr ) throws NamingException
+ public DITStructureRule[] parseDitStructureRules( EntryAttribute attr ) throws NamingException
{
if ( attr == null || attr.size() == 0 )
{
@@ -674,7 +674,7 @@
* @return the set of DITContentRule objects for the descriptions
* @throws NamingException if there are problems parsing the descriptions
*/
- public DITContentRule[] parseDitContentRules( ServerAttribute attr ) throws NamingException
+ public DITContentRule[] parseDitContentRules( EntryAttribute attr ) throws NamingException
{
if ( attr == null || attr.size() == 0 )
{
@@ -725,7 +725,7 @@
* @return the set of NameFormRule objects for the descriptions
* @throws NamingException if there are problems parsing the descriptions
*/
- public NameForm[] parseNameForms( ServerAttribute attr ) throws NamingException
+ public NameForm[] parseNameForms( EntryAttribute attr ) throws NamingException
{
if ( attr == null || attr.size() == 0 )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java Mon Mar 31 09:19:45 2008
@@ -27,13 +27,13 @@
import javax.naming.NamingException;
import org.apache.directory.server.constants.MetaSchemaConstants;
-import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.schema.bootstrap.Schema;
import org.apache.directory.server.schema.registries.ComparatorRegistry;
import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapNamingException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
@@ -99,14 +99,14 @@
description.addExtension( MetaSchemaConstants.X_SCHEMA, values );
description.setFqcn( entry.get( fqcnAT ).getString() );
- ServerAttribute desc = entry.get( descAT );
+ EntryAttribute desc = entry.get( descAT );
if ( desc != null && desc.size() > 0 )
{
description.setDescription( desc.getString() );
}
- ServerAttribute bytecode = entry.get( byteCodeAT );
+ EntryAttribute bytecode = entry.get( byteCodeAT );
if ( bytecode != null && bytecode.size() > 0 )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java Mon Mar 31 09:19:45 2008
@@ -26,13 +26,13 @@
import javax.naming.NamingException;
import org.apache.directory.server.constants.MetaSchemaConstants;
-import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.schema.bootstrap.Schema;
import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
import org.apache.directory.server.schema.registries.NormalizerRegistry;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapNamingException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
@@ -85,14 +85,14 @@
description.addExtension( MetaSchemaConstants.X_SCHEMA, values );
description.setFqcn( entry.get( fqcnAT ).getString() );
- ServerAttribute desc = entry.get( descAT );
+ EntryAttribute desc = entry.get( descAT );
if ( ( desc != null ) && ( desc.size() > 0 ) )
{
description.setDescription( desc.getString() );
}
- ServerAttribute bytecode = entry.get( byteCodeAT );
+ EntryAttribute bytecode = entry.get( byteCodeAT );
if ( ( bytecode != null ) && ( bytecode.size() > 0 ) )
{
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -28,6 +28,7 @@
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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.Value;
@@ -89,7 +90,7 @@
public void modify( LdapDN name, ModificationOperation modOp, ServerEntry mods, ServerEntry entry,
ServerEntry targetEntry, boolean cascade ) throws NamingException
{
- ServerAttribute disabledInMods = mods.get( disabledAT );
+ EntryAttribute disabledInMods = mods.get( disabledAT );
if ( disabledInMods != null )
{
@@ -98,7 +99,7 @@
// check if the new schema is enabled or disabled
boolean isEnabled = false;
- ServerAttribute disabled = targetEntry.get( this.disabledAT );
+ EntryAttribute disabled = targetEntry.get( this.disabledAT );
if ( disabled == null )
{
@@ -109,7 +110,7 @@
isEnabled = true;
}
- ServerAttribute dependencies = mods.get( dependenciesAT );
+ EntryAttribute dependencies = mods.get( dependenciesAT );
if ( dependencies != null )
{
@@ -130,7 +131,7 @@
public void modify( LdapDN name, List<Modification> mods, ServerEntry entry,
ServerEntry targetEntry, boolean cascade ) throws NamingException
{
- ServerAttribute disabledInEntry = entry.get( disabledAT );
+ EntryAttribute disabledInEntry = entry.get( disabledAT );
Modification disabledModification = ServerEntryUtils.getModificationItem( mods, disabledAT );
if ( disabledModification != null )
@@ -143,7 +144,7 @@
// check if the new schema is enabled or disabled
boolean isEnabled = false;
- ServerAttribute disabled = targetEntry.get( disabledAT );
+ EntryAttribute disabled = targetEntry.get( disabledAT );
if ( disabled == null )
{
@@ -188,7 +189,7 @@
// check if the new schema is enabled or disabled
boolean isEnabled = false;
- ServerAttribute disabled = entry.get( disabledAT );
+ EntryAttribute disabled = entry.get( disabledAT );
if ( disabled == null )
{
@@ -244,7 +245,7 @@
*/
public void delete( LdapDN name, ServerEntry entry, boolean cascade ) throws NamingException
{
- ServerAttribute cn = entry.get( cnAT );
+ EntryAttribute cn = entry.get( cnAT );
String schemaName = cn.getString();
// Before allowing a schema object to be deleted we must check
@@ -314,7 +315,7 @@
// check if the new schema is enabled or disabled
boolean isEnabled = false;
- ServerAttribute disabled = entry.get( disabledAT );
+ EntryAttribute disabled = entry.get( disabledAT );
if ( disabled == null )
{
@@ -379,7 +380,7 @@
// -----------------------------------------------------------------------
- private void disable( LdapDN name, ModificationOperation modOp, ServerAttribute disabledInMods, ServerAttribute disabledInEntry )
+ private void disable( LdapDN name, ModificationOperation modOp, EntryAttribute disabledInMods, EntryAttribute disabledInEntry )
throws NamingException
{
switch ( modOp )
@@ -487,7 +488,7 @@
*/
private void checkForDependencies( boolean isEnabled, ServerEntry entry ) throws NamingException
{
- ServerAttribute dependencies = entry.get( this.dependenciesAT );
+ EntryAttribute dependencies = entry.get( this.dependenciesAT );
if ( dependencies == null )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java?rev=643046&r1=643045&r2=643046&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java Mon Mar 31 09:19:45 2008
@@ -26,13 +26,13 @@
import javax.naming.NamingException;
import org.apache.directory.server.constants.MetaSchemaConstants;
-import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.schema.bootstrap.Schema;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry;
import org.apache.directory.server.schema.registries.SyntaxRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapNamingException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
@@ -84,14 +84,14 @@
description.addExtension( MetaSchemaConstants.X_SCHEMA, values );
description.setFqcn( entry.get( fqcnAT ).getString() );
- ServerAttribute desc = entry.get( descAT );
+ EntryAttribute desc = entry.get( descAT );
if ( desc != null && desc.size() > 0 )
{
description.setDescription( desc.getString() );
}
- ServerAttribute bytecode = entry.get( byteCodeAT );
+ EntryAttribute bytecode = entry.get( byteCodeAT );
if ( bytecode != null && bytecode.size() > 0 )
{
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -37,7 +37,6 @@
import javax.naming.NamingException;
import org.apache.directory.server.constants.MetaSchemaConstants;
-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.interceptor.context.EntryOperationContext;
@@ -50,6 +49,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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -203,7 +203,7 @@
{
ServerEntry entry = ne.next().getServerEntry();
String oid = entry.get( mOidAT ).getString();
- ServerAttribute names = entry.get( mNameAT );
+ EntryAttribute names = entry.get( mNameAT );
targetRegistries.getOidRegistry().register( oid, oid );
for ( Value<?> value:names )
@@ -255,7 +255,7 @@
for ( ServerSearchResult sr: results )
{
- ServerAttribute cn = sr.getServerEntry().get( cnAT );
+ EntryAttribute cn = sr.getServerEntry().get( cnAT );
dependees.add( cn.getString() );
}
@@ -283,7 +283,7 @@
for ( ServerSearchResult sr: results )
{
- ServerAttribute cn = sr.getServerEntry().get( cnAT );
+ EntryAttribute cn = sr.getServerEntry().get( cnAT );
dependees.add( cn.getString() );
}
@@ -740,7 +740,7 @@
private String getOid( ServerEntry entry ) throws NamingException
{
- ServerAttribute oid = entry.get( mOidAT );
+ EntryAttribute oid = entry.get( mOidAT );
if ( oid == null )
{
@@ -760,13 +760,13 @@
description.addExtension( MetaSchemaConstants.X_SCHEMA, values );
description.setFqcn( entry.get( fqcnAT ).getString() );
- ServerAttribute desc = entry.get( descAT );
+ EntryAttribute desc = entry.get( descAT );
if ( desc != null && desc.size() > 0 )
{
description.setDescription( desc.getString() );
}
- ServerAttribute bytecode = entry.get( byteCodeAT );
+ EntryAttribute bytecode = entry.get( byteCodeAT );
if ( bytecode != null && bytecode.size() > 0 )
{
@@ -825,14 +825,14 @@
description.addExtension( MetaSchemaConstants.X_SCHEMA, values );
description.setFqcn( entry.get( fqcnAT ).getString() );
- ServerAttribute desc = entry.get( descAT );
+ EntryAttribute desc = entry.get( descAT );
if ( desc != null && desc.size() > 0 )
{
description.setDescription( desc.getString() );
}
- ServerAttribute bytecode = entry.get( byteCodeAT );
+ EntryAttribute bytecode = entry.get( byteCodeAT );
if ( bytecode != null && bytecode.size() > 0 )
{
@@ -854,14 +854,14 @@
description.addExtension( MetaSchemaConstants.X_SCHEMA, values );
description.setFqcn( entry.get( fqcnAT ).getString() );
- ServerAttribute desc = entry.get( descAT );
+ EntryAttribute desc = entry.get( descAT );
if ( desc != null && desc.size() > 0 )
{
description.setDescription( desc.getString() );
}
- ServerAttribute bytecode = entry.get( byteCodeAT );
+ EntryAttribute bytecode = entry.get( byteCodeAT );
if ( bytecode != null && bytecode.size() > 0 )
{
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=643046&r1=643045&r2=643046&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 Mon Mar 31 09:19:45 2008
@@ -25,6 +25,7 @@
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.EntryAttribute;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -200,14 +201,14 @@
* without a STRUCTURAL objectClass
*/
public static void preventStructuralClassRemovalOnModifyRemove( ObjectClassRegistry registry, LdapDN name, ModificationOperation mod,
- ServerAttribute attribute, ServerAttribute entryObjectClasses ) throws NamingException
+ EntryAttribute attribute, EntryAttribute entryObjectClasses ) throws NamingException
{
if ( mod != ModificationOperation.REMOVE_ATTRIBUTE )
{
return;
}
- if ( !attribute.instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
+ if ( !((ServerAttribute)attribute).instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
{
return;
}
@@ -472,7 +473,7 @@
if ( rdnAttributes.contains( id ) )
{
- ServerAttribute rdnAttr = entry.get( id );
+ EntryAttribute rdnAttr = entry.get( id );
// if the attribute values to delete are not specified then all values
// for the attribute are to be deleted in which case we must just throw
@@ -643,7 +644,7 @@
// of the Rdn attribute so we must check if one of those values
// are used by the Rdn attribute value pair for the name of the entry
String rdnValue = getRdnValue( id, name, oidRegistry );
- ServerAttribute rdnAttr = entry.get( id );
+ EntryAttribute rdnAttr = entry.get( id );
for ( Value<?> value:rdnAttr )
{