svn commit: r572405 - in /directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared: ServiceConfiguration.java catalog/GetCatalog.java

[el...@apache.org]

Author: elecharny
Date: Mon Sep  3 12:26:07 2007
New Revision: 572405

URL: http://svn.apache.org/viewvc?rev=572405&view=rev
Log:
Declared some more schema constants in apachedsConstants
Changed the code accordingly to use those constants instead of Strings
Remove one OC from the apache.schema (accessControlSubentry), because it was already declared with another OID in another schema

Modified:
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java?rev=572405&r1=572404&r2=572405&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java Mon Sep  3 12:26:07 2007
@@ -42,7 +42,6 @@
     /** The default MINA buffer size. */
     public static final int DEFAULT_BUFFER_SIZE = 1024;
 
-    protected static final String APACHE_SERVICE_CONFIGURATION = "apacheServiceConfiguration";
     protected static final String SERVICE_PID = "service.pid";
     protected static final String SERVICE_FACTORYPID = "service.factoryPid";
 

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java?rev=572405&r1=572404&r2=572405&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java Mon Sep  3 12:26:07 2007
@@ -32,6 +32,7 @@
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
+import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.protocol.shared.store.ContextOperation;
 
 
@@ -44,7 +45,7 @@
 public class GetCatalog implements ContextOperation
 {
     private static final long serialVersionUID = -6657995003127926278L;
-    private static final String ENTRY = "apacheCatalogEntry";
+    private static final String ENTRY = ApacheSchemaConstants.APACHE_CATALOG_ENTRY_OC;
     private static final String ENTRY_NAME = "apacheCatalogEntryName";
     private static final String ENTRY_BASEDN = "apacheCatalogEntryBaseDn";