directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1073173 - /directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java
Date Mon, 21 Feb 2011 22:18:35 GMT
Author: seelmann
Date: Mon Feb 21 22:18:34 2011
New Revision: 1073173

URL: http://svn.apache.org/viewvc?rev=1073173&view=rev
Log:
Resource path is always a forward slash, even on Windows

Modified:
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java?rev=1073173&r1=1073172&r2=1073173&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java
(original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java
Mon Feb 21 22:18:34 2011
@@ -159,8 +159,8 @@ public class JarLdifSchemaLoader extends
      */
     private String getSchemaDirectoryString( Schema schema )
     {
-        return "schema" + File.separator + "ou=schema" + File.separator
-                        + "cn=" + Strings.lowerCase(schema.getSchemaName()) + File.separator;
+        return "schema" + "/" + "ou=schema" + "/"
+                        + "cn=" + Strings.lowerCase(schema.getSchemaName()) + "/";
     }
 
 
@@ -179,7 +179,7 @@ public class JarLdifSchemaLoader extends
         for ( Schema schema : schemas )
         {
             String start = getSchemaDirectoryString( schema )
-                + SchemaConstants.COMPARATORS_PATH + File.separator + "m-oid=";
+                + SchemaConstants.COMPARATORS_PATH + "/" + "m-oid=";
             String end = "." + LDIF_EXT;
 
             for ( String resourcePath : RESOURCE_MAP.keySet() )
@@ -215,7 +215,7 @@ public class JarLdifSchemaLoader extends
         for ( Schema schema : schemas )
         {
             String start = getSchemaDirectoryString( schema )
-                + SchemaConstants.SYNTAX_CHECKERS_PATH + File.separator + "m-oid=";
+                + SchemaConstants.SYNTAX_CHECKERS_PATH + "/" + "m-oid=";
             String end = "." + LDIF_EXT;
 
             for ( String resourcePath : RESOURCE_MAP.keySet() )
@@ -251,7 +251,7 @@ public class JarLdifSchemaLoader extends
         for ( Schema schema : schemas )
         {
             String start = getSchemaDirectoryString( schema )
-                + SchemaConstants.NORMALIZERS_PATH + File.separator + "m-oid=";
+                + SchemaConstants.NORMALIZERS_PATH + "/" + "m-oid=";
             String end = "." + LDIF_EXT;
 
             for ( String resourcePath : RESOURCE_MAP.keySet() )
@@ -287,7 +287,7 @@ public class JarLdifSchemaLoader extends
         for ( Schema schema : schemas )
         {
             String start = getSchemaDirectoryString( schema )
-                + SchemaConstants.MATCHING_RULES_PATH + File.separator + "m-oid=";
+                + SchemaConstants.MATCHING_RULES_PATH + "/" + "m-oid=";
             String end = "." + LDIF_EXT;
 
             for ( String resourcePath : RESOURCE_MAP.keySet() )
@@ -323,7 +323,7 @@ public class JarLdifSchemaLoader extends
         for ( Schema schema : schemas )
         {
             String start = getSchemaDirectoryString( schema )
-                + SchemaConstants.SYNTAXES_PATH + File.separator + "m-oid=";
+                + SchemaConstants.SYNTAXES_PATH + "/" + "m-oid=";
             String end = "." + LDIF_EXT;
 
             for ( String resourcePath : RESOURCE_MAP.keySet() )
@@ -360,7 +360,7 @@ public class JarLdifSchemaLoader extends
         {
             // check that the attributeTypes directory exists for the schema
             String start = getSchemaDirectoryString( schema )
-                    + SchemaConstants.ATTRIBUTES_TYPE_PATH + File.separator + "m-oid=";
+                    + SchemaConstants.ATTRIBUTES_TYPE_PATH + "/" + "m-oid=";
             String end = "." + LDIF_EXT;
             
             // get list of attributeType LDIF schema files in attributeTypes
@@ -397,7 +397,7 @@ public class JarLdifSchemaLoader extends
         for ( Schema schema : schemas )
         {
             String start = getSchemaDirectoryString( schema )
-                + SchemaConstants.MATCHING_RULE_USE_PATH + File.separator + "m-oid=";
+                + SchemaConstants.MATCHING_RULE_USE_PATH + "/" + "m-oid=";
             String end = "." + LDIF_EXT;
 
             for ( String resourcePath : RESOURCE_MAP.keySet() )
@@ -433,7 +433,7 @@ public class JarLdifSchemaLoader extends
         for ( Schema schema : schemas )
         {
             String start = getSchemaDirectoryString( schema )
-                + SchemaConstants.NAME_FORMS_PATH + File.separator + "m-oid=";
+                + SchemaConstants.NAME_FORMS_PATH + "/" + "m-oid=";
             String end = "." + LDIF_EXT;
 
             for ( String resourcePath : RESOURCE_MAP.keySet() )
@@ -469,7 +469,7 @@ public class JarLdifSchemaLoader extends
         for ( Schema schema : schemas )
         {
             String start = getSchemaDirectoryString( schema )
-                + SchemaConstants.DIT_CONTENT_RULES_PATH + File.separator + "m-oid=";
+                + SchemaConstants.DIT_CONTENT_RULES_PATH + "/" + "m-oid=";
             String end = "." + LDIF_EXT;
 
             for ( String resourcePath : RESOURCE_MAP.keySet() )
@@ -505,7 +505,7 @@ public class JarLdifSchemaLoader extends
         for ( Schema schema : schemas )
         {
             String start = getSchemaDirectoryString( schema )
-                + SchemaConstants.DIT_STRUCTURE_RULES_PATH + File.separator + "m-oid=";
+                + SchemaConstants.DIT_STRUCTURE_RULES_PATH + "/" + "m-oid=";
             String end = "." + LDIF_EXT;
 
             for ( String resourcePath : RESOURCE_MAP.keySet() )
@@ -542,7 +542,7 @@ public class JarLdifSchemaLoader extends
         {
             // get objectClasses directory, check if exists, return if not
             String start = getSchemaDirectoryString( schema )
-                + SchemaConstants.OBJECT_CLASSES_PATH + File.separator + "m-oid=";
+                + SchemaConstants.OBJECT_CLASSES_PATH + "/" + "m-oid=";
             String end = "." + LDIF_EXT;
 
             for ( String resourcePath : RESOURCE_MAP.keySet() )



Mime
View raw message