You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2008/05/18 14:52:41 UTC
svn commit: r657556 - in /directory/studio/trunk:
ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/
ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/
ldapbrowser-core/src/main/java/...
Author: seelmann
Date: Sun May 18 05:52:40 2008
New Revision: 657556
URL: http://svn.apache.org/viewvc?rev=657556&view=rev
Log:
DIRSTUDIO-329: removed internal URL class
Removed:
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/URL.java
Modified:
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java
directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyUrlAction.java
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java?rev=657556&r1=657555&r2=657556&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java Sun May 18 05:52:40 2008
@@ -23,6 +23,7 @@
import java.io.Serializable;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
@@ -73,7 +74,7 @@
*
* @return the URL of this connection
*/
- public abstract URL getUrl();
+ public abstract LdapURL getUrl();
/**
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java?rev=657556&r1=657555&r2=657556&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java Sun May 18 05:52:40 2008
@@ -23,6 +23,7 @@
import java.io.Serializable;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
@@ -413,6 +414,6 @@
*
* @return the LDAP URL of this entry
*/
- public abstract URL getUrl();
+ public abstract LdapURL getUrl();
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java?rev=657556&r1=657555&r2=657556&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java Sun May 18 05:52:40 2008
@@ -23,6 +23,7 @@
import java.io.Serializable;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
@@ -128,7 +129,7 @@
*
* @return the LDAP URL of this search
*/
- public abstract URL getUrl();
+ public abstract LdapURL getUrl();
/**
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java?rev=657556&r1=657555&r2=657556&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java Sun May 18 05:52:40 2008
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
@@ -49,8 +50,8 @@
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
-import org.apache.directory.studio.ldapbrowser.core.model.URL;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Subschema;
+import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
import org.eclipse.search.ui.ISearchPageScoreComputer;
@@ -821,9 +822,9 @@
/**
* {@inheritDoc}
*/
- public URL getUrl()
+ public LdapURL getUrl()
{
- return new URL( getBrowserConnection(), getDn() );
+ return Utils.getLdapURL( this );
}
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java?rev=657556&r1=657555&r2=657556&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java Sun May 18 05:52:40 2008
@@ -27,6 +27,7 @@
import javax.naming.InvalidNameException;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -38,7 +39,6 @@
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.IRootDSE;
-import org.apache.directory.studio.ldapbrowser.core.model.URL;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
import org.eclipse.search.ui.ISearchPageScoreComputer;
@@ -121,9 +121,9 @@
/**
* {@inheritDoc}
*/
- public URL getUrl()
+ public LdapURL getUrl()
{
- return new URL( this );
+ return Utils.getLdapURL( this );
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java?rev=657556&r1=657555&r2=657556&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java Sun May 18 05:52:40 2008
@@ -21,6 +21,7 @@
package org.apache.directory.studio.ldapbrowser.core.model.impl;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
@@ -42,8 +43,8 @@
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
-import org.apache.directory.studio.ldapbrowser.core.model.URL;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Subschema;
+import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
import org.eclipse.search.ui.ISearchPageScoreComputer;
@@ -162,7 +163,7 @@
/**
* {@inheritDoc}
*/
- public URL getUrl()
+ public LdapURL getUrl()
{
if ( getDelegate() != null )
{
@@ -170,7 +171,7 @@
}
else
{
- return new URL( getBrowserConnection(), getDn() );
+ return Utils.getLdapURL( this );
}
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java?rev=657556&r1=657555&r2=657556&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java Sun May 18 05:52:40 2008
@@ -21,6 +21,7 @@
package org.apache.directory.studio.ldapbrowser.core.model.impl;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.ldapbrowser.core.BookmarkManager;
@@ -28,7 +29,6 @@
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.IRootDSE;
-import org.apache.directory.studio.ldapbrowser.core.model.URL;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
@@ -237,7 +237,7 @@
/**
* {@inheritDoc}
*/
- public URL getUrl()
+ public LdapURL getUrl()
{
return null;
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java?rev=657556&r1=657555&r2=657556&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java Sun May 18 05:52:40 2008
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.Rdn;
@@ -41,8 +42,8 @@
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
-import org.apache.directory.studio.ldapbrowser.core.model.URL;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Subschema;
+import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
/**
@@ -223,9 +224,9 @@
/**
* {@inheritDoc}
*/
- public URL getUrl()
+ public LdapURL getUrl()
{
- return new URL( getBrowserConnection(), getDn() );
+ return Utils.getLdapURL( this );
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java?rev=657556&r1=657555&r2=657556&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java Sun May 18 05:52:40 2008
@@ -24,6 +24,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -36,7 +37,7 @@
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
-import org.apache.directory.studio.ldapbrowser.core.model.URL;
+import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
import org.eclipse.search.ui.ISearchPageScoreComputer;
@@ -165,9 +166,9 @@
/**
* {@inheritDoc}
*/
- public URL getUrl()
+ public LdapURL getUrl()
{
- return new URL( this );
+ return Utils.getLdapURL( this );
}
Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java?rev=657556&r1=657555&r2=657556&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java Sun May 18 05:52:40 2008
@@ -26,15 +26,21 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
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.studio.connection.core.ConnectionParameter.EncryptionMethod;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
+import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldifparser.LdifFormatParameters;
import org.apache.directory.studio.ldifparser.LdifUtils;
@@ -44,7 +50,6 @@
public class Utils
{
-
/**
* Transforms the given DN into a normalized String, usable by the schema cache.
* The following transformations are permformed:
@@ -286,4 +291,84 @@
return ldifFormatParameters;
}
+
+ /**
+ * Transforms an IBrowserConnection to an LdapURL. The following parameters are
+ * used to create the LDAP URL:
+ * <ul>
+ * <li>scheme
+ * <li>host
+ * <li>port
+ * </ul>
+ *
+ * @param entry the entry
+ * @return the LDAP URL
+ */
+ public static LdapURL getLdapURL( IBrowserConnection browserConnection )
+ {
+ LdapURL url = new LdapURL();
+ if ( browserConnection.getConnection().getEncryptionMethod() == EncryptionMethod.LDAPS )
+ {
+ url.setScheme( LdapURL.LDAPS_SCHEME );
+ }
+ else
+ {
+ url.setScheme( LdapURL.LDAP_SCHEME );
+ }
+ url.setHost( browserConnection.getConnection().getHost() );
+ url.setPort( browserConnection.getConnection().getPort() );
+ return url;
+ }
+
+
+ /**
+ * Transforms an IEntry to an LdapURL. The following parameters are
+ * used to create the LDAP URL:
+ * <ul>
+ * <li>scheme
+ * <li>host
+ * <li>port
+ * <li>dn
+ * </ul>
+ *
+ * @param entry the entry
+ * @return the LDAP URL
+ */
+ public static LdapURL getLdapURL( IEntry entry )
+ {
+ LdapURL url = getLdapURL( entry.getBrowserConnection() );
+ url.setDn( entry.getDn() );
+ return url;
+ }
+
+
+ /**
+ * Transforms an ISearch to an LdapURL. The following search parameters are
+ * used to create the LDAP URL:
+ * <ul>
+ * <li>scheme
+ * <li>host
+ * <li>port
+ * <li>search base
+ * <li>returning attributes
+ * <li>scope
+ * <li>filter
+ * </ul>
+ *
+ * @param search the search
+ * @return the LDAP URL
+ */
+ public static LdapURL getLdapURL( ISearch search )
+ {
+ LdapURL url = getLdapURL( search.getBrowserConnection() );
+ url.setDn( search.getSearchBase() );
+ if ( search.getReturningAttributes() != null )
+ {
+ url.setAttributes( Arrays.asList( search.getReturningAttributes() ) );
+ }
+ url.setScope( search.getScope().getOrdinal() );
+ url.setFilter( search.getFilter() );
+ return url;
+ }
+
}
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyUrlAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyUrlAction.java?rev=657556&r1=657555&r2=657556&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyUrlAction.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyUrlAction.java Sun May 18 05:52:40 2008
@@ -21,12 +21,11 @@
package org.apache.directory.studio.ldapbrowser.ui.actions;
+import org.apache.directory.shared.ldap.codec.util.LdapURL;
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
import org.apache.directory.studio.ldapbrowser.common.actions.CopyAction;
-import org.apache.directory.studio.ldapbrowser.core.model.URL;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
-
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.dnd.Transfer;
@@ -54,7 +53,7 @@
*/
public void run()
{
- URL url = null;
+ LdapURL url = null;
if ( getSelectedSearches().length > 0 )
{
url = getSelectedSearches()[0].getUrl();