directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1059090 - in /directory/shared/branches/shared-AP: all/ dsml-engine/ i18n/ ldap-schema/ ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/ ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manage...
Date Fri, 14 Jan 2011 18:12:03 GMT
Author: elecharny
Date: Fri Jan 14 18:12:02 2011
New Revision: 1059090

URL: http://svn.apache.org/viewvc?rev=1059090&view=rev
Log:
Merged back the trunk into my branch

Added:
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AllAttributeValuesTest.java
      - copied unchanged from r1059086, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AllAttributeValuesTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeTypeTest.java
      - copied unchanged from r1059086, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeTypeTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java
      - copied unchanged from r1059086, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_ClassesTest.java
      - copied unchanged from r1059086, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_ClassesTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java
      - copied unchanged from r1059086, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java
      - copied unchanged from r1059086, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java
      - copied unchanged from r1059086, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java
      - copied unchanged from r1059086, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java
      - copied unchanged from r1059086, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java
      - copied unchanged from r1059086, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java
      - copied unchanged from r1059086, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java
Removed:
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AllAttributeValuesTest.java
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeTypeTest.java
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_ClassesTest.java
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java
Modified:
    directory/shared/branches/shared-AP/all/   (props changed)
    directory/shared/branches/shared-AP/dsml-engine/   (props changed)
    directory/shared/branches/shared-AP/i18n/   (props changed)
    directory/shared/branches/shared-AP/i18n/pom.xml
    directory/shared/branches/shared-AP/ldap/   (props changed)
    directory/shared/branches/shared-AP/ldap-schema/   (props changed)
    directory/shared/branches/shared-AP/ldap-schema/pom.xml
    directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java
    directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java
    directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/
  (props changed)
    directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
  (props changed)
    directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apachemeta/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.0.3.4.ldif
    directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java
  (props changed)
    directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java

Propchange: directory/shared/branches/shared-AP/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:12:02 2011
@@ -2,3 +2,4 @@
 /directory/shared/branches/shared-config/all:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/all:980352-980933
 /directory/shared/branches-dnfactory-experiment/all:980350-980351
+/directory/shared/trunk/all:1049008-1059086

Propchange: directory/shared/branches/shared-AP/dsml-engine/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jan 14 18:12:02 2011
@@ -0,0 +1,7 @@
+/directory/shared/branches/shared-codec-merge/dsml-engine:982370-987558
+/directory/shared/branches/shared-config/dsml-engine:1023444-1029061
+/directory/shared/branches/shared-replication/dsml-engine:749791-764113
+/directory/shared/branches/shared-schema/dsml-engine:806622-896441
+/directory/shared/branches/shared-subtree/dsml-engine:965208-965686
+/directory/shared/branches/xdbm-refactoring/dsml-engine:945830-946347
+/directory/shared/trunk/dsml-engine:1049008-1059086

Propchange: directory/shared/branches/shared-AP/i18n/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jan 14 18:12:02 2011
@@ -3,3 +3,4 @@
 .project
 .settings
 target
+META-INF

Propchange: directory/shared/branches/shared-AP/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:12:02 2011
@@ -3,4 +3,4 @@
 /directory/shared/branches/shared-config/i18n:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/i18n:980352-980933
 /directory/shared/branches-dnfactory-experiment/i18n:980350-980351
-/directory/shared/trunk/i18n:1058734
+/directory/shared/trunk/i18n:1049008-1059086

Modified: directory/shared/branches/shared-AP/i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/i18n/pom.xml?rev=1059090&r1=1059089&r2=1059090&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/i18n/pom.xml (original)
+++ directory/shared/branches/shared-AP/i18n/pom.xml Fri Jan 14 18:12:02 2011
@@ -41,15 +41,26 @@
       </plugin>
 
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <inherited>true</inherited>
         <extensions>true</extensions>
         <configuration>
+          <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
-            <Bundle-Name>${pom.artifactId}</Bundle-Name>
-            <Bundle-Version>${pom.version}</Bundle-Version>
+            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>${project.name}</Bundle-Name>
             <Export-Package>org.apache.directory.shared.i18n</Export-Package>
           </instructions>
         </configuration>

Propchange: directory/shared/branches/shared-AP/ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:12:02 2011
@@ -2,4 +2,4 @@
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
-/directory/shared/trunk/ldap:1049008-1051100
+/directory/shared/trunk/ldap:1049008-1059086

Propchange: directory/shared/branches/shared-AP/ldap-schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:12:02 2011
@@ -8,4 +8,4 @@
 /directory/shared/branches/shared-subtree/ldap-schema:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema:980350-980351
-/directory/shared/trunk/ldap-schema:1049008-1051100
+/directory/shared/trunk/ldap-schema:1049008-1059086

Modified: directory/shared/branches/shared-AP/ldap-schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/pom.xml?rev=1059090&r1=1059089&r2=1059090&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/pom.xml (original)
+++ directory/shared/branches/shared-AP/ldap-schema/pom.xml Fri Jan 14 18:12:02 2011
@@ -79,7 +79,7 @@
             <configuration>
               <target>
                 <!-- Various properties -->
-                <property name="schema.index" value="target/classes/META-INF/apacheds-schema.index"/>
+                <property name="schema.index" value="target/generated-resources/apacheds/META-INF/apacheds-schema.index"/>
                 <property name="schema.location" value="src${file.separator}main${file.separator}resources${file.separator}"/>
               
                 <!-- Listing all LDIF files under schema location -->
@@ -110,5 +110,13 @@
         </executions>
       </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>target/generated-resources/apacheds</directory>
+      </resource>
+    </resources>
   </build>
 </project>

Modified: directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java?rev=1059090&r1=1059089&r2=1059090&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java
(original)
+++ directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java
Fri Jan 14 18:12:02 2011
@@ -39,6 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.ResourceMap;
 import org.apache.directory.shared.ldap.schema.registries.AbstractSchemaLoader;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
+import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -159,7 +160,7 @@ public class JarLdifSchemaLoader extends
     private String getSchemaDirectory( Schema schema )
     {
         return "schema" + SEPARATOR_PATTERN + "ou=schema" + SEPARATOR_PATTERN
-                        + "cn=" + schema.getSchemaName() + SEPARATOR_PATTERN;
+                        + "cn=" + StringTools.lowerCase( schema.getSchemaName() ) + SEPARATOR_PATTERN;
     }
 
 

Modified: directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java?rev=1059090&r1=1059089&r2=1059090&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java
(original)
+++ directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java
Fri Jan 14 18:12:02 2011
@@ -35,6 +35,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.apache.directory.shared.ldap.schema.registries.AbstractSchemaLoader;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
+import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -242,7 +243,7 @@ public class LdifSchemaLoader extends Ab
      */
     private File getSchemaDirectory( Schema schema )
     {
-        return new File( new File( baseDirectory, SchemaConstants.OU_SCHEMA ), "cn=" + schema.getSchemaName()
);
+        return new File( new File( baseDirectory, SchemaConstants.OU_SCHEMA ), "cn=" + StringTools.lowerCase(
schema.getSchemaName() ) );
     }
 
 

Propchange: directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:12:02 2011
@@ -7,5 +7,5 @@
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:980350-980351
-/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:1049008-1051100
+/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:1049008-1059086
 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-894844*

Propchange: directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:12:02 2011
@@ -7,5 +7,5 @@
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:980350-980351
-/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:1049008-1051100
+/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:1049008-1059086
 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-894844

Modified: directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apachemeta/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.0.3.4.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.0.3.4.ldif?rev=1059090&r1=1059089&r2=1059090&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apachemeta/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.0.3.4.ldif
(original)
+++ directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apachemeta/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.0.3.4.ldif
Fri Jan 14 18:12:02 2011
@@ -10,3 +10,5 @@ objectclass: top
 m-name: metaSyntax
 m-typeobjectclass: STRUCTURAL
 creatorsname: uid=admin,ou=system
+m-may: x-humanReadable
+m-may: m-obsolete

Propchange: directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:12:02 2011
@@ -5,5 +5,5 @@
 /directory/shared/branches/shared-subtree/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351
-/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:1049008-1051100
+/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:1049008-1059086
 /directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502

Modified: directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java?rev=1059090&r1=1059089&r2=1059090&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java
(original)
+++ directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/AbstractSchemaLoader.java
Fri Jan 14 18:12:02 2011
@@ -53,8 +53,30 @@ public abstract class AbstractSchemaLoad
      * populated when this class is created with all the schemas present in
      * the LDIF based schema repository.
      */
-    protected final Map<String, Schema> schemaMap = new HashMap<String, Schema>();
+    protected final Map<String, Schema> schemaMap = new LowerCaseKeyMap();
 
+    /**
+     * a map implementation which converts the keys to lower case before inserting
+     */
+    private class LowerCaseKeyMap extends HashMap<String,Schema>
+    {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public Schema put( String key, Schema value )
+        {
+            return super.put( StringTools.lowerCase( key ), value );
+        }
+
+        @Override
+        public void putAll( Map<? extends String, ? extends Schema> map )
+        {
+            for( Map.Entry<? extends String, ? extends Schema> e : map.entrySet() )
+            {
+                put( e.getKey(), e.getValue() );
+            }
+        }
+    }
 
     /**
      * {@inheritDoc}
@@ -136,7 +158,7 @@ public abstract class AbstractSchemaLoad
      */
     public void removeSchema( Schema schema )
     {
-        schemaMap.remove( schema.getSchemaName() );
+        schemaMap.remove( StringTools.toLowerCase ( schema.getSchemaName() ) );
     }
 
 



Mime
View raw message