directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r754552 - in /directory/studio/trunk: ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/ ldapbrowser-core/...
Date Sat, 14 Mar 2009 23:36:04 GMT
Author: seelmann
Date: Sat Mar 14 23:36:03 2009
New Revision: 754552

URL: http://svn.apache.org/viewvc?rev=754552&view=rev
Log:
Use constants from shared-constants

Modified:
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IRootDSE.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/SearchParameter.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/RootDSE.java

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java?rev=754552&r1=754551&r2=754552&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java
Sat Mar 14 23:36:03 2009
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
 import org.apache.directory.studio.connection.core.Connection;
@@ -756,7 +757,7 @@
                 {
                     if ( returnAllAttributesButton.getSelection() )
                     {
-                        raList.add( ISearch.ALL_USER_ATTRIBUTES );
+                        raList.add( SchemaConstants.ALL_USER_ATTRIBUTES );
                     }
                     if ( returnAllAttributesButton.getSelection() != isActive( RETURN_ALLATTRIBUTES_CHECKED
) )
                     {
@@ -772,7 +773,7 @@
                                 .getSchema() );
                         Collection<String> opAtdNames = SchemaUtils.getNames( opAtds
);
                         raList.addAll( opAtdNames );
-                        raList.add( ISearch.ALL_OPERATIONAL_ATTRIBUTES );
+                        raList.add( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES );
                     }
                     if ( returnOperationalAttributesButton.getSelection() != isActive( RETURN_OPERATIONALATTRIBUTES_CHECKED
) )
                     {

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java?rev=754552&r1=754551&r2=754552&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
Sat Mar 14 23:36:03 2009
@@ -27,6 +27,7 @@
 import javax.naming.InvalidNameException;
 
 import org.apache.commons.lang.ArrayUtils;
+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;
@@ -43,7 +44,6 @@
 import org.apache.directory.studio.ldapbrowser.core.jobs.ReadEntryRunnable;
 import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
 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.IValue;
 import org.apache.directory.studio.ldapbrowser.core.model.impl.Attribute;
 import org.apache.directory.studio.ldapbrowser.core.model.impl.DummyEntry;
@@ -160,7 +160,7 @@
         if ( wizard.isNewContextEntry() )
         {
             IAttribute attribute = wizard.getSelectedConnection().getRootDSE().getAttribute(
-                IRootDSE.ROOTDSE_ATTRIBUTE_NAMINGCONTEXTS );
+                SchemaConstants.NAMING_CONTEXTS_AT );
             if ( attribute != null )
             {
                 String[] values = attribute.getStringValues();

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java?rev=754552&r1=754551&r2=754552&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java
Sat Mar 14 23:36:03 2009
@@ -210,7 +210,7 @@
         SearchControls searchControls = new SearchControls();
         searchControls.setCountLimit( 1 );
         searchControls.setReturningAttributes( new String[]
-            { ISearch.ALL_USER_ATTRIBUTES, SchemaConstants.REF_AT } );
+            { SchemaConstants.ALL_USER_ATTRIBUTES, SchemaConstants.REF_AT } );
         searchControls.setSearchScope( SearchControls.OBJECT_SCOPE );
         Control[] controls = null;
         NamingEnumeration<SearchResult> result = entryToCopy.getBrowserConnection().getConnection()
@@ -373,7 +373,7 @@
                         SearchControls searchControls = new SearchControls();
                         searchControls.setCountLimit( 0 );
                         searchControls.setReturningAttributes( new String[]
-                            { ISearch.ALL_USER_ATTRIBUTES, SchemaConstants.REF_AT } );
+                            { SchemaConstants.ALL_USER_ATTRIBUTES, SchemaConstants.REF_AT
} );
                         searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
                         NamingEnumeration<SearchResult> childEntries = sourceBrowserConnection.getConnection()
                             .getJNDIConnectionWrapper().search( oldLdapDn.getUpName(), ISearch.FILTER_TRUE,

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java?rev=754552&r1=754551&r2=754552&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java
Sat Mar 14 23:36:03 2009
@@ -169,13 +169,13 @@
         // get user attributes or both user and operational attributes
         String[] returningAttributes = null;
         LinkedHashSet<String> raSet = new LinkedHashSet<String>();
-        raSet.add( ISearch.ALL_USER_ATTRIBUTES );
+        raSet.add( SchemaConstants.ALL_USER_ATTRIBUTES );
         if ( initOperationalAttributes )
         {
             if ( entry.getBrowserConnection().getRootDSE().isFeatureSupported(
-                IRootDSE.FEATURE_ALL_OPERATIONAL_ATTRIBUTES_OID ) )
+                SchemaConstants.FEATURE_ALL_OPERATIONAL_ATTRIBUTES ) )
             {
-                raSet.add( ISearch.ALL_OPERATIONAL_ATTRIBUTES );
+                raSet.add( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES );
             }
             else
             {

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java?rev=754552&r1=754551&r2=754552&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
Sat Mar 14 23:36:03 2009
@@ -30,6 +30,7 @@
 
 import javax.naming.InvalidNameException;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 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;
@@ -62,11 +63,11 @@
 
     /** The requested attributes when reading the Root DSE. */
     public static final String[] ROOT_DSE_ATTRIBUTES =
-        { IRootDSE.ROOTDSE_ATTRIBUTE_NAMINGCONTEXTS, IRootDSE.ROOTDSE_ATTRIBUTE_SUBSCHEMASUBENTRY,
-            IRootDSE.ROOTDSE_ATTRIBUTE_SUPPORTEDLDAPVERSION, IRootDSE.ROOTDSE_ATTRIBUTE_SUPPORTEDSASLMECHANISM,
-            IRootDSE.ROOTDSE_ATTRIBUTE_SUPPORTEDEXTENSION, IRootDSE.ROOTDSE_ATTRIBUTE_SUPPORTEDCONTROL,
-            IRootDSE.ROOTDSE_ATTRIBUTE_SUPPORTEDFEATURES, IRootDSE.ROOTDSE_ATTRIBUTE_VENDORNAME,
-            IRootDSE.ROOTDSE_ATTRIBUTE_VENDORVERSION, ISearch.ALL_OPERATIONAL_ATTRIBUTES
};
+        { SchemaConstants.NAMING_CONTEXTS_AT, SchemaConstants.SUBSCHEMA_SUBENTRY_AT,
+            SchemaConstants.SUPPORTED_LDAP_VERSION_AT, SchemaConstants.SUPPORTED_SASL_MECHANISMS_AT,
+            SchemaConstants.SUPPORTED_EXTENSION_AT, SchemaConstants.SUPPORTED_CONTROL_AT,
+            SchemaConstants.SUPPORTED_FEATURES_AT, SchemaConstants.VENDOR_NAME_AT, SchemaConstants.VENDOR_VERSION_AT,
+            SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES };
 
     private IRootDSE rootDSE;
 
@@ -191,7 +192,7 @@
 
         // load all user attributes
         search = new Search( null, browserConnection, LdapDN.EMPTY_LDAPDN, ISearch.FILTER_TRUE,
new String[]
-            { ISearch.ALL_USER_ATTRIBUTES }, SearchScope.OBJECT, 0, 0, Connection.AliasDereferencingMethod.NEVER,
+            { SchemaConstants.ALL_USER_ATTRIBUTES }, SearchScope.OBJECT, 0, 0, Connection.AliasDereferencingMethod.NEVER,
             Connection.ReferralHandlingMethod.IGNORE, false, null );
         SearchRunnable.searchAndUpdateModel( browserConnection, search, monitor );
 
@@ -216,8 +217,7 @@
         {
             // get base DNs from namingContexts attribute
             Set<String> namingContextSet = new HashSet<String>();
-            IAttribute attribute = browserConnection.getRootDSE().getAttribute(
-                IRootDSE.ROOTDSE_ATTRIBUTE_NAMINGCONTEXTS );
+            IAttribute attribute = browserConnection.getRootDSE().getAttribute( SchemaConstants.NAMING_CONTEXTS_AT
);
             if ( attribute != null )
             {
                 String[] values = attribute.getStringValues();
@@ -265,8 +265,7 @@
         }
 
         // 2nd: add schema sub-entry
-        IEntry[] schemaEntries = getDirectoryMetadataEntries( browserConnection,
-            IRootDSE.ROOTDSE_ATTRIBUTE_SUBSCHEMASUBENTRY );
+        IEntry[] schemaEntries = getDirectoryMetadataEntries( browserConnection, SchemaConstants.SUBSCHEMA_SUBENTRY_AT
);
         for ( IEntry entry : schemaEntries )
         {
             if ( entry instanceof DirectoryMetadataEntry )

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java?rev=754552&r1=754551&r2=754552&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java
Sat Mar 14 23:36:03 2009
@@ -34,7 +34,6 @@
 import org.apache.directory.studio.ldapbrowser.core.events.BrowserConnectionUpdateEvent;
 import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
-import org.apache.directory.studio.ldapbrowser.core.model.IRootDSE;
 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.schema.Schema;
@@ -263,7 +262,7 @@
             sp.setSearchBase( new LdapDN() );
             sp.setScope( SearchScope.OBJECT );
             sp.setReturningAttributes( new String[]
-                { IRootDSE.ROOTDSE_ATTRIBUTE_SUBSCHEMASUBENTRY } );
+                { SchemaConstants.SUBSCHEMA_SUBENTRY_AT } );
             NamingEnumeration<SearchResult> enumeration = SearchRunnable.search( browserConnection,
sp, monitor );
             while ( enumeration != null && enumeration.hasMore() )
             {
@@ -272,7 +271,7 @@
                 while ( attributes.hasMore() )
                 {
                     Attribute attribute = attributes.next();
-                    if ( attribute.getID().equalsIgnoreCase( IRootDSE.ROOTDSE_ATTRIBUTE_SUBSCHEMASUBENTRY
) )
+                    if ( attribute.getID().equalsIgnoreCase( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
) )
                     {
                         String value = ( String ) attribute.get();
                         if ( LdapDN.isValid( value ) )

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java?rev=754552&r1=754551&r2=754552&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
Sat Mar 14 23:36:03 2009
@@ -56,7 +56,6 @@
 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.IRootDSE;
 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;
@@ -532,7 +531,7 @@
         if ( !Utils.containsIgnoreCase( Arrays.asList( searchParameter.getReturningAttributes()
),
             SchemaConstants.OBJECT_CLASS_AT )
             && !Utils.containsIgnoreCase( Arrays.asList( searchParameter.getReturningAttributes()
),
-                ISearch.ALL_USER_ATTRIBUTES ) )
+                SchemaConstants.ALL_USER_ATTRIBUTES ) )
         {
             String[] returningAttributes = new String[searchParameter.getReturningAttributes().length
+ 1];
             System.arraycopy( searchParameter.getReturningAttributes(), 0, returningAttributes,
0, searchParameter
@@ -547,10 +546,9 @@
             IBrowserConnection connection = search.getBrowserConnection();
             Set<String> supportedConrolSet = new HashSet<String>();
             if ( connection.getRootDSE() != null
-                && connection.getRootDSE().getAttribute( IRootDSE.ROOTDSE_ATTRIBUTE_SUPPORTEDCONTROL
) != null )
+                && connection.getRootDSE().getAttribute( SchemaConstants.SUPPORTED_CONTROL_AT
) != null )
             {
-                IAttribute scAttribute = connection.getRootDSE().getAttribute(
-                    IRootDSE.ROOTDSE_ATTRIBUTE_SUPPORTEDCONTROL );
+                IAttribute scAttribute = connection.getRootDSE().getAttribute( SchemaConstants.SUPPORTED_CONTROL_AT
);
                 String[] supportedControls = scAttribute.getStringValues();
                 for ( int i = 0; i < supportedControls.length; i++ )
                 {
@@ -752,7 +750,7 @@
                 String[] ras = searchParameter.getReturningAttributes();
 
                 // special case *
-                if ( Arrays.asList( ras ).contains( ISearch.ALL_USER_ATTRIBUTES ) )
+                if ( Arrays.asList( ras ).contains( SchemaConstants.ALL_USER_ATTRIBUTES )
)
                 {
                     // clear all user attributes
                     IAttribute[] oldAttributes = entry.getAttributes();
@@ -766,7 +764,7 @@
                 }
 
                 // special case +
-                if ( Arrays.asList( ras ).contains( ISearch.ALL_OPERATIONAL_ATTRIBUTES )
)
+                if ( Arrays.asList( ras ).contains( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES
) )
                 {
                     // clear all operational attributes
                     IAttribute[] oldAttributes = entry.getAttributes();

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java?rev=754552&r1=754551&r2=754552&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
Sat Mar 14 23:36:03 2009
@@ -28,6 +28,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
 import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
@@ -230,13 +231,14 @@
         AttributeTypeDescription otherAtd = schema.getAttributeTypeDescription( other.getParsedAttributeType()
);
 
         // special case *: all user attributes (RFC4511)
-        if ( ISearch.ALL_USER_ATTRIBUTES.equals( other.description ) && !SchemaUtils.isOperational(
myAtd ) )
+        if ( SchemaConstants.ALL_USER_ATTRIBUTES.equals( other.description ) && !SchemaUtils.isOperational(
myAtd ) )
         {
             return true;
         }
 
         // special case +: all operational attributes (RFC3673)
-        if ( ISearch.ALL_OPERATIONAL_ATTRIBUTES.equals( other.description ) && SchemaUtils.isOperational(
myAtd ) )
+        if ( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES.equals( other.description )
+            && SchemaUtils.isOperational( myAtd ) )
         {
             return true;
         }

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IRootDSE.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IRootDSE.java?rev=754552&r1=754551&r2=754552&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IRootDSE.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IRootDSE.java
Sat Mar 14 23:36:03 2009
@@ -30,49 +30,6 @@
 public interface IRootDSE extends IEntry
 {
 
-    /** The namingContexts attribute */
-    public static final String ROOTDSE_ATTRIBUTE_NAMINGCONTEXTS = "namingContexts"; //$NON-NLS-1$
-
-    /** The subschemaSubentry attribute */
-    public static final String ROOTDSE_ATTRIBUTE_SUBSCHEMASUBENTRY = "subschemaSubentry";
//$NON-NLS-1$
-
-    /** The monitorContext attribute */
-    public static final String ROOTDSE_ATTRIBUTE_MONITORCONTEXT = "monitorContext"; //$NON-NLS-1$
-
-    /** The configContext attribute */
-    public static final String ROOTDSE_ATTRIBUTE_CONFIGCONTEXT = "configContext"; //$NON-NLS-1$
-
-    /** The dsaName attribute */
-    public static final String ROOTDSE_ATTRIBUTE_DSANAME = "dsaName"; //$NON-NLS-1$
-
-    /** The supportedExtension attribute */
-    public static final String ROOTDSE_ATTRIBUTE_SUPPORTEDEXTENSION = "supportedExtension";
//$NON-NLS-1$
-
-    /** The supportedControl attribute */
-    public static final String ROOTDSE_ATTRIBUTE_SUPPORTEDCONTROL = "supportedControl"; //$NON-NLS-1$
-
-    /** The supportedFeatures attribute */
-    public static final String ROOTDSE_ATTRIBUTE_SUPPORTEDFEATURES = "supportedFeatures";
//$NON-NLS-1$
-
-    /** The supportedLDAPVersion attribute */
-    public static final String ROOTDSE_ATTRIBUTE_SUPPORTEDLDAPVERSION = "supportedLDAPVersion";
//$NON-NLS-1$
-
-    /** The altServer attribute */
-    public static final String ROOTDSE_ATTRIBUTE_ALTSERVER = "altServer"; //$NON-NLS-1$
-
-    /** The supportedSASLMechanisms attribute */
-    public static final String ROOTDSE_ATTRIBUTE_SUPPORTEDSASLMECHANISM = "supportedSASLMechanisms";
//$NON-NLS-1$
-    
-    /** The vendorName attribute */
-    public static final String ROOTDSE_ATTRIBUTE_VENDORNAME = "vendorName"; //$NON-NLS-1$
-
-    /** The vendorVersion attribute */
-    public static final String ROOTDSE_ATTRIBUTE_VENDORVERSION = "vendorVersion"; //$NON-NLS-1$
-    
-    /** The OID of feature 'All Operational Attributes' */
-    public static final String FEATURE_ALL_OPERATIONAL_ATTRIBUTES_OID = "1.3.6.1.4.1.4203.1.5.1";
//$NON-NLS-1$
-
-
     /**
      * Gets the supported extensions.
      * 

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=754552&r1=754551&r2=754552&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
Sat Mar 14 23:36:03 2009
@@ -46,12 +46,6 @@
     /** Constant for empty search base */
     public static final LdapDN EMPTY_SEARCH_BASE = new LdapDN(); //$NON-NLS-1$
 
-    /** The returning attribute shortcut for all user attributes '*' */
-    public static final String ALL_USER_ATTRIBUTES = "*"; //$NON-NLS-1$
-
-    /** The returning attribute shortcut for all operational attributes '+' */
-    public static final String ALL_OPERATIONAL_ATTRIBUTES = "+"; //$NON-NLS-1$
-
     /** Constant for no returning attributes, an empty array */
     public static final String[] NO_ATTRIBUTES = new String[0];
 

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java?rev=754552&r1=754551&r2=754552&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java
Sat Mar 14 23:36:03 2009
@@ -27,6 +27,7 @@
 
 import javax.naming.InvalidNameException;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
 import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
@@ -211,7 +212,7 @@
         if ( returningAttributes == null )
         {
             returningAttributes = new String[]
-                { ISearch.ALL_USER_ATTRIBUTES };
+                { SchemaConstants.ALL_USER_ATTRIBUTES };
         }
         this.returningAttributes = returningAttributes;
     }

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/RootDSE.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/RootDSE.java?rev=754552&r1=754551&r2=754552&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/RootDSE.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/RootDSE.java
Sat Mar 14 23:36:03 2009
@@ -23,6 +23,7 @@
 
 import java.util.Arrays;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -72,7 +73,7 @@
      */
     public String[] getSupportedExtensions()
     {
-        return getAttributeValues( IRootDSE.ROOTDSE_ATTRIBUTE_SUPPORTEDEXTENSION );
+        return getAttributeValues( SchemaConstants.SUPPORTED_EXTENSION_AT );
     }
 
 
@@ -81,7 +82,7 @@
      */
     public String[] getSupportedControls()
     {
-        return getAttributeValues( IRootDSE.ROOTDSE_ATTRIBUTE_SUPPORTEDCONTROL );
+        return getAttributeValues( SchemaConstants.SUPPORTED_CONTROL_AT );
     }
 
 
@@ -90,7 +91,7 @@
      */
     public String[] getSupportedFeatures()
     {
-        return getAttributeValues( IRootDSE.ROOTDSE_ATTRIBUTE_SUPPORTEDFEATURES );
+        return getAttributeValues( SchemaConstants.SUPPORTED_FEATURES_AT );
     }
 
 



Mime
View raw message