You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/10/08 18:50:57 UTC
svn commit: r1005896 [1/4] - in
/directory/studio/trunk/plugins/ldapbrowser.core: ./
src/main/java/org/apache/directory/studio/ldapbrowser/core/
src/main/java/org/apache/directory/studio/ldapbrowser/core/events/
src/main/java/org/apache/directory/studi...
Author: pamarcelot
Date: Fri Oct 8 16:50:55 2010
New Revision: 1005896
URL: http://svn.apache.org/viewvc?rev=1005896&view=rev
Log:
Merged the 'shared-trunk-merge' branch back into trunk.
It includes all changes related to the use of the current Shared trunk into Studio (which was stuck at version 0.9.17 until now).
Modified:
directory/studio/trunk/plugins/ldapbrowser.core/pom.xml
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeAddedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeDeletedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributesInitializedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ChildrenInitializedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EmptyValueAddedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EmptyValueDeletedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryAddedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryDeletedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryMovedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryRenamedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueAddedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueDeletedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueModifiedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueRenamedEvent.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/EntryExistsCopyStrategyDialog.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeChildrenRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SimulateRenameDialog.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/BookmarkParameter.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IAttribute.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBookmark.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearchResult.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BaseDNEntry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Bookmark.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BookmarkEntry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DirectoryMetadataEntry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/RootDSE.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchContinuation.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/CompoundModification.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/JNDIUtils.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
Modified: directory/studio/trunk/plugins/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/pom.xml?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/pom.xml Fri Oct 8 16:50:55 2010
@@ -111,10 +111,8 @@
org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.dsmlparser;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.dsmlparser;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.core,
org.apache.directory.studio.connection.core,
org.apache.directory.studio.ldifparser,
@@ -192,21 +190,11 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.shared.asn1</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.shared.ldap</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.shared.dsmlparser</artifactId>
<scope>provided</scope>
</dependency>
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java Fri Oct 8 16:50:55 2010
@@ -32,9 +32,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.naming.InvalidNameException;
-
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.Base64;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.StudioControl;
@@ -43,8 +42,8 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
-import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch.SearchScope;
+import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
import org.apache.directory.studio.ldapbrowser.core.model.impl.Bookmark;
import org.apache.directory.studio.ldapbrowser.core.model.impl.Search;
import org.dom4j.Attribute;
@@ -198,9 +197,9 @@ public class BrowserConnectionIO
{
try
{
- searchParameter.setSearchBase( new LdapDN( searchBaseAttribute.getValue() ) );
+ searchParameter.setSearchBase( new DN( searchBaseAttribute.getValue() ) );
}
- catch ( InvalidNameException e )
+ catch ( LdapInvalidDnException e )
{
throw new ConnectionIOException( "Unable to parse 'Search Base' of search '"
+ searchParameter.getName() + "' :" + searchBaseAttribute.getValue() );
@@ -367,9 +366,9 @@ public class BrowserConnectionIO
{
try
{
- bookmarkParameter.setDn( new LdapDN( dnAttribute.getValue() ) );
+ bookmarkParameter.setDn( new DN( dnAttribute.getValue() ) );
}
- catch ( InvalidNameException e )
+ catch ( LdapInvalidDnException e )
{
throw new ConnectionIOException( "Unable to parse 'DN' of bookmark '" + bookmarkParameter.getName()
+ "' :" + dnAttribute.getValue() );
@@ -460,7 +459,7 @@ public class BrowserConnectionIO
searchParameterElement.addAttribute( NAME_TAG, searchParameter.getName() );
// Search base
- String searchBase = searchParameter.getSearchBase() != null ? searchParameter.getSearchBase().getUpName() : "";
+ String searchBase = searchParameter.getSearchBase() != null ? searchParameter.getSearchBase().getName() : "";
searchParameterElement.addAttribute( SEARCH_BASE_TAG, searchBase );
// Filter
@@ -514,7 +513,7 @@ public class BrowserConnectionIO
bookmarkParameterElement.addAttribute( NAME_TAG, bookmarkParameter.getName() );
// DN
- String dn = bookmarkParameter.getDn() != null ? bookmarkParameter.getDn().getUpName() : "";
+ String dn = bookmarkParameter.getDn() != null ? bookmarkParameter.getDn().getName() : "";
bookmarkParameterElement.addAttribute( DN_TAG, dn );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java Fri Oct 8 16:50:55 2010
@@ -25,7 +25,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.IConnectionListener;
@@ -130,12 +131,12 @@ public class BrowserConnectionListener i
List<String> binaryAttributeNames = new ArrayList<String>();
Schema schema = browserConnection.getSchema();
- Collection<AttributeTypeDescription> attributeTypeDescriptions = schema.getAttributeTypeDescriptions();
- for ( AttributeTypeDescription atd : attributeTypeDescriptions )
+ Collection<AttributeType> attributeTypeDescriptions = schema.getAttributeTypeDescriptions();
+ for ( AttributeType atd : attributeTypeDescriptions )
{
if ( SchemaUtils.isBinary( atd, schema ) )
{
- String name = atd.getNames().isEmpty() ? atd.getNumericOid() : atd.getNames().get( 0 );
+ String name = atd.getNames().isEmpty() ? atd.getOid() : atd.getNames().get( 0 );
binaryAttributeNames.add( name );
}
}
Propchange: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties
('svn:mergeinfo' removed)
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeAddedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeAddedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeAddedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeAddedEvent.java Fri Oct 8 16:50:55 2010
@@ -70,7 +70,7 @@ public class AttributeAddedEvent extends
public String toString()
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__added_att_to_dn, new String[]
- { getAddedAttribute().getDescription(), getModifiedEntry().getDn().getUpName() } );
+ { getAddedAttribute().getDescription(), getModifiedEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeDeletedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeDeletedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeDeletedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributeDeletedEvent.java Fri Oct 8 16:50:55 2010
@@ -70,7 +70,7 @@ public class AttributeDeletedEvent exten
public String toString()
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__deleted_att_from_dn, new String[]
- { getDeletedAttribute().getDescription(), getModifiedEntry().getDn().getUpName() } );
+ { getDeletedAttribute().getDescription(), getModifiedEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributesInitializedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributesInitializedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributesInitializedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/AttributesInitializedEvent.java Fri Oct 8 16:50:55 2010
@@ -53,7 +53,7 @@ public class AttributesInitializedEvent
public String toString()
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__dn_attributes_initialized, new String[]
- { getModifiedEntry().getDn().getUpName() } );
+ { getModifiedEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ChildrenInitializedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ChildrenInitializedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ChildrenInitializedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ChildrenInitializedEvent.java Fri Oct 8 16:50:55 2010
@@ -52,7 +52,7 @@ public class ChildrenInitializedEvent ex
public String toString()
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__dn_children_initialized, new String[]
- { getModifiedEntry().getDn().getUpName() } );
+ { getModifiedEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EmptyValueAddedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EmptyValueAddedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EmptyValueAddedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EmptyValueAddedEvent.java Fri Oct 8 16:50:55 2010
@@ -88,7 +88,7 @@ public class EmptyValueAddedEvent extend
public String toString()
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__empty_value_added_to_att_at_dn, new String[]
- { getModifiedAttribute().getDescription(), getModifiedEntry().getDn().getUpName() } );
+ { getModifiedAttribute().getDescription(), getModifiedEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EmptyValueDeletedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EmptyValueDeletedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EmptyValueDeletedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EmptyValueDeletedEvent.java Fri Oct 8 16:50:55 2010
@@ -88,7 +88,7 @@ public class EmptyValueDeletedEvent exte
public String toString()
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__empty_value_deleted_from_att_at_dn, new String[]
- { getModifiedAttribute().getDescription(), getModifiedEntry().getDn().getUpName() } );
+ { getModifiedAttribute().getDescription(), getModifiedEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryAddedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryAddedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryAddedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryAddedEvent.java Fri Oct 8 16:50:55 2010
@@ -52,7 +52,7 @@ public class EntryAddedEvent extends Ent
public String toString()
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__added_dn, new String[]
- { getModifiedEntry().getDn().getUpName() } );
+ { getModifiedEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryDeletedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryDeletedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryDeletedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryDeletedEvent.java Fri Oct 8 16:50:55 2010
@@ -52,7 +52,7 @@ public class EntryDeletedEvent extends E
public String toString()
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__deleted_dn, new String[]
- { getModifiedEntry().getDn().getUpName() } );
+ { getModifiedEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryMovedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryMovedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryMovedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryMovedEvent.java Fri Oct 8 16:50:55 2010
@@ -83,8 +83,8 @@ public class EntryMovedEvent extends Ent
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__moved_oldrdn_from_oldparent_to_newparent,
new String[]
- { getOldEntry().getDn().getRdn().getUpName(), getOldEntry().getParententry().getDn().getUpName(),
- getNewEntry().getParententry().getDn().getUpName() } );
+ { getOldEntry().getDn().getRdn().getName(), getOldEntry().getParententry().getDn().getName(),
+ getNewEntry().getParententry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryRenamedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryRenamedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryRenamedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryRenamedEvent.java Fri Oct 8 16:50:55 2010
@@ -82,7 +82,7 @@ public class EntryRenamedEvent extends E
public String toString()
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__renamed_olddn_to_newdn, new String[]
- { getOldEntry().getDn().getUpName(), getNewEntry().getDn().getUpName() } );
+ { getOldEntry().getDn().getName(), getNewEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueAddedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueAddedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueAddedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueAddedEvent.java Fri Oct 8 16:50:55 2010
@@ -89,7 +89,7 @@ public class ValueAddedEvent extends Ent
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__added_val_to_att_at_dn, new String[]
{ getAddedValue().getStringValue(), getModifiedAttribute().getDescription(),
- getModifiedEntry().getDn().getUpName() } );
+ getModifiedEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueDeletedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueDeletedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueDeletedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueDeletedEvent.java Fri Oct 8 16:50:55 2010
@@ -89,7 +89,7 @@ public class ValueDeletedEvent extends E
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__deleted_val_from_att_at_dn, new String[]
{ getDeletedValue().getStringValue(), getModifiedAttribute().getDescription(),
- getModifiedEntry().getDn().getUpName() } );
+ getModifiedEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueModifiedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueModifiedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueModifiedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueModifiedEvent.java Fri Oct 8 16:50:55 2010
@@ -106,7 +106,7 @@ public class ValueModifiedEvent extends
return BrowserCoreMessages.bind( BrowserCoreMessages.event__replaced_oldval_by_newval_at_att_at_dn,
new String[]
{ getOldValue().getStringValue(), getNewValue().getStringValue(),
- getModifiedAttribute().getDescription(), getModifiedEntry().getDn().getUpName() } );
+ getModifiedAttribute().getDescription(), getModifiedEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueRenamedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueRenamedEvent.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueRenamedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/ValueRenamedEvent.java Fri Oct 8 16:50:55 2010
@@ -87,7 +87,7 @@ public class ValueRenamedEvent extends E
public String toString()
{
return BrowserCoreMessages.bind( BrowserCoreMessages.event__renamed_oldval_by_newval_at_dn, new String[]
- { getOldValue().toString(), getNewValue().toString(), getModifiedEntry().getDn().getUpName() } );
+ { getOldValue().toString(), getNewValue().toString(), getModifiedEntry().getDn().getName() } );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java Fri Oct 8 16:50:55 2010
@@ -28,7 +28,6 @@ import java.util.List;
import javax.naming.NameAlreadyBoundException;
import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.BasicAttribute;
@@ -40,9 +39,9 @@ import javax.naming.ldap.Control;
import javax.naming.ldap.ManageReferralControl;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
-import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.AVA;
+import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -151,9 +150,9 @@ public class CopyEntriesRunnable impleme
monitor.beginTask(
entriesToCopy.length == 1 ? BrowserCoreMessages.bind( BrowserCoreMessages.jobs__copy_entries_task_1,
new String[]
- { entriesToCopy[0].getDn().getUpName(), parent.getDn().getUpName() } ) : BrowserCoreMessages.bind(
+ { entriesToCopy[0].getDn().getName(), parent.getDn().getName() } ) : BrowserCoreMessages.bind(
BrowserCoreMessages.jobs__copy_entries_task_n, new String[]
- { Integer.toString( entriesToCopy.length ), parent.getDn().getUpName() } ),
+ { Integer.toString( entriesToCopy.length ), parent.getDn().getName() } ),
2 + entriesToCopy.length );
monitor.reportProgress( " " ); //$NON-NLS-1$
@@ -218,7 +217,7 @@ public class CopyEntriesRunnable impleme
*
* @return the number of copied entries
*/
- static int copyEntry( IEntry entryToCopy, IEntry parent, Rdn newRdn, int scope, int numberOfCopiedEntries,
+ static int copyEntry( IEntry entryToCopy, IEntry parent, RDN newRdn, int scope, int numberOfCopiedEntries,
EntryExistsCopyStrategyDialog dialog, StudioProgressMonitor dummyMonitor, StudioProgressMonitor monitor )
{
SearchControls searchControls = new SearchControls();
@@ -239,11 +238,11 @@ public class CopyEntriesRunnable impleme
.getBrowserConnection()
.getConnection()
.getJNDIConnectionWrapper()
- .search( entryToCopy.getDn().getUpName(), ISearch.FILTER_TRUE, searchControls,
+ .search( entryToCopy.getDn().getName(), ISearch.FILTER_TRUE, searchControls,
AliasDereferencingMethod.NEVER, ReferralHandlingMethod.IGNORE, controls, monitor, null );
// In case the parent is the RootDSE: use the parent DN of the old entry
- LdapDN parentDn = parent.getDn();
+ DN parentDn = parent.getDn();
if ( parentDn.isEmpty() )
{
parentDn = DnUtils.getParent( entryToCopy.getDn() );
@@ -276,7 +275,7 @@ public class CopyEntriesRunnable impleme
* @return the number of copied entries
*/
static int copyEntryRecursive( IBrowserConnection sourceBrowserConnection, NamingEnumeration<SearchResult> entries,
- IBrowserConnection targetBrowserConnection, LdapDN parentDn, Rdn forceNewRdn, int scope,
+ IBrowserConnection targetBrowserConnection, DN parentDn, RDN forceNewRdn, int scope,
int numberOfCopiedEntries, EntryExistsCopyStrategyDialog dialog, StudioProgressMonitor dummyMonitor,
StudioProgressMonitor monitor )
{
@@ -286,19 +285,19 @@ public class CopyEntriesRunnable impleme
{
// get next entry to copy
SearchResult sr = entries.next();
- LdapDN oldLdapDn = JNDIUtils.getDn( sr );
- Rdn oldRdn = oldLdapDn.getRdn();
+ DN oldLdapDn = JNDIUtils.getDn( sr );
+ RDN oldRdn = oldLdapDn.getRdn();
// reuse attributes of the entry to copy
Attributes newAttributes = sr.getAttributes();
// compose new DN
- Rdn newRdn = oldLdapDn.getRdn();
+ RDN newRdn = oldLdapDn.getRdn();
if ( forceNewRdn != null )
{
newRdn = forceNewRdn;
}
- LdapDN newLdapDn = DnUtils.composeDn( newRdn, parentDn );
+ DN newLdapDn = DnUtils.composeDn( newRdn, parentDn );
// apply new RDN to the attributes
applyNewRdn( newAttributes, oldRdn, newRdn );
@@ -314,7 +313,7 @@ public class CopyEntriesRunnable impleme
// create entry
targetBrowserConnection.getConnection().getJNDIConnectionWrapper()
- .createEntry( newLdapDn.getUpName(), newAttributes, controls, dummyMonitor, null );
+ .createEntry( newLdapDn.getName(), newAttributes, controls, dummyMonitor, null );
while ( dummyMonitor.errorsReported() )
{
@@ -354,7 +353,7 @@ public class CopyEntriesRunnable impleme
targetBrowserConnection
.getConnection()
.getJNDIConnectionWrapper()
- .modifyEntry( newLdapDn.getUpName(),
+ .modifyEntry( newLdapDn.getName(),
mis.toArray( new ModificationItem[mis.size()] ), null, dummyMonitor, null );
// force reloading of attributes
@@ -367,7 +366,7 @@ public class CopyEntriesRunnable impleme
break;
case RENAME_AND_CONTINUE:
- Rdn renamedRdn = dialog.getRdn();
+ RDN renamedRdn = dialog.getRdn();
// apply renamed RDN to the attributes
applyNewRdn( newAttributes, newRdn, renamedRdn );
@@ -377,7 +376,7 @@ public class CopyEntriesRunnable impleme
// create entry
targetBrowserConnection.getConnection().getJNDIConnectionWrapper()
- .createEntry( newLdapDn.getUpName(), newAttributes, null, dummyMonitor, null );
+ .createEntry( newLdapDn.getName(), newAttributes, null, dummyMonitor, null );
break;
}
@@ -414,7 +413,7 @@ public class CopyEntriesRunnable impleme
NamingEnumeration<SearchResult> childEntries = sourceBrowserConnection
.getConnection()
.getJNDIConnectionWrapper()
- .search( oldLdapDn.getUpName(), ISearch.FILTER_TRUE, searchControls,
+ .search( oldLdapDn.getName(), ISearch.FILTER_TRUE, searchControls,
AliasDereferencingMethod.NEVER, ReferralHandlingMethod.IGNORE, null, monitor, null );
if ( scope == SearchControls.ONELEVEL_SCOPE )
@@ -429,7 +428,7 @@ public class CopyEntriesRunnable impleme
}
}
}
- catch ( NamingException e )
+ catch ( Exception e )
{
monitor.reportError( e );
}
@@ -438,12 +437,12 @@ public class CopyEntriesRunnable impleme
}
- private static void applyNewRdn( Attributes attributes, Rdn oldRdn, Rdn newRdn )
+ private static void applyNewRdn( Attributes attributes, RDN oldRdn, RDN newRdn )
{
// remove old RDN attributes and values
- for ( Iterator<AttributeTypeAndValue> it = oldRdn.iterator(); it.hasNext(); )
+ for ( Iterator<AVA> it = oldRdn.iterator(); it.hasNext(); )
{
- AttributeTypeAndValue atav = it.next();
+ AVA atav = it.next();
Attribute attribute = attributes.get( atav.getUpType() );
if ( attribute != null )
{
@@ -456,9 +455,9 @@ public class CopyEntriesRunnable impleme
}
// add new RDN attributes and values
- for ( Iterator<AttributeTypeAndValue> it = newRdn.iterator(); it.hasNext(); )
+ for ( Iterator<AVA> it = newRdn.iterator(); it.hasNext(); )
{
- AttributeTypeAndValue atav = it.next();
+ AVA atav = it.next();
Attribute attribute = attributes.get( atav.getUpType() );
if ( attribute == null )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java Fri Oct 8 16:50:55 2010
@@ -117,7 +117,7 @@ public class CreateEntryRunnable impleme
public void run( StudioProgressMonitor monitor )
{
monitor.beginTask( BrowserCoreMessages.bind( BrowserCoreMessages.jobs__create_entry_task_1, new String[]
- { entryToCreate.getDn().getUpName() } ), 2 + 1 );
+ { entryToCreate.getDn().getName() } ), 2 + 1 );
monitor.reportProgress( " " ); //$NON-NLS-1$
monitor.worked( 1 );
@@ -189,7 +189,7 @@ public class CreateEntryRunnable impleme
static void createEntry( IBrowserConnection browserConnection, IEntry entryToCreate, StudioProgressMonitor monitor )
{
// dn
- String dn = entryToCreate.getDn().getUpName();
+ String dn = entryToCreate.getDn().getName();
// attributes
Attributes jndiAttributes = new BasicAttributes();
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java Fri Oct 8 16:50:55 2010
@@ -37,13 +37,13 @@ import javax.naming.ldap.BasicControl;
import javax.naming.ldap.Control;
import javax.naming.ldap.ManageReferralControl;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
-import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.connection.core.StudioControl;
+import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.ldapbrowser.core.events.BulkModificationEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
@@ -154,7 +154,7 @@ public class DeleteEntriesRunnable imple
monitor.beginTask(
entriesToDelete.size() == 1 ? BrowserCoreMessages.bind( BrowserCoreMessages.jobs__delete_entries_task_1,
new String[]
- { entriesToDelete.iterator().next().getDn().getUpName() } ) : BrowserCoreMessages.bind(
+ { entriesToDelete.iterator().next().getDn().getName() } ) : BrowserCoreMessages.bind(
BrowserCoreMessages.jobs__delete_entries_task_n, new String[]
{ Integer.toString( entriesToDelete.size() ) } ), 2 + entriesToDelete.size() );
monitor.reportProgress( " " ); //$NON-NLS-1$
@@ -263,7 +263,7 @@ public class DeleteEntriesRunnable imple
*
* @return the cumulative number of deleted entries
*/
- static int optimisticDeleteEntryRecursive( IBrowserConnection browserConnection, LdapDN dn,
+ static int optimisticDeleteEntryRecursive( IBrowserConnection browserConnection, DN dn,
boolean useManageDsaItControl, boolean useTreeDeleteControl, int numberOfDeletedEntries,
StudioProgressMonitor dummyMonitor, StudioProgressMonitor monitor )
{
@@ -298,7 +298,7 @@ public class DeleteEntriesRunnable imple
NamingEnumeration<SearchResult> result = browserConnection
.getConnection()
.getJNDIConnectionWrapper()
- .search( dn.getUpName(), ISearch.FILTER_TRUE, searchControls, aliasDereferencingMethod,
+ .search( dn.getName(), ISearch.FILTER_TRUE, searchControls, aliasDereferencingMethod,
referralsHandlingMethod, null, dummyMonitor, null );
try
@@ -307,7 +307,7 @@ public class DeleteEntriesRunnable imple
while ( !dummyMonitor.isCanceled() && !dummyMonitor.errorsReported() && result.hasMore() )
{
SearchResult sr = result.next();
- LdapDN childDn = JNDIUtils.getDn( sr );
+ DN childDn = JNDIUtils.getDn( sr );
numberOfDeletedEntries = optimisticDeleteEntryRecursive( browserConnection, childDn, false,
false, numberOfDeletedEntries, dummyMonitor, monitor );
@@ -357,7 +357,7 @@ public class DeleteEntriesRunnable imple
}
- static void deleteEntry( IBrowserConnection browserConnection, LdapDN dn, boolean useManageDsaItControl,
+ static void deleteEntry( IBrowserConnection browserConnection, DN dn, boolean useManageDsaItControl,
boolean useTreeDeleteControl, StudioProgressMonitor monitor )
{
// controls
@@ -380,7 +380,7 @@ public class DeleteEntriesRunnable imple
if ( browserConnection.getConnection() != null )
{
browserConnection.getConnection().getJNDIConnectionWrapper()
- .deleteEntry( dn.getUpName(), controls, monitor, null );
+ .deleteEntry( dn.getName(), controls, monitor, null );
}
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/EntryExistsCopyStrategyDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/EntryExistsCopyStrategyDialog.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/EntryExistsCopyStrategyDialog.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/EntryExistsCopyStrategyDialog.java Fri Oct 8 16:50:55 2010
@@ -20,8 +20,8 @@
package org.apache.directory.studio.ldapbrowser.core.jobs;
-import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -39,7 +39,7 @@ public interface EntryExistsCopyStrategy
* @param browserConnection the browser connection
* @param newLdapDn the new DN
*/
- void setExistingEntry( IBrowserConnection browserConnection, LdapDN newLdapDn );
+ void setExistingEntry( IBrowserConnection browserConnection, DN newLdapDn );
/**
@@ -56,7 +56,7 @@ public interface EntryExistsCopyStrategy
*
* @return the RDN
*/
- Rdn getRdn();
+ RDN getRdn();
/**
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java Fri Oct 8 16:50:55 2010
@@ -32,6 +32,7 @@ import java.util.Map;
import javax.naming.NamingException;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
@@ -242,7 +243,10 @@ public class ExportCsvRunnable implement
monitor.reportError( ce );
}
}
-
+ catch ( LdapInvalidDnException e )
+ {
+ monitor.reportError( e );
+ }
}
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=1005896&r1=1005895&r2=1005896&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 Fri Oct 8 16:50:55 2010
@@ -29,10 +29,8 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import javax.naming.InvalidNameException;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.directory.InvalidAttributeIdentifierException;
import javax.naming.directory.SearchResult;
import org.apache.commons.codec.digest.DigestUtils;
@@ -44,15 +42,17 @@ import org.apache.directory.shared.dsmlv
import org.apache.directory.shared.dsmlv2.reponse.SearchResultReferenceDsml;
import org.apache.directory.shared.dsmlv2.request.AddRequestDsml;
import org.apache.directory.shared.dsmlv2.request.BatchRequestDsml;
-import org.apache.directory.shared.ldap.codec.LdapResultCodec;
-import org.apache.directory.shared.ldap.codec.search.SearchResultDoneCodec;
+import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
+import org.apache.directory.shared.ldap.exception.LdapException;
+import org.apache.directory.shared.ldap.message.LdapResult;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.message.SearchResultDone;
+import org.apache.directory.shared.ldap.message.SearchResultDoneImpl;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.apache.directory.shared.ldap.util.LdapURL;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
@@ -235,9 +235,10 @@ public class ExportDsmlRunnable implemen
* the associated DSML
* @throws NamingException
* @throws LdapURLEncodingException
+ * @throws LdapException
*/
private String processAsDsmlResponse( StudioNamingEnumeration ne, StudioProgressMonitor monitor )
- throws NamingException, LdapURLEncodingException
+ throws NamingException, LdapURLEncodingException, LdapException
{
// Creating the batch reponse
BatchResponseDsml batchResponse = new BatchResponseDsml();
@@ -260,10 +261,11 @@ public class ExportDsmlRunnable implemen
* the search parameter
* @throws NamingException
* @throws LdapURLEncodingException
+ * @throws LdapException
*/
public static void processAsDsmlResponse( StudioNamingEnumeration ne, BatchResponseDsml batchResponse,
StudioProgressMonitor monitor, SearchParameter searchParameter ) throws NamingException,
- LdapURLEncodingException
+ LdapURLEncodingException, LdapException
{
// Creating and adding the search response
SearchResponseDsml sr = new SearchResponseDsml();
@@ -280,8 +282,8 @@ public class ExportDsmlRunnable implemen
}
// Creating and adding a search result done at the end of the results
- SearchResultDoneCodec srd = new SearchResultDoneCodec();
- LdapResultCodec ldapResult = new LdapResultCodec();
+ SearchResultDone srd = new SearchResultDoneImpl();
+ LdapResult ldapResult = srd.getLdapResult();
if ( !monitor.errorsReported() )
{
ldapResult.setResultCode( ResultCodeEnum.SUCCESS );
@@ -300,7 +302,6 @@ public class ExportDsmlRunnable implemen
ldapResult.setErrorMessage( t.getMessage() );
}
}
- srd.setLdapResult( ldapResult );
sr.addResponse( new SearchResultDoneDsml( srd ) );
}
@@ -312,15 +313,13 @@ public class ExportDsmlRunnable implemen
* the search result
* @return
* the associated search result entry DSML
- * @throws InvalidNameException
- * @throws InvalidAttributeIdentifierException
- * @throws LdapURLEncodingException
+ * @throws LdapException
*/
private static DsmlDecorator convertSearchResultToDsml( SearchResult searchResult, SearchParameter searchParameter )
- throws InvalidAttributeIdentifierException, InvalidNameException, LdapURLEncodingException
+ throws LdapException, LdapURLEncodingException
{
Entry entry = AttributeUtils.toClientEntry( searchResult.getAttributes(),
- new LdapDN( searchResult.getNameInNamespace() ) );
+ new DN( searchResult.getNameInNamespace() ) );
if ( isReferral( entry ) )
{
@@ -401,9 +400,10 @@ public class ExportDsmlRunnable implemen
* @return
* the associated DSML
* @throws NamingException
+ * @throws LdapException
*/
private String processAsDsmlRequest( StudioNamingEnumeration ne, StudioProgressMonitor monitor )
- throws NamingException
+ throws NamingException, LdapException
{
// Creating the batch request
BatchRequestDsml batchRequest = new BatchRequestDsml();
@@ -431,15 +431,14 @@ public class ExportDsmlRunnable implemen
* the {@link SearchResult}
* @return
* the associated {@link AddRequestDsml}
- * @throws InvalidAttributeIdentifierException
- * @throws InvalidNameException
+ * @throws LdapException
*/
private AddRequestDsml convertToAddRequestDsml( SearchResult searchResult )
- throws InvalidAttributeIdentifierException, InvalidNameException
+ throws LdapException
{
AddRequestDsml ar = new AddRequestDsml();
Entry entry = AttributeUtils.toClientEntry( searchResult.getAttributes(),
- new LdapDN( searchResult.getNameInNamespace() ) );
+ new DN( searchResult.getNameInNamespace() ) );
ar.setEntry( entry );
return ar;
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java Fri Oct 8 16:50:55 2010
@@ -36,7 +36,8 @@ import javax.naming.ldap.Control;
import javax.naming.ldap.PagedResultsResponseControl;
import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.StudioControl;
@@ -226,6 +227,10 @@ public class ExportLdifRunnable implemen
monitor.reportError( ne );
}
}
+ catch ( LdapInvalidDnException e )
+ {
+ monitor.reportError( e );
+ }
}
@@ -299,11 +304,11 @@ public class ExportLdifRunnable implemen
}
- public LdifContainer next() throws NamingException
+ public LdifContainer next() throws NamingException, LdapInvalidDnException
{
SearchResult sr = enumeration.next();
- LdapDN dn = JNDIUtils.getDn( sr );
- LdifContentRecord record = LdifContentRecord.create( dn.getUpName() );
+ DN dn = JNDIUtils.getDn( sr );
+ LdifContentRecord record = LdifContentRecord.create( dn.getName() );
NamingEnumeration<? extends Attribute> attributeEnumeration = sr.getAttributes().getAll();
while ( attributeEnumeration.hasMore() )
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java Fri Oct 8 16:50:55 2010
@@ -28,6 +28,7 @@ import java.util.Map;
import javax.naming.NamingException;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
@@ -251,6 +252,10 @@ public class ExportOdfRunnable implement
monitor.reportError( ne );
}
}
+ catch ( LdapInvalidDnException e )
+ {
+ monitor.reportError( e );
+ }
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java Fri Oct 8 16:50:55 2010
@@ -29,6 +29,7 @@ import java.util.Map;
import javax.naming.NamingException;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
@@ -267,6 +268,10 @@ public class ExportXlsRunnable implement
monitor.reportError( ne );
}
}
+ catch ( LdapInvalidDnException e )
+ {
+ monitor.reportError( e );
+ }
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java?rev=1005896&r1=1005895&r2=1005896&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/FetchBaseDNsRunnable.java Fri Oct 8 16:50:55 2010
@@ -114,7 +114,7 @@ public class FetchBaseDNsRunnable implem
{
if ( !( baseDNEntry instanceof DirectoryMetadataEntry ) )
{
- baseDNs.add( baseDNEntry.getDn().getUpName() );
+ baseDNs.add( baseDNEntry.getDn().getName() );
}
}
}