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 2011/04/01 01:32:14 UTC
svn commit: r1087507 - in /directory/studio/trunk/plugins:
aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/
apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/
apacheds.configu...
Author: elecharny
Date: Thu Mar 31 23:32:13 2011
New Revision: 1087507
URL: http://svn.apache.org/viewvc?rev=1087507&view=rev
Log:
o Renamed the EntryAttribute interface to Attribute
Modified:
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/ServerXmlIOV150.java
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java
directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java Thu Mar 31 23:32:13 2011
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.studio.valueeditors.AbstractDialogStringValueEditor;
import org.eclipse.osgi.util.NLS;
@@ -224,9 +224,9 @@ public class ProtectedItemWrapper
else if ( item.getClass() == AttributeValueItem.class )
{
AttributeValueItem av = ( AttributeValueItem ) item;
- for ( Iterator<EntryAttribute> it = av.iterator(); it.hasNext(); )
+ for ( Iterator<Attribute> it = av.iterator(); it.hasNext(); )
{
- EntryAttribute entryAttribute = it.next();
+ Attribute entryAttribute = it.next();
values.add( entryAttribute.getId() + "=" + entryAttribute.get() ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java Thu Mar 31 23:32:13 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Modification;
import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
import org.apache.directory.shared.ldap.model.entry.Value;
@@ -314,14 +314,14 @@ public class PartitionsDiffComputer
List<AttributeType> evaluatedATs = new ArrayList<AttributeType>();
// Checking attributes of the original entry
- for ( EntryAttribute originalAttribute : originalEntry )
+ for ( Attribute originalAttribute : originalEntry )
{
AttributeType originalAttributeType = originalAttribute.getAttributeType();
// We're only working on 'userApplications' attributes
if ( originalAttributeType.getUsage() == UsageEnum.USER_APPLICATIONS )
{
- EntryAttribute destinationAttribute = destinationEntry.get( originalAttributeType );
+ Attribute destinationAttribute = destinationEntry.get( originalAttributeType );
if ( destinationAttribute == null )
{
// Creating a modification for the removed AT
@@ -342,7 +342,7 @@ public class PartitionsDiffComputer
}
// Checking attributes of the destination entry
- for ( EntryAttribute destinationAttribute : destinationEntry )
+ for ( Attribute destinationAttribute : destinationEntry )
{
AttributeType destinationAttributeType = destinationAttribute.getAttributeType();
@@ -355,7 +355,7 @@ public class PartitionsDiffComputer
// Creating a modification for the added AT
Modification modification = new DefaultModification();
modification.setOperation( ModificationOperation.ADD_ATTRIBUTE );
- EntryAttribute attribute = new DefaultEntryAttribute( destinationAttributeType );
+ Attribute attribute = new DefaultEntryAttribute( destinationAttributeType );
modification.setAttribute( attribute );
for ( Value<?> value : destinationAttribute )
@@ -388,7 +388,7 @@ public class PartitionsDiffComputer
* the modification LDIF entry holding the modifications
* between both attributes
*/
- private void compareAttributes( EntryAttribute originalAttribute, EntryAttribute destinationAttribute,
+ private void compareAttributes( Attribute originalAttribute, Attribute destinationAttribute,
LdifEntry modificationEntry )
{
// Creating a list to store the already evaluated values
@@ -402,7 +402,7 @@ public class PartitionsDiffComputer
// Creating a modification for the removed AT value
Modification modification = new DefaultModification();
modification.setOperation( ModificationOperation.REMOVE_ATTRIBUTE );
- EntryAttribute attribute = new DefaultEntryAttribute( originalAttribute.getAttributeType() );
+ Attribute attribute = new DefaultEntryAttribute( originalAttribute.getAttributeType() );
modification.setAttribute( attribute );
try
@@ -428,7 +428,7 @@ public class PartitionsDiffComputer
// Creating a modification for the added AT value
Modification modification = new DefaultModification();
modification.setOperation( ModificationOperation.ADD_ATTRIBUTE );
- EntryAttribute attribute = new DefaultEntryAttribute( originalAttribute.getAttributeType() );
+ Attribute attribute = new DefaultEntryAttribute( originalAttribute.getAttributeType() );
modification.setAttribute( attribute );
try
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java Thu Mar 31 23:32:13 2011
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
@@ -166,7 +166,7 @@ public class PartitionDetailsPage implem
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
AttributeValueObject newAttributeValueObject = dialog.getAttributeValueObject();
- EntryAttribute attribute = contextEntry.get( newAttributeValueObject.getAttribute() );
+ Attribute attribute = contextEntry.get( newAttributeValueObject.getAttribute() );
if ( attribute != null )
{
@@ -219,7 +219,7 @@ public class PartitionDetailsPage implem
{
AttributeValueObject attributeValueObject = ( AttributeValueObject ) selection.getFirstElement();
- EntryAttribute attribute = contextEntry.get( attributeValueObject.getAttribute() );
+ Attribute attribute = contextEntry.get( attributeValueObject.getAttribute() );
if ( attribute != null )
{
attribute.remove( attributeValueObject.getValue() );
@@ -423,10 +423,10 @@ public class PartitionDetailsPage implem
List<AttributeValueObject> elements = new ArrayList<AttributeValueObject>();
Entry entry = ( Entry ) inputElement;
- Iterator<EntryAttribute> attributes = entry.iterator();
+ Iterator<Attribute> attributes = entry.iterator();
while ( attributes.hasNext() )
{
- EntryAttribute attribute = attributes.next();
+ Attribute attribute = attributes.next();
Iterator<Value<?>> values = attribute.iterator();
while ( values.hasNext() )
@@ -786,7 +786,7 @@ public class PartitionDetailsPage implem
AttributeValueDialog dialog = new AttributeValueDialog( attributeValueObject );
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
- EntryAttribute attribute = contextEntry.get( oldId );
+ Attribute attribute = contextEntry.get( oldId );
if ( attribute != null )
{
attribute.remove( oldValue );
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java Thu Mar 31 23:32:13 2011
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
@@ -166,7 +166,7 @@ public class PartitionDetailsPage implem
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
AttributeValueObject newAttributeValueObject = dialog.getAttributeValueObject();
- EntryAttribute attribute = contextEntry.get( newAttributeValueObject.getAttribute() );
+ Attribute attribute = contextEntry.get( newAttributeValueObject.getAttribute() );
if ( attribute != null )
{
@@ -219,7 +219,7 @@ public class PartitionDetailsPage implem
{
AttributeValueObject attributeValueObject = ( AttributeValueObject ) selection.getFirstElement();
- EntryAttribute attribute = contextEntry.get( attributeValueObject.getAttribute() );
+ Attribute attribute = contextEntry.get( attributeValueObject.getAttribute() );
if ( attribute != null )
{
attribute.remove( attributeValueObject.getValue() );
@@ -423,10 +423,10 @@ public class PartitionDetailsPage implem
List<AttributeValueObject> elements = new ArrayList<AttributeValueObject>();
Entry entry = ( Entry ) inputElement;
- Iterator<EntryAttribute> attributes = entry.iterator();
+ Iterator<Attribute> attributes = entry.iterator();
while ( attributes.hasNext() )
{
- EntryAttribute attribute = attributes.next();
+ Attribute attribute = attributes.next();
Iterator<Value<?>> values = attribute.iterator();
while ( values.hasNext() )
@@ -786,7 +786,7 @@ public class PartitionDetailsPage implem
AttributeValueDialog dialog = new AttributeValueDialog( attributeValueObject );
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
- EntryAttribute attribute = contextEntry.get( oldId );
+ Attribute attribute = contextEntry.get( oldId );
if ( attribute != null )
{
attribute.remove( oldValue );
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java Thu Mar 31 23:32:13 2011
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
@@ -166,7 +166,7 @@ public class PartitionDetailsPage implem
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
AttributeValueObject newAttributeValueObject = dialog.getAttributeValueObject();
- EntryAttribute attribute = contextEntry.get( newAttributeValueObject.getAttribute() );
+ Attribute attribute = contextEntry.get( newAttributeValueObject.getAttribute() );
if ( attribute != null )
{
@@ -219,7 +219,7 @@ public class PartitionDetailsPage implem
{
AttributeValueObject attributeValueObject = ( AttributeValueObject ) selection.getFirstElement();
- EntryAttribute attribute = contextEntry.get( attributeValueObject.getAttribute() );
+ Attribute attribute = contextEntry.get( attributeValueObject.getAttribute() );
if ( attribute != null )
{
attribute.remove( attributeValueObject.getValue() );
@@ -423,10 +423,10 @@ public class PartitionDetailsPage implem
List<AttributeValueObject> elements = new ArrayList<AttributeValueObject>();
Entry entry = ( Entry ) inputElement;
- Iterator<EntryAttribute> attributes = entry.iterator();
+ Iterator<Attribute> attributes = entry.iterator();
while ( attributes.hasNext() )
{
- EntryAttribute attribute = attributes.next();
+ Attribute attribute = attributes.next();
Iterator<Value<?>> values = attribute.iterator();
while ( values.hasNext() )
@@ -786,7 +786,7 @@ public class PartitionDetailsPage implem
AttributeValueDialog dialog = new AttributeValueDialog( attributeValueObject );
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
- EntryAttribute attribute = contextEntry.get( oldId );
+ Attribute attribute = contextEntry.get( oldId );
if ( attribute != null )
{
attribute.remove( oldValue );
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java Thu Mar 31 23:32:13 2011
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
@@ -166,7 +166,7 @@ public class PartitionDetailsPage implem
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
AttributeValueObject newAttributeValueObject = dialog.getAttributeValueObject();
- EntryAttribute attribute = contextEntry.get( newAttributeValueObject.getAttribute() );
+ Attribute attribute = contextEntry.get( newAttributeValueObject.getAttribute() );
if ( attribute != null )
{
@@ -219,7 +219,7 @@ public class PartitionDetailsPage implem
{
AttributeValueObject attributeValueObject = ( AttributeValueObject ) selection.getFirstElement();
- EntryAttribute attribute = contextEntry.get( attributeValueObject.getAttribute() );
+ Attribute attribute = contextEntry.get( attributeValueObject.getAttribute() );
if ( attribute != null )
{
attribute.remove( attributeValueObject.getValue() );
@@ -423,10 +423,10 @@ public class PartitionDetailsPage implem
List<AttributeValueObject> elements = new ArrayList<AttributeValueObject>();
Entry entry = (Entry) inputElement;
- Iterator<EntryAttribute> attributes = entry.iterator();
+ Iterator<Attribute> attributes = entry.iterator();
while ( attributes.hasNext() )
{
- EntryAttribute attribute = attributes.next();
+ Attribute attribute = attributes.next();
Iterator<Value<?>> values = attribute.iterator();
while ( values.hasNext() )
@@ -784,7 +784,7 @@ public class PartitionDetailsPage implem
AttributeValueDialog dialog = new AttributeValueDialog( attributeValueObject );
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
- EntryAttribute attribute = contextEntry.get( oldId );
+ Attribute attribute = contextEntry.get( oldId );
if ( attribute != null )
{
attribute.remove( oldValue );
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java Thu Mar 31 23:32:13 2011
@@ -28,7 +28,7 @@ import java.util.Iterator;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.ldif.LdifReader;
import org.apache.directory.shared.util.Strings;
import org.apache.directory.studio.apacheds.configuration.StudioEntityResolver;
@@ -213,8 +213,8 @@ public abstract class AbstractServerXmlI
continue;
}
- EntryAttribute attribute = LdifReader.parseAttributeValue( addedLine );
- EntryAttribute oldAttribute = entry.get( attribute.getId() );
+ Attribute attribute = LdifReader.parseAttributeValue( addedLine );
+ Attribute oldAttribute = entry.get( attribute.getId() );
if ( oldAttribute != null )
{
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/ServerXmlIOV150.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/ServerXmlIOV150.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/ServerXmlIOV150.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/ServerXmlIOV150.java Thu Mar 31 23:32:13 2011
@@ -30,7 +30,7 @@ import java.util.List;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.studio.apacheds.configuration.StudioEntityResolver;
import org.apache.directory.studio.apacheds.configuration.model.AbstractServerXmlIO;
@@ -999,10 +999,10 @@ public class ServerXmlIOV150 extends Abs
Entry contextEntry = partition.getContextEntry();
StringBuffer sb = new StringBuffer();
- Iterator<EntryAttribute> attributes = contextEntry.iterator();
+ Iterator<Attribute> attributes = contextEntry.iterator();
while ( attributes.hasNext() )
{
- EntryAttribute attribute = attributes.next();
+ Attribute attribute = attributes.next();
Iterator<Value<?>> values = attribute.iterator();
while ( values.hasNext() )
{
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java Thu Mar 31 23:32:13 2011
@@ -31,7 +31,7 @@ import java.util.List;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.studio.apacheds.configuration.StudioEntityResolver;
import org.apache.directory.studio.apacheds.configuration.model.AbstractServerXmlIO;
import org.apache.directory.studio.apacheds.configuration.model.ServerConfiguration;
@@ -1471,10 +1471,10 @@ public class ServerXmlIOV151 extends Abs
Entry contextEntry = partition.getContextEntry();
StringBuffer sb = new StringBuffer();
- Iterator<EntryAttribute> attributes = contextEntry.iterator();
+ Iterator<Attribute> attributes = contextEntry.iterator();
while ( attributes.hasNext() )
{
- EntryAttribute attribute = attributes.next();
+ Attribute attribute = attributes.next();
Iterator<Value<?>> values = attribute.iterator();
while ( values.hasNext() )
{
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java Thu Mar 31 23:32:13 2011
@@ -29,7 +29,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.studio.apacheds.configuration.StudioEntityResolver;
import org.apache.directory.studio.apacheds.configuration.model.AbstractServerXmlIO;
@@ -1662,10 +1662,10 @@ public class ServerXmlIOV152 extends Abs
// Creating a string buffer to contain the LDIF data
StringBuffer sb = new StringBuffer();
- Iterator<EntryAttribute> attributes = contextEntry.iterator();
+ Iterator<Attribute> attributes = contextEntry.iterator();
while ( attributes.hasNext() )
{
- EntryAttribute attribute = attributes.next();
+ Attribute attribute = attributes.next();
Iterator<Value<?>> values = attribute.iterator();
while ( values.hasNext() )
{
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java Thu Mar 31 23:32:13 2011
@@ -29,7 +29,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.studio.apacheds.configuration.StudioEntityResolver;
import org.apache.directory.studio.apacheds.configuration.model.AbstractServerXmlIO;
@@ -1719,10 +1719,10 @@ public class ServerXmlIOV153 extends Abs
// Creating a string buffer to contain the LDIF data
StringBuffer sb = new StringBuffer();
- Iterator<EntryAttribute> attributes = contextEntry.iterator();
+ Iterator<Attribute> attributes = contextEntry.iterator();
while ( attributes.hasNext() )
{
- EntryAttribute attribute = attributes.next();
+ Attribute attribute = attributes.next();
Iterator<Value<?>> values = attribute.iterator();
while ( values.hasNext() )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java Thu Mar 31 23:32:13 2011
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
@@ -359,7 +359,7 @@ public class ExportDsmlRunnable implemen
SearchResultReferenceDsml srr = new SearchResultReferenceDsml( codec );
// Getting the 'ref' attribute
- EntryAttribute refAttribute = entry.get( ExportDsmlRunnable.REF_ATTRIBUTETYPE_NAME );
+ Attribute refAttribute = entry.get( ExportDsmlRunnable.REF_ATTRIBUTETYPE_NAME );
if ( refAttribute == null )
{
// If we did not get it by its name, let's get it by its OID
@@ -403,7 +403,7 @@ public class ExportDsmlRunnable implemen
if ( entry != null )
{
// Getting the 'objectClass' Attribute
- EntryAttribute objectClassAttribute = entry.get( ExportDsmlRunnable.OBJECTCLASS_OBJECTCLASS_NAME );
+ Attribute objectClassAttribute = entry.get( ExportDsmlRunnable.OBJECTCLASS_OBJECTCLASS_NAME );
if ( objectClassAttribute == null )
{
objectClassAttribute = entry.get( ExportDsmlRunnable.OBJECTCLASS_OBJECTCLASS_OID );
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java?rev=1087507&r1=1087506&r2=1087507&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java Thu Mar 31 23:32:13 2011
@@ -26,7 +26,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.model.name.Dn;
@@ -143,7 +143,7 @@ public class SchemaEditorSchemaLoaderUti
String syntax = matchingRule.getSyntaxOid();
if ( !Strings.isEmpty( syntax ) )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_SYNTAX, syntax );
+ Attribute attribute = new DefaultEntryAttribute( M_SYNTAX, syntax );
entry.add( attribute );
}
@@ -277,7 +277,7 @@ public class SchemaEditorSchemaLoaderUti
private static void addObjectClassValue( SchemaObject schemaObject, String objectClassValue, Entry entry )
throws LdapException
{
- EntryAttribute objectClassAttribute = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT );
+ Attribute objectClassAttribute = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT );
entry.add( objectClassAttribute );
objectClassAttribute.add( SchemaConstants.TOP_OC );
objectClassAttribute.add( SchemaConstants.META_TOP_OC );
@@ -299,7 +299,7 @@ public class SchemaEditorSchemaLoaderUti
String oid = schemaObject.getOid();
if ( !Strings.isEmpty( oid ) )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_OID, oid );
+ Attribute attribute = new DefaultEntryAttribute( M_OID, oid );
entry.add( attribute );
}
}
@@ -319,7 +319,7 @@ public class SchemaEditorSchemaLoaderUti
List<String> names = schemaObject.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_NAME );
+ Attribute attribute = new DefaultEntryAttribute( M_NAME );
entry.add( attribute );
for ( String name : names )
@@ -344,7 +344,7 @@ public class SchemaEditorSchemaLoaderUti
String description = schemaObject.getDescription();
if ( !Strings.isEmpty( description ) )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_DESCRIPTION, description );
+ Attribute attribute = new DefaultEntryAttribute( M_DESCRIPTION, description );
entry.add( attribute );
}
}
@@ -363,7 +363,7 @@ public class SchemaEditorSchemaLoaderUti
{
if ( schemaObject.isObsolete() )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_OBSOLETE, TRUE );
+ Attribute attribute = new DefaultEntryAttribute( M_OBSOLETE, TRUE );
entry.add( attribute );
}
}
@@ -383,7 +383,7 @@ public class SchemaEditorSchemaLoaderUti
String superior = attributeType.getSuperiorName();
if ( !Strings.isEmpty( superior ) )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_SUP_ATTRIBUTE_TYPE, superior );
+ Attribute attribute = new DefaultEntryAttribute( M_SUP_ATTRIBUTE_TYPE, superior );
entry.add( attribute );
}
}
@@ -403,7 +403,7 @@ public class SchemaEditorSchemaLoaderUti
String equality = attributeType.getEqualityName();
if ( !Strings.isEmpty( equality ) )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_EQUALITY, equality );
+ Attribute attribute = new DefaultEntryAttribute( M_EQUALITY, equality );
entry.add( attribute );
}
}
@@ -423,7 +423,7 @@ public class SchemaEditorSchemaLoaderUti
String ordering = attributeType.getOrderingName();
if ( !Strings.isEmpty( ordering ) )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_ORDERING, ordering );
+ Attribute attribute = new DefaultEntryAttribute( M_ORDERING, ordering );
entry.add( attribute );
}
}
@@ -443,7 +443,7 @@ public class SchemaEditorSchemaLoaderUti
String substr = attributeType.getSubstringName();
if ( !Strings.isEmpty( substr ) )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_SUBSTR, substr );
+ Attribute attribute = new DefaultEntryAttribute( M_SUBSTR, substr );
entry.add( attribute );
}
}
@@ -463,7 +463,7 @@ public class SchemaEditorSchemaLoaderUti
String syntax = attributeType.getSyntaxName();
if ( !Strings.isEmpty( syntax ) )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_SYNTAX, syntax );
+ Attribute attribute = new DefaultEntryAttribute( M_SYNTAX, syntax );
entry.add( attribute );
long syntaxLength = attributeType.getSyntaxLength();
@@ -489,7 +489,7 @@ public class SchemaEditorSchemaLoaderUti
{
if ( attributeType.isSingleValued() )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_SINGLE_VALUE, TRUE );
+ Attribute attribute = new DefaultEntryAttribute( M_SINGLE_VALUE, TRUE );
entry.add( attribute );
}
}
@@ -508,7 +508,7 @@ public class SchemaEditorSchemaLoaderUti
{
if ( attributeType.isCollective() )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_COLLECTIVE, TRUE );
+ Attribute attribute = new DefaultEntryAttribute( M_COLLECTIVE, TRUE );
entry.add( attribute );
}
}
@@ -527,7 +527,7 @@ public class SchemaEditorSchemaLoaderUti
{
if ( !attributeType.isUserModifiable() )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_NO_USER_MODIFICATION, TRUE );
+ Attribute attribute = new DefaultEntryAttribute( M_NO_USER_MODIFICATION, TRUE );
entry.add( attribute );
}
}
@@ -547,7 +547,7 @@ public class SchemaEditorSchemaLoaderUti
UsageEnum usage = attributeType.getUsage();
if ( usage != UsageEnum.USER_APPLICATIONS )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_USAGE, usage.render() );
+ Attribute attribute = new DefaultEntryAttribute( M_USAGE, usage.render() );
entry.add( attribute );
}
}
@@ -567,7 +567,7 @@ public class SchemaEditorSchemaLoaderUti
List<String> superiors = objectClass.getSuperiorOids();
if ( ( superiors != null ) && ( superiors.size() > 0 ) )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_SUP_OBJECT_CLASS );
+ Attribute attribute = new DefaultEntryAttribute( M_SUP_OBJECT_CLASS );
entry.add( attribute );
for ( String superior : superiors )
@@ -592,7 +592,7 @@ public class SchemaEditorSchemaLoaderUti
ObjectClassTypeEnum classType = objectClass.getType();
if ( classType != ObjectClassTypeEnum.STRUCTURAL )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_TYPE_OBJECT_CLASS, classType.toString() );
+ Attribute attribute = new DefaultEntryAttribute( M_TYPE_OBJECT_CLASS, classType.toString() );
entry.add( attribute );
}
}
@@ -612,7 +612,7 @@ public class SchemaEditorSchemaLoaderUti
List<String> musts = objectClass.getMustAttributeTypeOids();
if ( ( musts != null ) && ( musts.size() > 0 ) )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_MUST );
+ Attribute attribute = new DefaultEntryAttribute( M_MUST );
entry.add( attribute );
for ( String must : musts )
@@ -637,7 +637,7 @@ public class SchemaEditorSchemaLoaderUti
List<String> mays = objectClass.getMayAttributeTypeOids();
if ( ( mays != null ) && ( mays.size() > 0 ) )
{
- EntryAttribute attribute = new DefaultEntryAttribute( M_MAY );
+ Attribute attribute = new DefaultEntryAttribute( M_MAY );
entry.add( attribute );
for ( String may : mays )