directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r541123 [2/25] - in /directory/apacheds/branches/apacheds-sasl-branch: ./ benchmarks/ bootstrap-extract/ bootstrap-extract/src/ bootstrap-extract/src/main/ bootstrap-extract/src/main/java/ bootstrap-extract/src/main/java/org/ bootstrap-extr...
Date Thu, 24 May 2007 00:27:07 GMT

Modified: directory/apacheds/branches/apacheds-sasl-branch/benchmarks/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/benchmarks/pom.xml?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/benchmarks/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/benchmarks/pom.xml Wed May 23 17:26:40 2007
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-benchmarks</artifactId>
   <name>ApacheDS Benchmarks</name>

Propchange: directory/apacheds/branches/apacheds-sasl-branch/bootstrap-extract/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 23 17:26:40 2007
@@ -0,0 +1 @@
+.classpath
.project
target
.settings

Modified: directory/apacheds/branches/apacheds-sasl-branch/bootstrap-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/bootstrap-partition/pom.xml?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/bootstrap-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/bootstrap-partition/pom.xml Wed May 23 17:26:40 2007
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-bootstrap-partition</artifactId>
   <name>ApacheDS Bootstrap Partition</name>
@@ -12,8 +12,9 @@
   <description>
     A special jar file that contains a pre-loaded partition with schema 
     information.  This schema partition will mount off of the ou=schema 
-    namingContext.  This artifact contains the db files for this partition
-    as well as classes needed to extract them into the proper position.
+    namingContext.  This artifact contains the db files for this partition.
+    It must be used with the apacheds-bootstrap-extract jar which contains
+    the classes to install these files.
   </description>
   <dependencies>
     <dependency>
@@ -29,6 +30,16 @@
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-store</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-bootstrap-extract</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-schema-extras</artifactId>
       <version>${pom.version}</version>
     </dependency>
   </dependencies>

Modified: directory/apacheds/branches/apacheds-sasl-branch/bootstrap-partition/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/bootstrap-partition/src/main/resources/META-INF/LICENSE.txt?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/bootstrap-partition/src/main/resources/META-INF/LICENSE.txt (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/bootstrap-partition/src/main/resources/META-INF/LICENSE.txt Wed May 23 17:26:40 2007
@@ -200,3 +200,102 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+----
+
+                              SLF4J License
+
+Copyright (c) 2004-2006 SLF4J.ORG Copyright (c) 2004-2006 QOS.ch All rights reserved. Permissqion is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERW
 ISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+----
+
+                       JUnit - Common Public License 1.0
+
+Common Public License Version 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+    a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+    b) in the case of each subsequent Contributor:
+
+    i) changes to the Program, and
+
+    ii) additions to the Program;
+
+    where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+    a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+    b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+    c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+    d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+    a) it complies with the terms and conditions of this Agreement; and
+
+    b) its license agreement:
+
+    i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+    ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+    iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+    iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
+
+When the Program is made available in source code form:
+
+    a) it must be made available under this Agreement; and
+
+    b) a copy of this Agreement must be included with each copy of the Program. 
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claim
 s or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no r
 ights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+----

Modified: directory/apacheds/branches/apacheds-sasl-branch/bootstrap-partition/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/bootstrap-partition/src/main/resources/META-INF/NOTICE.txt?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/bootstrap-partition/src/main/resources/META-INF/NOTICE.txt (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/bootstrap-partition/src/main/resources/META-INF/NOTICE.txt Wed May 23 17:26:40 2007
@@ -3,3 +3,9 @@
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
+
+This product uses JUnit (http://junit.org/).
+
+This product includes a distribution of NLOG4J
+(http://www.slf4j.org/nlog4j/).
+

Modified: directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/pom.xml?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/pom.xml Wed May 23 17:26:40 2007
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-bootstrap-plugin</artifactId>
   <name>ApacheDS Bootstrap Plugin</name>
@@ -42,14 +42,19 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-utils</artifactId>
+      <artifactId>apacheds-schema-bootstrap</artifactId>
       <version>${pom.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-schema-extras</artifactId>
+      <artifactId>apacheds-utils</artifactId>
       <version>${pom.version}</version>
     </dependency>
+    <!--<dependency>-->
+      <!--<groupId>org.apache.directory.server</groupId>-->
+      <!--<artifactId>apacheds-schema-extras</artifactId>-->
+      <!--<version>${pom.version}</version>-->
+    <!--</dependency>-->
   </dependencies>
 
   <build>

Modified: directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Wed May 23 17:26:40 2007
@@ -17,28 +17,30 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.bootstrap.plugin; 
+package org.apache.directory.server.core.bootstrap.plugin;
 
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.Arrays;
+import java.util.List;
+import java.net.URLClassLoader;
+import java.net.URL;
+import java.net.MalformedURLException;
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 
 import org.apache.directory.server.constants.ApacheSchemaConstants;
-import org.apache.directory.server.constants.CoreSchemaConstants;
 import org.apache.directory.server.constants.MetaSchemaConstants;
-import org.apache.directory.server.constants.SystemSchemaConstants;
 import org.apache.directory.server.core.partition.impl.btree.Index;
 import org.apache.directory.server.core.partition.impl.btree.IndexNotFoundException;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore;
@@ -62,6 +64,7 @@
 import org.apache.directory.server.schema.registries.SyntaxCheckerRegistry;
 import org.apache.directory.server.schema.registries.SyntaxRegistry;
 import org.apache.directory.server.utils.AttributesFactory;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
@@ -82,86 +85,104 @@
 /**
  * A plugin used to pre-load meta schema entries into the schema partition.
  *
- * @goal load 
- * @description creates and pre-loads ApacheDS schema partition
- * @phase compile
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
+ * @goal load
+ * @description creates and pre-loads ApacheDS schema partition
+ * @phase compile
+ * @requiresDependencyResolution compile
  */
 public class BootstrapPlugin extends AbstractMojo
 {
     private static final String ADMIN_NORM_NAME = "0.9.2342.19200300.100.1.1=admin,2.5.4.11=system";
 
     /**
+     * The classpath elements of the project being tested.
+     *
+     * @parameter expression="${project.compileClasspathElements}"
+     * @required
+     * @readonly
+     */
+    private List classpathElements;
+
+    /**
      * The package to put the db file entry listing info as well as the partition.
-     * 
+     *
      * @parameter expression="org.apache.directory.server.schema.bootstrap.partition"
      */
     private String outputPackage;
-    
+
     /**
      * The file name to use for the package listing.
-     * 
+     *
      * @parameter expression="DBFILES"
      */
     private String listingFileName;
-    
+
     /**
      * The target directory into which the plugin generates schema partion files
      * within the specified outputPackage.
-     * 
+     *
      * @parameter expression="target/classes"
      */
     private File outputDirectory;
-    
+
     /**
      * The name of the set of bootstrap schemas to load into the registries
      * and ultimately into the schema partition being built.
-     * 
-     * @parameter 
+     *
+     * @parameter
      */
     private String[] bootstrapSchemaClasses;
-    
+
     /**
      * The set of disabled schema names.
-     * 
-     * @parameter 
+     *
+     * @parameter
      */
     private String[] disabledSchemas;
-    
+
     /**
      * The names of Attributes to index.
-     * 
-     * @parameter 
+     *
+     * @parameter
      */
     private String[] indexedAttributes;
-    
-    /** Facotry used to create attributes objects from schema entities. */ 
+
+    /**
+     * Facotry used to create attributes objects from schema entities.
+     */
     private AttributesFactory attributesFactory = new AttributesFactory();
-    
-    /** Registries of objects used to load the schema partition. */
+
+    /**
+     * Registries of objects used to load the schema partition.
+     */
     private Registries registries;
 
-    /** The store to load schema entities into. */
+    /**
+     * The store to load schema entities into.
+     */
     private JdbmStore store = new JdbmStore();
-    
-    /** Map of schemas by name */
+
+    /**
+     * Map of schemas by name
+     */
     private Map schemas = new HashMap();
-    
-    
+
+
     /**
-     * Loads a bunch of bootstrap classes into memory then adds them to a new 
+     * Loads a bunch of bootstrap classes into memory then adds them to a new
      * schema partition within the target area.  The db files for this partition
      * are then packaged into the jar by the jar plugin.
      */
     public void execute() throws MojoExecutionException, MojoFailureException
     {
         File packageDirectory = new File( outputDirectory, outputPackage.replace( '.', File.separatorChar ) );
-        if ( ! packageDirectory.exists() )
+        if ( !packageDirectory.exists() )
         {
             packageDirectory.mkdirs();
         }
-        
+
         // delete output directory if it exists
         File schemaDirectory = new File( packageDirectory, "schema" );
         if ( schemaDirectory.exists() )
@@ -172,30 +193,30 @@
             }
             catch ( IOException e )
             {
-                throw new MojoFailureException( "Failed to delete old schema partition folder " 
-                    + schemaDirectory.getAbsolutePath() + ": " + e.getMessage() );
+                throw new MojoFailureException( "Failed to delete old schema partition folder "
+                        + schemaDirectory.getAbsolutePath() + ": " + e.getMessage() );
             }
         }
-        
+
         initializeSchemas();
         initializePartition( schemaDirectory );
-        
+
         try
         {
-            LdapDN dn = new LdapDN( CoreSchemaConstants.OU_AT + "=schema" );
+            LdapDN dn = new LdapDN( SchemaConstants.OU_AT + "=schema" );
             dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
-            
-            if ( ! hasEntry( dn ) )
+
+            if ( !hasEntry( dn ) )
             {
                 Attributes entry = new AttributesImpl();
-                entry.put( SystemSchemaConstants.OBJECT_CLASS_AT, "top" );
-                entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "organizationalUnit" );
-                entry.put( CoreSchemaConstants.OU_AT, "schema" );
+                entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC );
+                entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
+                entry.put( SchemaConstants.OU_AT, "schema" );
                 store.add( dn, entry );
             }
 
             createSchemasAndContainers();
-            
+
             addSyntaxCheckers();
             addSyntaxes();
             addNormalizers();
@@ -216,7 +237,7 @@
                     disableSchema( disabledSchemas[ii] );
                     getLog().info( "\t\t o " + disabledSchemas[ii] );
                 }
-                
+
                 getLog().info( "" );
                 getLog().info( "------------------------------------------------------------------------" );
             }
@@ -228,7 +249,7 @@
             e.printStackTrace();
             throw new MojoFailureException( "Failed to add syntaxCheckers to partition: " + e.getMessage() );
         }
-        
+
         try
         {
             store.sync();
@@ -237,12 +258,12 @@
         {
             e.printStackTrace();
         }
-        
+
         // ------------------------------------------------------------------
         // Create db file listing and place it into the right package on disk
         // ------------------------------------------------------------------
-        
-        
+
+
         File listingFile = new File( packageDirectory, listingFileName );
         PrintWriter out = null;
         try
@@ -310,8 +331,8 @@
 
     private void createSchemaAndContainers( Schema schema ) throws NamingException
     {
-        LdapDN dn = new LdapDN( SystemSchemaConstants.CN_AT + "=" 
-            + schema.getSchemaName() + "," + CoreSchemaConstants.OU_AT + "=schema" );
+        LdapDN dn = new LdapDN( SchemaConstants.CN_AT + "=" 
+            + schema.getSchemaName() + "," + SchemaConstants.OU_AT + "=schema" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
 
         if ( hasEntry( dn ) )
@@ -322,57 +343,57 @@
         Attributes entry = attributesFactory.getAttributes( schema );
         store.add( dn, entry );
         
-        dn.add( CoreSchemaConstants.OU_AT + "=comparators" );
+        dn.add( SchemaConstants.OU_AT + "=comparators" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
         checkCreateContainer( dn );
         
         dn.remove( dn.size() - 1 );
-        dn.add( CoreSchemaConstants.OU_AT + "=normalizers" );
+        dn.add( SchemaConstants.OU_AT + "=normalizers" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
         checkCreateContainer( dn );
         
         dn.remove( dn.size() - 1 );
-        dn.add( CoreSchemaConstants.OU_AT + "=syntaxCheckers" );
+        dn.add( SchemaConstants.OU_AT + "=syntaxCheckers" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
         checkCreateContainer( dn );
         
         dn.remove( dn.size() - 1 );
-        dn.add( CoreSchemaConstants.OU_AT + "=syntaxes" );
+        dn.add( SchemaConstants.OU_AT + "=syntaxes" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
         checkCreateContainer( dn );
         
         dn.remove( dn.size() - 1 );
-        dn.add( CoreSchemaConstants.OU_AT + "=matchingRules" );
+        dn.add( SchemaConstants.OU_AT + "=matchingRules" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
         checkCreateContainer( dn );
         
         dn.remove( dn.size() - 1 );
-        dn.add( CoreSchemaConstants.OU_AT + "=attributeTypes" );
+        dn.add( SchemaConstants.OU_AT + "=attributeTypes" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
         checkCreateContainer( dn );
         
         dn.remove( dn.size() - 1 );
-        dn.add( CoreSchemaConstants.OU_AT + "=objectClasses" );
+        dn.add( SchemaConstants.OU_AT + "=objectClasses" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
         checkCreateContainer( dn );
         
         dn.remove( dn.size() - 1 );
-        dn.add( CoreSchemaConstants.OU_AT + "=nameForms" );
+        dn.add( SchemaConstants.OU_AT + "=nameForms" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
         checkCreateContainer( dn );
         
         dn.remove( dn.size() - 1 );
-        dn.add( CoreSchemaConstants.OU_AT + "=ditStructureRules" );
+        dn.add( SchemaConstants.OU_AT + "=ditStructureRules" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
         checkCreateContainer( dn );
         
         dn.remove( dn.size() - 1 );
-        dn.add( CoreSchemaConstants.OU_AT + "=ditContentRules" );
+        dn.add( SchemaConstants.OU_AT + "=ditContentRules" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
         checkCreateContainer( dn );
         
         dn.remove( dn.size() - 1 );
-        dn.add( CoreSchemaConstants.OU_AT + "=matchingRuleUse" );
+        dn.add( SchemaConstants.OU_AT + "=matchingRuleUse" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
         checkCreateContainer( dn );
     }
@@ -394,7 +415,7 @@
             Schema schema = ( Schema ) registries.getLoadedSchemas().get( schemaName );
             getLog().info( "\t\t o [" + schemaName + "] - " + getNameOrNumericoid( at ) );
             LdapDN dn = checkCreateSchema( schemaName );
-            dn.add( CoreSchemaConstants.OU_AT + "=attributeTypes" );
+            dn.add( SchemaConstants.OU_AT + "=attributeTypes" );
             dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
             checkCreateContainer( dn );
             Attributes entry = attributesFactory.getAttributes( at, schema );
@@ -422,7 +443,7 @@
             Schema schema = ( Schema ) registries.getLoadedSchemas().get( schemaName );
             getLog().info( "\t\t o [" + schemaName + "] - " + getNameOrNumericoid( oc ) );
             LdapDN dn = checkCreateSchema( schemaName );
-            dn.add( CoreSchemaConstants.OU_AT + "=objectClasses" );
+            dn.add( SchemaConstants.OU_AT + "=objectClasses" );
             dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
             checkCreateContainer( dn );
             Attributes entry = attributesFactory.getAttributes( oc, schema );
@@ -450,7 +471,7 @@
             Schema schema = ( Schema ) registries.getLoadedSchemas().get( schemaName );
             getLog().info( "\t\t o [" + schemaName + "] - " + getNameOrNumericoid( mr ) );
             LdapDN dn = checkCreateSchema( schemaName );
-            dn.add( CoreSchemaConstants.OU_AT + "=matchingRules" );
+            dn.add( SchemaConstants.OU_AT + "=matchingRules" );
             dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
             checkCreateContainer( dn );
             Attributes entry = attributesFactory.getAttributes( mr, schema );
@@ -478,7 +499,7 @@
             Schema schema = ( Schema ) registries.getLoadedSchemas().get( schemaName );
             getLog().info( "\t\t o [" + schemaName + "] - " + oid );
             LdapDN dn = checkCreateSchema( schemaName );
-            dn.add( CoreSchemaConstants.OU_AT + "=comparators" );
+            dn.add( SchemaConstants.OU_AT + "=comparators" );
             dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
             checkCreateContainer( dn );
             Attributes entry = attributesFactory.getAttributes( oid, comparatorRegistry.lookup( oid ), schema );
@@ -506,7 +527,7 @@
             Schema schema = ( Schema ) registries.getLoadedSchemas().get( schemaName );
             getLog().info( "\t\t o [" + schemaName + "] - " + oid );
             LdapDN dn = checkCreateSchema( schemaName );
-            dn.add( CoreSchemaConstants.OU_AT + "=normalizers" );
+            dn.add( SchemaConstants.OU_AT + "=normalizers" );
             dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
             checkCreateContainer( dn );
             Attributes entry = attributesFactory.getAttributes( oid, normalizerRegistry.lookup( oid ), schema );
@@ -533,7 +554,7 @@
             getLog().info( "\t\t o [" + syntax.getSchema() + "] - " + getNameOrNumericoid( syntax ) );
             LdapDN dn = checkCreateSchema( syntax.getSchema() );
             Schema schema = ( Schema ) registries.getLoadedSchemas().get( syntax.getSchema() );
-            dn.add( CoreSchemaConstants.OU_AT + "=syntaxes" );
+            dn.add( SchemaConstants.OU_AT + "=syntaxes" );
             dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
             checkCreateContainer( dn );
             Attributes entry = attributesFactory.getAttributes( syntax, schema );
@@ -561,7 +582,7 @@
             Schema schema = ( Schema ) registries.getLoadedSchemas().get( schemaName );
             getLog().info( "\t\t o [" + schemaName + "] - " + syntaxChecker.getSyntaxOid() );
             LdapDN dn = checkCreateSchema( schemaName );
-            dn.add( CoreSchemaConstants.OU_AT + "=syntaxCheckers" );
+            dn.add( SchemaConstants.OU_AT + "=syntaxCheckers" );
             dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
             checkCreateContainer( dn );
             Attributes entry = attributesFactory.getAttributes( syntaxChecker, schema );
@@ -571,12 +592,12 @@
         }
         getLog().info( "" );
     }
-    
-    
+
+
     /**
      * Creates the configuration and initializes the partition so we can start
      * adding entries into it.
-     * 
+     *
      * @throws MojoFailureException
      */
     private void initializePartition( File workingDirectory ) throws MojoFailureException
@@ -587,7 +608,7 @@
         storeConfig.setEnableOptimizer( false );
         storeConfig.setName( "schema" );
         storeConfig.setOidRegistry( registries.getOidRegistry() );
-        storeConfig.setSuffixDn( CoreSchemaConstants.OU_AT + "=schema" );
+        storeConfig.setSuffixDn( SchemaConstants.OU_AT + "=schema" );
         storeConfig.setSyncOnWrite( false );
         storeConfig.setWorkingDirectory( workingDirectory );
 
@@ -599,10 +620,11 @@
         }
         storeConfig.setIndexedAttributes( indexSet );
 
-        Attributes rootEntry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "organizationalUnit", true );
-        rootEntry.put( CoreSchemaConstants.OU_AT, "schema" );
+        Attributes rootEntry = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, 
+            SchemaConstants.ORGANIZATIONAL_UNIT_OC, true );
+        rootEntry.put( SchemaConstants.OU_AT, "schema" );
         storeConfig.setContextEntry( rootEntry );
-        
+
         try
         {
             store.init( storeConfig );
@@ -613,8 +635,8 @@
             throw new MojoFailureException( "Failed to initialize parition: " + e.getMessage() );
         }
     }
-    
-    
+
+
     /**
      * Creates the special schemaModificationsAttribute entry used to
      * store the modification attributes for the schema.  The current
@@ -626,20 +648,20 @@
     private void createSchemaModificationAttributesEntry() throws NamingException
     {
         Attributes entry = new AttributesImpl( 
-            SystemSchemaConstants.OBJECT_CLASS_AT, 
+            SchemaConstants.OBJECT_CLASS_AT, 
             ApacheSchemaConstants.SCHEMA_MODIFICATION_ATTRIBUTES_OC,
             true );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "top" );
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( SchemaConstants.TOP_OC );
         
         entry.put( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT, ADMIN_NORM_NAME );
-        entry.put( SystemSchemaConstants.MODIFIERS_NAME_AT, ADMIN_NORM_NAME );
-        entry.put( SystemSchemaConstants.CREATORS_NAME_AT, ADMIN_NORM_NAME );
+        entry.put( SchemaConstants.MODIFIERS_NAME_AT, ADMIN_NORM_NAME );
+        entry.put( SchemaConstants.CREATORS_NAME_AT, ADMIN_NORM_NAME );
         
         entry.put( ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
-        entry.put( SystemSchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
-        entry.put( SystemSchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
+        entry.put( SchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
+        entry.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
         
-        entry.put( SystemSchemaConstants.CN_AT, "schemaModifications" );
+        entry.put( SchemaConstants.CN_AT, "schemaModifications" );
         entry.put( ApacheSchemaConstants.SUBSCHEMA_SUBENTRY_NAME_AT, "cn=schema" );
         
         LdapDN normName = new LdapDN( "cn=schemaModifications,ou=schema" );
@@ -651,7 +673,7 @@
     /**
      * Loads all the bootstrap schemas into the registries in preparation for
      * loading them into the schema partition.
-     * 
+     *
      * @throws MojoFailureException
      */
     private void initializeSchemas() throws MojoFailureException
@@ -663,54 +685,70 @@
         // always include these core bootstrap schemas
         BootstrapSchema schema = new SystemSchema();
         schemas.put( schema.getSchemaName(), schema );
-        
+
         schema = new ApacheSchema();
         schemas.put( schema.getSchemaName(), schema );
 
         schema = new ApachemetaSchema();
         schemas.put( schema.getSchemaName(), schema );
-        
+
         schema = new CoreSchema();
         schemas.put( schema.getSchemaName(), schema );
-        
+
         getLog().info( "------------------------------------------------------------------------" );
         getLog().info( "Found bootstrap schemas: " );
         getLog().info( "------------------------------------------------------------------------" );
         getLog().info( "" );
 
         // start loading other schemas from the plugin's configuration section
+        ClassLoader parent = getClass().getClassLoader();
+        URL[] urls = new URL[classpathElements.size()];
+        int i = 0;
+        for ( Iterator it = classpathElements.iterator(); it.hasNext(); )
+        {
+            try
+            {
+                urls[i++] = new File( ( String ) it.next() ).toURL();
+            } catch ( MalformedURLException e )
+            {
+                throw ( MojoFailureException ) new MojoFailureException( "Could not construct classloader: " ).initCause( e );
+            }
+        }
+        ClassLoader cl = new URLClassLoader( urls, parent );
         for ( int ii = 0; ii < bootstrapSchemaClasses.length; ii++ )
         {
             try
             {
-                Class schemaClass = Class.forName( bootstrapSchemaClasses[ii] );
+                Class schemaClass = cl.loadClass( bootstrapSchemaClasses[ii] );
                 schema = ( BootstrapSchema ) schemaClass.newInstance();
                 schemas.put( schema.getSchemaName(), schema );
             }
             catch ( ClassNotFoundException e )
             {
+                getLog().info( "ClassLoader " + getClass().getClassLoader() );
+                getLog().info( "ClassLoader URLs: " + Arrays.asList( ( ( URLClassLoader ) getClass().getClassLoader() ).getURLs() ) );
                 e.printStackTrace();
-                throw new MojoFailureException( "Could not find BootstrapSchema class: " 
-                    + bootstrapSchemaClasses[ii] );
+                throw new MojoFailureException( "Could not find BootstrapSchema class: "
+                        + bootstrapSchemaClasses[ii] );
             }
             catch ( InstantiationException e )
             {
                 e.printStackTrace();
-                throw new MojoFailureException( "Could not instantiate BootstrapSchema class: " 
-                    + bootstrapSchemaClasses[ii] );
+                throw new MojoFailureException( "Could not instantiate BootstrapSchema class: "
+                        + bootstrapSchemaClasses[ii] );
             }
             catch ( IllegalAccessException e )
             {
                 e.printStackTrace();
                 throw new MojoFailureException( "Could not instantiate BootstrapSchema class due to security: "
-                    + bootstrapSchemaClasses[ii] );
+                        + bootstrapSchemaClasses[ii] );
             }
-            
+
             getLog().info( "\t" + bootstrapSchemaClasses[ii] );
         }
         getLog().info( "" );
-        
-        BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
+
+        BootstrapSchemaLoader loader = new BootstrapSchemaLoader( cl );
         registries = new DefaultRegistries( "bootstrap", loader, new DefaultOidRegistry() );
         try
         {
@@ -721,10 +759,10 @@
             e.printStackTrace();
             throw new MojoFailureException( "Failed to load bootstrap registries with schemas: " + e.getMessage() );
         }
-        
+
         SerializableComparator.setRegistry( registries.getComparatorRegistry() );
     }
-    
+
 
     private void checkCreateContainer( LdapDN dn ) throws NamingException
     {
@@ -732,41 +770,41 @@
         {
             return;
         }
-        
+
         Attributes entry = new AttributesImpl();
-        entry.put( SystemSchemaConstants.OBJECT_CLASS_AT, "top" );
-        entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "organizationalUnit" );
-        entry.put( CoreSchemaConstants.OU_AT, dn.getRdn().getValue() );
+        entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC );
+        entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
+        entry.put( SchemaConstants.OU_AT, dn.getRdn().getValue() );
         store.add( dn, entry );
     }
-    
-    
+
+
     private LdapDN checkCreateSchema( String schemaName ) throws NamingException
     {
         Schema schema = ( Schema ) schemas.get( schemaName );
-        LdapDN dn = new LdapDN( SystemSchemaConstants.CN_AT + "=" 
-            + schemaName + "," + CoreSchemaConstants.OU_AT + "=schema" );
+        LdapDN dn = new LdapDN( SchemaConstants.CN_AT + "="
+                + schemaName + "," + SchemaConstants.OU_AT + "=schema" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
 
         if ( hasEntry( dn ) )
         {
             return dn;
         }
-        
+
         Attributes entry = attributesFactory.getAttributes( schema );
         store.add( dn, entry );
         return dn;
     }
-    
-    
+
+
     private void disableSchema( String schemaName ) throws NamingException
     {
-        LdapDN dn = new LdapDN( SystemSchemaConstants.CN_AT + "=" + schemaName 
-            + "," + CoreSchemaConstants.OU_AT + "=schema" );
+        LdapDN dn = new LdapDN( SchemaConstants.CN_AT + "=" + schemaName
+                + "," + SchemaConstants.OU_AT + "=schema" );
         dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
-        ModificationItemImpl mod = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, 
-            new AttributeImpl( MetaSchemaConstants.M_DISABLED_AT, "TRUE" ) );
-        ModificationItemImpl[] mods = new ModificationItemImpl[] { mod };
+        ModificationItemImpl mod = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
+                new AttributeImpl( MetaSchemaConstants.M_DISABLED_AT, "TRUE" ) );
+        ModificationItemImpl[] mods = new ModificationItemImpl[] {mod};
         store.modify( dn, mods );
     }
 
@@ -778,29 +816,29 @@
         {
             return object.getName();
         }
-        
+
         return object.getOid();
     }
-    
-    
+
+
     private final boolean hasEntry( LdapDN dn ) throws NamingException
     {
-        BigInteger id = store.getEntryId( dn.toNormName() );
+        Long id = store.getEntryId( dn.toNormName() );
         if ( id == null )
         {
             return false;
         }
         return true;
     }
-    
-    
+
+
     private final StringBuffer getDbFileListing() throws IndexNotFoundException
     {
         StringBuffer buf = new StringBuffer();
         buf.append( "schema/master.db\n" );
-        
+
         Iterator systemIndices = store.getSystemIndices();
-        while( systemIndices.hasNext() )
+        while ( systemIndices.hasNext() )
         {
             Index index = store.getSystemIndex( ( String ) systemIndices.next() );
             buf.append( "schema/" );
@@ -815,7 +853,7 @@
             buf.append( indexedAttributes[ii] );
             buf.append( ".db\n" );
         }
-        
+
         return buf;
     }
 }

Modified: directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/src/main/resources/META-INF/LICENSE.txt?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/src/main/resources/META-INF/LICENSE.txt (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/src/main/resources/META-INF/LICENSE.txt Wed May 23 17:26:40 2007
@@ -200,3 +200,102 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+----
+
+                              SLF4J License
+
+Copyright (c) 2004-2006 SLF4J.ORG Copyright (c) 2004-2006 QOS.ch All rights reserved. Permissqion is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERW
 ISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+----
+
+                       JUnit - Common Public License 1.0
+
+Common Public License Version 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+    a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+    b) in the case of each subsequent Contributor:
+
+    i) changes to the Program, and
+
+    ii) additions to the Program;
+
+    where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+    a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+    b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+    c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+    d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+    a) it complies with the terms and conditions of this Agreement; and
+
+    b) its license agreement:
+
+    i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+    ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+    iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+    iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
+
+When the Program is made available in source code form:
+
+    a) it must be made available under this Agreement; and
+
+    b) a copy of this Agreement must be included with each copy of the Program. 
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claim
 s or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no r
 ights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+----

Modified: directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/src/main/resources/META-INF/NOTICE.txt?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/src/main/resources/META-INF/NOTICE.txt (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/bootstrap-plugin/src/main/resources/META-INF/NOTICE.txt Wed May 23 17:26:40 2007
@@ -3,3 +3,12 @@
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
+
+This product uses Plexus (http://plexus.codehaus.org/).
+
+This product uses the JUnit
+(http://junit.org/).
+
+This product includes a distribution of NLOG4J
+(http://www.slf4j.org/nlog4j/).
+

Modified: directory/apacheds/branches/apacheds-sasl-branch/btree-base/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/btree-base/pom.xml?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/btree-base/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/btree-base/pom.xml Wed May 23 17:26:40 2007
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-btree-base</artifactId>
   <name>ApacheDS BTree Base</name>

Modified: directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java Wed May 23 17:26:40 2007
@@ -20,7 +20,6 @@
 package org.apache.directory.server.core.partition.impl.btree;
 
 
-import java.math.BigInteger;
 import java.util.regex.Pattern;
 
 import javax.naming.NamingException;
@@ -79,42 +78,42 @@
     int count( Object attrVal, boolean isGreaterThan ) throws NamingException;
 
 
-    BigInteger forwardLookup( Object attrVal ) throws NamingException;
+    Object forwardLookup( Object attrVal ) throws NamingException;
 
 
-    Object reverseLookup( BigInteger id ) throws NamingException;
+    Object reverseLookup( Object id ) throws NamingException;
 
 
-    void add( Object attrVal, BigInteger id ) throws NamingException;
+    void add( Object attrVal, Object id ) throws NamingException;
 
 
-    void add( Attribute attr, BigInteger id ) throws NamingException;
+    void add( Attribute attr, Object id ) throws NamingException;
 
 
-    void add( Attributes attrs, BigInteger id ) throws NamingException;
+    void add( Attributes attrs, Object id ) throws NamingException;
 
 
-    void drop( BigInteger entryId ) throws NamingException;
+    void drop( Object entryId ) throws NamingException;
 
 
-    void drop( Object attrVal, BigInteger id ) throws NamingException;
+    void drop( Object attrVal, Object id ) throws NamingException;
 
 
     /**
      * If the Attribute does not have any values then this reduces to a 
      * drop(BigInteger) call.
      */
-    void drop( Attribute attr, BigInteger id ) throws NamingException;
+    void drop( Attribute attr, Object id ) throws NamingException;
 
 
     /**
      * If the Attribute for this index within the Attributes does not have any 
      * values then this reduces to a drop(BigInteger) call.
      */
-    void drop( Attributes attrs, BigInteger id ) throws NamingException;
+    void drop( Attributes attrs, Object id ) throws NamingException;
 
 
-    IndexEnumeration listReverseIndices( BigInteger id ) throws NamingException;
+    IndexEnumeration listReverseIndices( Object id ) throws NamingException;
 
 
     IndexEnumeration listIndices() throws NamingException;
@@ -132,13 +131,13 @@
     IndexEnumeration listIndices( Pattern regex, String prefix ) throws NamingException;
 
 
-    boolean hasValue( Object attrVal, BigInteger id ) throws NamingException;
+    boolean hasValue( Object attrVal, Object id ) throws NamingException;
 
 
-    boolean hasValue( Object attrVal, BigInteger id, boolean isGreaterThan ) throws NamingException;
+    boolean hasValue( Object attrVal, Object id, boolean isGreaterThan ) throws NamingException;
 
 
-    boolean hasValue( Pattern regex, BigInteger id ) throws NamingException;
+    boolean hasValue( Pattern regex, Object id ) throws NamingException;
 
 
     void close() throws NamingException;

Modified: directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java Wed May 23 17:26:40 2007
@@ -20,7 +20,6 @@
 package org.apache.directory.server.core.partition.impl.btree;
 
 
-import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -45,7 +44,7 @@
     /** The iteration cursor */
     private final NamingEnumeration underlying;
     /** LUT used to avoid returning duplicates */
-    private final Map<BigInteger,BigInteger> candidates;
+    private final Map<Object,Object> candidates;
     /** */
     private final IndexAssertion assertion;
     /** */
@@ -72,7 +71,7 @@
         throws NamingException
     {
         this.underlying = underlying;
-        candidates = new HashMap<BigInteger,BigInteger>();
+        candidates = new HashMap<Object,Object>();
         this.assertion = assertion;
         checkDups = enableDupCheck;
         prefetch();

Modified: directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java Wed May 23 17:26:40 2007
@@ -21,8 +21,6 @@
 
 
 import org.apache.directory.server.schema.SerializableComparator;
-import org.apache.directory.shared.ldap.util.BigIntegerComparator;
-
 
 /**
  * TupleComparator for index records.
@@ -34,7 +32,7 @@
 {
     private static final long serialVersionUID = 3257283621751633459L;
 
-    private static final SerializableComparator BIG_INTEGER_COMPARATOR = new SerializableComparator(
+    private static final SerializableComparator LONG_COMPARATOR = new SerializableComparator(
         "1.3.6.1.4.1.18060.0.4.1.1.2" )
     {
         private static final long serialVersionUID = 3690478030414165816L;
@@ -42,11 +40,29 @@
 
         public int compare( Object o1, Object o2 )
         {
-            return BigIntegerComparator.INSTANCE.compare( o1, o2 );
+        	try
+        	{
+	        	long thisVal = (Long)o1;
+	        	long anotherVal = (Long)o2;
+	        	return ( thisVal < anotherVal ? -1 : ( thisVal == anotherVal ? 0 : 1 ) );
+        	}
+        	catch ( NullPointerException npe )
+        	{
+    	        if ( o1 == null )
+    	        {
+    	            throw new IllegalArgumentException( "Argument 'obj1' is null" );
+    	        }
+    	        else
+    	        {
+    	            throw new IllegalArgumentException( "Argument 'obj2' is null" );
+    	        }
+        	}
         }
     };
+    
     /** Whether or not the key/value is swapped */
     private final boolean isForwardMap;
+    
     /** The key comparison to use */
     private final SerializableComparator keyComp;
 
@@ -78,7 +94,7 @@
             return keyComp;
         }
 
-        return BIG_INTEGER_COMPARATOR;
+        return LONG_COMPARATOR;
     }
 
 
@@ -92,7 +108,7 @@
     {
         if ( isForwardMap )
         {
-            return BIG_INTEGER_COMPARATOR;
+            return LONG_COMPARATOR;
         }
 
         return keyComp;

Modified: directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexRecord.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexRecord.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexRecord.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexRecord.java Wed May 23 17:26:40 2007
@@ -20,8 +20,6 @@
 package org.apache.directory.server.core.partition.impl.btree;
 
 
-import java.math.BigInteger;
-
 import javax.naming.directory.Attributes;
 
 
@@ -75,9 +73,9 @@
      *
      * @return the id of the entry indexed
      */
-    public BigInteger getEntryId()
+    public Object getEntryId()
     {
-        return ( BigInteger ) tuple.getValue();
+        return ( Object ) tuple.getValue();
     }
 
 
@@ -97,7 +95,7 @@
      *
      * @param id the id of the entry
      */
-    public void setEntryId( BigInteger id )
+    public void setEntryId( Object id )
     {
         tuple.setValue( id );
     }

Modified: directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/MasterTable.java Wed May 23 17:26:40 2007
@@ -20,8 +20,6 @@
 package org.apache.directory.server.core.partition.impl.btree;
 
 
-import java.math.BigInteger;
-
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
@@ -48,7 +46,7 @@
      * @return the Attributes of the entry with operational attributes and all.
      * @throws NamingException if there is a read error on the underlying Db.
      */
-    Attributes get( BigInteger id ) throws NamingException;
+    Attributes get( Object id ) throws NamingException;
 
 
     /**
@@ -61,7 +59,7 @@
      * @return the newly created entry's Attributes
      * @throws NamingException if there is a write error on the underlying Db.
      */
-    Attributes put( Attributes entry, BigInteger id ) throws NamingException;
+    Attributes put( Attributes entry, Object id ) throws NamingException;
 
 
     /**
@@ -71,7 +69,7 @@
      * @return the Attributes of the deleted entry
      * @throws NamingException if there is a write error on the underlying Db
      */
-    Attributes delete( BigInteger id ) throws NamingException;
+    Attributes delete( Object id ) throws NamingException;
 
 
     /**
@@ -82,7 +80,7 @@
      * @throws NamingException if the admin table storing sequences cannot be
      * read.
      */
-    BigInteger getCurrentId() throws NamingException;
+    Object getCurrentId() throws NamingException;
 
 
     /**
@@ -93,7 +91,7 @@
      * @throws NamingException if the admin table storing sequences cannot be
      * read and writen to.
      */
-    BigInteger getNextId() throws NamingException;
+    Object getNextId() throws NamingException;
 
 
     /**

Modified: directory/apacheds/branches/apacheds-sasl-branch/constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/constants/pom.xml?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/constants/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/constants/pom.xml Wed May 23 17:26:40 2007
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-constants</artifactId>
   <name>ApacheDS Constants</name>

Modified: directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java Wed May 23 17:26:40 2007
@@ -28,13 +28,10 @@
  */
 public interface ApacheSchemaConstants
 {
-    String COMPARATORS_AT = "comparators";
-    String NORMALIZERS_AT = "normalizers";
-    String SYNTAX_CHECKERS_AT = "syntaxCheckers";
-
     String SCHEMA_MODIFIERS_NAME_AT = "schemaModifiersName";
     String SCHEMA_MODIFY_TIMESTAMP_AT = "schemaModifyTimestamp";
     String SUBSCHEMA_SUBENTRY_NAME_AT = "subschemaSubentryName";
 
     String SCHEMA_MODIFICATION_ATTRIBUTES_OC = "schemaModificationAttributes";
+    String SCHEMA_NAME = "apache";
 }

Modified: directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/CoreSchemaConstants.java Wed May 23 17:26:40 2007
@@ -29,7 +29,4 @@
 public interface CoreSchemaConstants
 {
     String SCHEMA_NAME = "core";
-
-    String OU_AT = "ou";
-    String ORGANIZATIONAL_UNIT_OC = "organizationalUnit";
 }

Modified: directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java Wed May 23 17:26:40 2007
@@ -69,7 +69,7 @@
     String M_MUST_AT = "m-must";
     String M_MAY_AT = "m-may";
     String M_TYPE_OBJECT_CLASS_AT = "m-typeObjectClass";
-    String X_HUMAN_READIBLE_AT = "x-humanReadible";
+    String X_HUMAN_READIBLE_AT = "x-humanReadable";
     
     // -- schema extensions & values --
     

Modified: directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java Wed May 23 17:26:40 2007
@@ -29,20 +29,4 @@
 public interface SystemSchemaConstants
 {
     String SCHEMA_NAME = "system";
-
-    String CN_AT = "cn";
-    String OBJECT_CLASS_AT = "objectClass";
-    String CREATORS_NAME_AT = "creatorsName";
-    String CREATE_TIMESTAMP_AT = "createTimestamp";
-    String MODIFY_TIMESTAMP_AT = "modifyTimestamp";
-    String MODIFIERS_NAME_AT = "modifiersName";
-
-    String LDAP_SYNTAXES_AT = "ldapSyntaxes";
-    String MATCHING_RULES_AT = "matchingRules";
-    String ATTRIBUTE_TYPES_AT = "attributeTypes";
-    String OBJECT_CLASSES_AT = "objectClasses";
-    String MATCHING_RULE_USE_AT = "matchingRuleUse";
-    String DIT_STRUCTURE_RULES_AT = "ditStructureRules";
-    String DIT_CONTENT_RULES_AT = "ditContentRules";
-    String NAME_FORMS_AT = "nameForms";
 }

Modified: directory/apacheds/branches/apacheds-sasl-branch/core-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/core-plugin/pom.xml?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/core-plugin/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/core-plugin/pom.xml Wed May 23 17:26:40 2007
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-core-plugin</artifactId>
   <name>ApacheDS Core Plugin (Maven 2)</name>

Modified: directory/apacheds/branches/apacheds-sasl-branch/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/DirectorySchemaToolMojo.java Wed May 23 17:26:40 2007
@@ -34,6 +34,7 @@
 import org.apache.directory.server.schema.bootstrap.AbstractBootstrapSchema;
 import org.apache.directory.server.schema.bootstrap.BootstrapSchema;
 import org.apache.directory.server.schema.bootstrap.ProducerTypeEnum;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
@@ -266,7 +267,7 @@
         context.put( "schemaDepCount", new Integer( schema.getDependencies().length ) );
         context.put( "schemaDeps", new String[]
             { "dep1", "dep2" } );
-        context.put( "objectClasses", objectClasses );
+        context.put( SchemaConstants.OBJECT_CLASSES_AT, objectClasses );
         runVelocity( schema.getPackageName(), schema.getUnqualifiedClassName( type ), context,
             "ObjectClasses.template", type );
     }

Modified: directory/apacheds/branches/apacheds-sasl-branch/core-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/core-shared/pom.xml?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/core-shared/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/core-shared/pom.xml Wed May 23 17:26:40 2007
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-core-shared</artifactId>
   <name>ApacheDS Core Shared</name>

Modified: directory/apacheds/branches/apacheds-sasl-branch/core-unit/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/core-unit/pom.xml?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/core-unit/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/core-unit/pom.xml Wed May 23 17:26:40 2007
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-core-unit</artifactId>
   <name>ApacheDS Core Unit</name>

Modified: directory/apacheds/branches/apacheds-sasl-branch/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java Wed May 23 17:26:40 2007
@@ -38,6 +38,7 @@
 import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
 import org.apache.directory.server.core.configuration.PartitionConfiguration;
 import org.apache.directory.server.core.partition.PartitionNexus;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.ldif.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
@@ -141,11 +142,11 @@
             HashSet<Object> indexedAttributes = new HashSet<Object>();
             indexedAttributes.add( "ou" );
             indexedAttributes.add( "uid" );
-            indexedAttributes.add( "objectClass" );
+            indexedAttributes.add( SchemaConstants.OBJECT_CLASS_AT );
             
             // Build the root entry for the new partition
-            Attributes attributes = new AttributesImpl( "objectClass", "top", true );
-            attributes.get( "objectClass" ).add( "organizationalUnit" );
+            Attributes attributes = new AttributesImpl( SchemaConstants.OBJECT_CLASS_AT, "top", true );
+            attributes.get( SchemaConstants.OBJECT_CLASS_AT ).add( "organizationalUnit" );
             attributes.put( "ou", "test" );
             
             // Add apache.org paritition since all work will be done here



Mime
View raw message