You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2009/08/29 02:02:49 UTC
svn commit: r809071 - in /directory/shared/branches/shared-schema: ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/ ldap-schema-loader/ ldap-schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/ ldap-schema...

Author: akarasulu
Date: Sat Aug 29 00:02:48 2009
New Revision: 809071

URL: http://svn.apache.org/viewvc?rev=809071&view=rev
Log:
adding constants and making shared projects compile 100%

Added:
    directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/
    directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/
    directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/
    directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/
      - copied from r809062, directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/
Removed:
    directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/
Modified:
    directory/shared/branches/shared-schema/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java
    directory/shared/branches/shared-schema/ldap-schema-loader/pom.xml
    directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/AttributeClassLoader.java
    directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/LdifSchemaLoader.java
    directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java
    directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/loader/ldif/LdifSchemaLoaderTest.java

Modified: directory/shared/branches/shared-schema/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java?rev=809071&r1=809070&r2=809071&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java (original)
+++ directory/shared/branches/shared-schema/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java Sat Aug 29 00:02:48 2009
@@ -17,7 +17,7 @@
  *   under the License.
  *
  */
-package org.apache.directory.server.constants;
+package org.apache.directory.shared.ldap.constants;
 
 
 /**

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/pom.xml?rev=809071&r1=809070&r2=809071&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/pom.xml (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/pom.xml Sat Aug 29 00:02:48 2009
@@ -37,7 +37,7 @@
   
   <dependencies>
     <dependency>
-      <artifactId>shared-ldap-constants</artifactId>
+      <artifactId>shared-ldap</artifactId>
       <groupId>${pom.groupId}</groupId>
       <version>${pom.version}</version>
     </dependency>

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/AttributeClassLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/AttributeClassLoader.java?rev=809071&r1=809062&r2=809071&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/AttributeClassLoader.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/AttributeClassLoader.java Sat Aug 29 00:02:48 2009
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.loader.ldif;
+package org.apache.directory.shared.schema.loader.ldif;
 
 
 import javax.naming.NamingException;

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/LdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/LdifSchemaLoader.java?rev=809071&r1=809062&r2=809071&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/LdifSchemaLoader.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/LdifSchemaLoader.java Sat Aug 29 00:02:48 2009
@@ -17,11 +17,10 @@
  *  under the License.
  *
  */
-package org.apache.directory.server.schema.loader.ldif;
+package org.apache.directory.shared.schema.loader.ldif;
 
 
-import org.apache.directory.server.constants.MetaSchemaConstants;
-import org.apache.directory.server.constants.ServerDNConstants;
+import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.DITContentRule;
@@ -110,6 +109,13 @@
     /** name of the directory containing matchingRuleUses */
     private static final String MATCHING_RULE_USES_DIRNAME = "matchingRuleUse";
 
+    /**
+     * the administrator DN - very ADS specific but we need some DN here for
+     * the modifiers name when the system modifies by itself enabled and 
+     * disabled schemas in the repository.
+     */
+    private static final String ADMIN_SYSTEM_DN = "uid=admin,ou=system";
+
     /** the factory that generates respective SchemaObjects from LDIF entries */
     private final SchemaEntityFactory factory = new SchemaEntityFactory();
     
@@ -308,8 +314,7 @@
         entry.removeAttributes( SchemaConstants.MODIFY_TIMESTAMP_AT );
         entry.removeAttributes( MetaSchemaConstants.M_DISABLED_AT );
         
-        entry.add( SchemaConstants.MODIFIERS_NAME_AT, 
-            ServerDNConstants.ADMIN_SYSTEM_DN );
+        entry.add( SchemaConstants.MODIFIERS_NAME_AT, ADMIN_SYSTEM_DN );
         entry.add( SchemaConstants.MODIFY_TIMESTAMP_AT, 
             DateUtils.getGeneralizedTime() );
         
@@ -332,8 +337,7 @@
         entry.removeAttributes( SchemaConstants.MODIFIERS_NAME_AT );
         entry.removeAttributes( SchemaConstants.MODIFY_TIMESTAMP_AT );
 
-        entry.add( SchemaConstants.MODIFIERS_NAME_AT, 
-            ServerDNConstants.ADMIN_SYSTEM_DN );
+        entry.add( SchemaConstants.MODIFIERS_NAME_AT, ADMIN_SYSTEM_DN );
         entry.add( SchemaConstants.MODIFY_TIMESTAMP_AT, 
             DateUtils.getGeneralizedTime() );
         

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java?rev=809071&r1=809062&r2=809071&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/SchemaEntityFactory.java Sat Aug 29 00:02:48 2009
@@ -17,7 +17,8 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.schema.loader.ldif;
+package org.apache.directory.shared.schema.loader.ldif;
+
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -27,7 +28,7 @@
 
 import javax.naming.NamingException;
 
-import org.apache.directory.server.constants.MetaSchemaConstants;
+import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Entry;

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/loader/ldif/LdifSchemaLoaderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/loader/ldif/LdifSchemaLoaderTest.java?rev=809071&r1=809070&r2=809071&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/loader/ldif/LdifSchemaLoaderTest.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/loader/ldif/LdifSchemaLoaderTest.java Sat Aug 29 00:02:48 2009
@@ -24,6 +24,8 @@
 
 import java.io.File;
 
+import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
+
 
 /**
  * Tests the LdifSchemaLoader.