directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r893971 [2/2] - in /directory: apacheds/branches/apacheds-schema/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/ a...
Date Sat, 26 Dec 2009 13:34:43 GMT
Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=893971&r1=893970&r2=893971&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
Sat Dec 26 13:34:40 2009
@@ -41,8 +41,8 @@
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
-import org.apache.directory.shared.ldap.schema.DefaultSchemaManager;
-import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
+import org.apache.directory.shared.schema.DefaultSchemaManager;
+import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=893971&r1=893970&r2=893971&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
Sat Dec 26 13:34:40 2009
@@ -41,8 +41,8 @@
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
-import org.apache.directory.shared.ldap.schema.DefaultSchemaManager;
-import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
+import org.apache.directory.shared.schema.DefaultSchemaManager;
+import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;

Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=893971&r1=893970&r2=893971&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
(original)
+++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
Sat Dec 26 13:34:40 2009
@@ -51,8 +51,8 @@
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
-import org.apache.directory.shared.ldap.schema.DefaultSchemaManager;
-import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
+import org.apache.directory.shared.schema.DefaultSchemaManager;
+import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/pom.xml?rev=893971&r1=893970&r2=893971&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/pom.xml (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/pom.xml Sat Dec 26 13:34:40
2009
@@ -57,48 +57,18 @@
 
   <build>
     <plugins>
-
-     <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <version>2.0.1</version>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Include-Resource>src/main/resources</Include-Resource>
-           <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-           <Private-Package>org.apache.directory.shared.ldap.schema.schema.loader.ldif</Private-Package>
-           <Export-Package>org.apache.directory.shared.ldap.schema.*</Export-Package>
-           <Export-Package>org.apache.directory.shared.ldap.schema.loader.ldif</Export-Package>
-         </instructions>
-       </configuration>
-     </plugin>
-
-     <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-ipojo-plugin</artifactId>
-       <version>1.4.0</version>
-       <executions>
-         <execution>
-           <goals>
-             <goal>ipojo-bundle</goal>
-           </goals>
-         </execution>
-       </executions>
-     </plugin>
-
-     <plugin>
-       <artifactId>maven-surefire-plugin</artifactId>
-       <groupId>org.apache.maven.plugins</groupId>
-       <configuration>
-         <systemProperties>
-           <property>
-             <name>workingDirectory</name>
-             <value>${basedir}/target</value>
-           </property>
-         </systemProperties>
-       </configuration>
-     </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>workingDirectory</name>
+              <value>${basedir}/target</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>

Modified: directory/shared/branches/shared-schema/ldap-schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema/pom.xml?rev=893971&r1=893970&r2=893971&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema/pom.xml (original)
+++ directory/shared/branches/shared-schema/ldap-schema/pom.xml Sat Dec 26 13:34:40 2009
@@ -28,7 +28,7 @@
   </parent>
   <artifactId>shared-ldap-schema</artifactId>
   <name>Apache Directory Shared LDAP Schema</name>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <description>
     Jar bundled LDIF files containing schema data using the Apache Directory
@@ -42,65 +42,10 @@
       <artifactId>commons-io</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.ipojo</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.ipojo.annotations</artifactId>
-    </dependency>
   </dependencies>
 
   <build>
     <plugins>
-
-      <plugin>
-        <groupId>org.apache.geronimo.genesis.plugins</groupId>
-        <artifactId>tools-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>verify-legal-files</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>verify-legal-files</goal>
-            </goals>
-            <configuration>
-              <strict>false</strict>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-
-     <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-bundle-plugin</artifactId>
-       <version>2.0.1</version>
-       <extensions>true</extensions>
-       <configuration>
-         <instructions>
-           <Include-Resource>src/main/resources</Include-Resource>
-           <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-           <Private-Package>org.apache.directory.shared.ldap.schema.ldif.extractor.impl</Private-Package>
-           <Export-Package>org.apache.directory.shared.ldap.schema.ldif.extractor</Export-Package>
-         </instructions>
-       </configuration>
-     </plugin>
-
-     <plugin>
-       <groupId>org.apache.felix</groupId>
-       <artifactId>maven-ipojo-plugin</artifactId>
-       <version>1.4.0</version>
-       <executions>
-         <execution>
-           <goals>
-             <goal>ipojo-bundle</goal>
-           </goals>
-         </execution>
-       </executions>
-     </plugin>
-
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <groupId>org.apache.maven.plugins</groupId>

Modified: directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java?rev=893971&r1=893970&r2=893971&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java
(original)
+++ directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java
Sat Dec 26 13:34:40 2009
@@ -36,8 +36,7 @@
 import java.util.regex.Pattern;
 
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
-import org.apache.felix.ipojo.annotations.Component;
-import org.apache.felix.ipojo.annotations.Provides;
+import org.apache.directory.shared.ldap.schema.ldif.extractor.UniqueResourceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,8 +47,6 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 664295 $
  */
-@Component
-@Provides
 public class DefaultSchemaLdifExtractor implements SchemaLdifExtractor
 {
     private static final String BASE_PATH = "";
@@ -122,6 +119,13 @@
      */
     public void extractOrCopy( boolean overwrite ) throws IOException
     {
+        if ( ! outputDirectory.exists() )
+        {
+            outputDirectory.mkdir();
+        }
+
+        File schemaDirectory = new File( outputDirectory, SCHEMA_SUBDIR );
+
         if ( ! schemaDirectory.exists() )
         {
             schemaDirectory.mkdir();
@@ -256,6 +260,23 @@
             parent = parent.getParentFile();
         }
 
+        /*
+
+           this seems retarded so I replaced it for now with what is below it
+           will not break from loop above unless parent == null so the if is
+           never executed - just the else is executed every time
+
+        if ( parent != null )
+        {
+            return assembleDestinationFile( fileComponentStack );
+        }
+        else
+        {
+            throw new IllegalStateException( "parent cannot be null" );
+        }
+        
+        */
+
         throw new IllegalStateException( "parent cannot be null" );
     }
     

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java?rev=893971&r1=893970&r2=893971&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java
Sat Dec 26 13:34:40 2009
@@ -240,7 +240,6 @@
      *
      * @param schemas The list of Schema to unload
      * @return True if all the schemas have been unloaded
-     * @throws Exception @TODO
      */
     boolean unload( Schema... schemas ) throws Exception;
 
@@ -250,7 +249,6 @@
      *
      * @param schemas The list of Schema to unload
      * @return True if all the schemas have been unloaded
-     * @throws Exception @TODO
      */
     boolean unload( String... schemas ) throws Exception;
 
@@ -265,9 +263,9 @@
      * 
      * If the modification is ok, the Registries will be updated. 
      * 
-     * @param schemas The list of schemas to enable
-     * @return true if the Registries is still consistent, false otherwise.
-     * @throws Exception @TODO
+     *  @param schemas The list of schemas to enable
+     *  @return true if the Registries is still consistent, false otherwise.
+     *  @throws If something went wrong
      */
     boolean enable( Schema... schemas ) throws Exception;
 
@@ -279,9 +277,9 @@
      * 
      * If the modification is ok, the Registries will be updated.
      *  
-     * @param schemas The list of schema name to enable
-     * @return true if the Registries is still consistent, false otherwise.
-     * @throws Exception something went wrong
+     *  @param schemas The list of schema name to enable
+     *  @return true if the Registries is still consistent, false otherwise.
+     *  @throws If something went wrong
      */
     boolean enable( String... schemas ) throws Exception;
 
@@ -339,9 +337,9 @@
      * 
      * If the modification is ok, the Registries will be updated. 
      * 
-     * @param schemas The list of schemas to disable
-     * @return true if the Registries is still consistent, false otherwise.
-     * @throws Exception if something went wrong
+     *  @param schemas The list of schemas to disable
+     *  @return true if the Registries is still consistent, false otherwise.
+     *  @throws If something went wrong
      */
     boolean disable( Schema... schemas ) throws Exception;
 
@@ -353,9 +351,9 @@
      * 
      * If the modification is ok, the Registries will be updated. 
      * 
-     * @param schemas The list of schema names to disable
-     * @return true if the Registries is still consistent, false otherwise.
-     * @throws Exception if something went wrong
+     *  @param schemas The list of schema names to disable
+     *  @return true if the Registries is still consistent, false otherwise.
+     *  @throws If something went wrong
      */
     boolean disable( String... schemas ) throws Exception;
 
@@ -367,8 +365,8 @@
      * 
      * If the modification is ok, the Registries will be updated. 
      * 
-     * @param schemas The list of schemas to disable
-     * @return true if all the schemas have been disabled
+     *  @param schemas The list of schemas to disable
+     *  @return true if all the schemas have been disabled
      */
     boolean disabledRelaxed( Schema... schemas );
 
@@ -380,8 +378,8 @@
      * 
      * If the modification is ok, the Registries will be updated. 
      * 
-     * @param schemas The list of schema names to disable
-     * @return true if all the schemas have been disabled
+     *  @param schemas The list of schema names to disable
+     *  @return true if all the schemas have been disabled
      */
     boolean disabledRelaxed( String... schemas );
 
@@ -439,7 +437,7 @@
     /**
      * Lookup for an AttributeType in the AttributeType registry
      * 
-     * @param oid the OID we are looking for
+     * @param String oid the OID we are looking for
      * @return The found AttributeType 
      * @throws NamingException if the OID is not found in the AttributeType registry
      */
@@ -449,7 +447,7 @@
     /**
      * Lookup for a Comparator in the Comparator registry
      * 
-     * @param oid the OID we are looking for
+     * @param String oid the OID we are looking for
      * @return The found Comparator 
      * @throws NamingException if the OID is not found in the Comparator registry
      */
@@ -459,7 +457,7 @@
     /**
      * Lookup for a MatchingRule in the MatchingRule registry
      * 
-     * @param oid the OID we are looking for
+     * @param String oid the OID we are looking for
      * @return The found MatchingRule 
      * @throws NamingException if the OID is not found in the MatchingRule registry
      */
@@ -469,7 +467,7 @@
     /**
      * Lookup for a Normalizer in the Normalizer registry
      * 
-     * @param oid the OID we are looking for
+     * @param String oid the OID we are looking for
      * @return The found Normalizer 
      * @throws NamingException if the OID is not found in the Normalizer registry
      */
@@ -479,7 +477,7 @@
     /**
      * Lookup for a ObjectClass in the ObjectClass registry
      * 
-     * @param oid the OID we are looking for
+     * @param String oid the OID we are looking for
      * @return The found ObjectClass 
      * @throws NamingException if the OID is not found in the ObjectClass registry
      */
@@ -489,7 +487,7 @@
     /**
      * Lookup for an LdapSyntax in the LdapSyntax registry
      * 
-     * @param oid the OID we are looking for
+     * @param String oid the OID we are looking for
      * @return The found LdapSyntax 
      * @throws NamingException if the OID is not found in the LdapSyntax registry
      */
@@ -499,7 +497,7 @@
     /**
      * Lookup for a SyntaxChecker in the SyntaxChecker registry
      * 
-     * @param oid the OID we are looking for
+     * @param String oid the OID we are looking for
      * @return The found SyntaxChecker 
      * @throws NamingException if the OID is not found in the SyntaxChecker registry
      */
@@ -675,8 +673,7 @@
     /**
      * Removes the registered attributeType from the attributeTypeRegistry 
      * 
-     * @param attributeTypeOid the attributeType OID to unregister
-     * @return the schema object associated with the OID
+     * @param String the attributeType OID to unregister
      * @throws NamingException if the attributeType is invalid
      */
     SchemaObject unregisterAttributeType( String attributeTypeOid ) throws NamingException;
@@ -685,8 +682,7 @@
     /**
      * Removes the registered Comparator from the ComparatorRegistry 
      * 
-     * @param comparatorOid the Comparator OID to unregister
-     * @return the schema object associated with the OID
+     * @param String the Comparator OID to unregister
      * @throws NamingException if the Comparator is invalid
      */
     SchemaObject unregisterComparator( String comparatorOid ) throws NamingException;
@@ -695,8 +691,7 @@
     /**
      * Removes the registered DitControlRule from the DitControlRuleRegistry 
      * 
-     * @param ditControlRuleOid the DitControlRule OID to unregister
-     * @return the schema object associated with the OID
+     * @param String the DitControlRule OID to unregister
      * @throws NamingException if the DitControlRule is invalid
      */
     SchemaObject unregisterDitControlRule( String ditControlRuleOid ) throws NamingException;
@@ -705,8 +700,7 @@
     /**
      * Removes the registered DitStructureRule from the DitStructureRuleRegistry 
      * 
-     * @param ditStructureRuleOid the DitStructureRule OID to unregister
-     * @return the schema object associated with the OID
+     * @param String the DitStructureRule OID to unregister
      * @throws NamingException if the DitStructureRule is invalid
      */
     SchemaObject unregisterDitStructureRule( String ditStructureRuleOid ) throws NamingException;
@@ -715,8 +709,7 @@
     /**
      * Removes the registered MatchingRule from the MatchingRuleRegistry 
      * 
-     * @param matchingRuleOid the MatchingRuleRule OID to unregister
-     * @return the schema object associated with the OID
+     * @param String the MatchingRuleRule OID to unregister
      * @throws NamingException if the MatchingRule is invalid
      */
     SchemaObject unregisterMatchingRule( String matchingRuleOid ) throws NamingException;
@@ -725,7 +718,7 @@
     /**
      * Removes the registered MatchingRuleUse from the MatchingRuleUseRegistry 
      * 
-     * @param matchingRuleUseOid the MatchingRuleUse OID to unregister
+     * @param String the MatchingRuleUse OID to unregister
      * @throws NamingException if the MatchingRuleUse is invalid
      */
     SchemaObject unregisterMatchingRuleUse( String matchingRuleUseOid ) throws NamingException;
@@ -734,7 +727,7 @@
     /**
      * Removes the registered NameForm from the NameFormRegistry 
      * 
-     * @param nameFormOid the NameForm OID to unregister
+     * @param String the NameForm OID to unregister
      * @throws NamingException if the NameForm is invalid
      */
     SchemaObject unregisterNameForm( String nameFormOid ) throws NamingException;
@@ -743,7 +736,7 @@
     /**
      * Removes the registered Normalizer from the NormalizerRegistry 
      * 
-     * @param normalizerOid the Normalizer OID to unregister
+     * @param String the Normalizer OID to unregister
      * @throws NamingException if the Normalizer is invalid
      */
     SchemaObject unregisterNormalizer( String normalizerOid ) throws NamingException;
@@ -752,7 +745,7 @@
     /**
      * Removes the registered ObjectClass from the ObjectClassRegistry 
      * 
-     * @param objectClassOid the ObjectClass OID to unregister
+     * @param String the ObjectClass OID to unregister
      * @throws NamingException if the ObjectClass is invalid
      */
     SchemaObject unregisterObjectClass( String objectClassOid ) throws NamingException;
@@ -761,7 +754,7 @@
     /**
      * Removes the registered LdapSyntax from the LdapSyntaxRegistry 
      * 
-     * @param ldapSyntaxOid the LdapSyntax OID to unregister
+     * @param String the LdapSyntax OID to unregister
      * @throws NamingException if the LdapSyntax is invalid
      */
     SchemaObject unregisterLdapSyntax( String ldapSyntaxOid ) throws NamingException;
@@ -770,7 +763,7 @@
     /**
      * Removes the registered SyntaxChecker from the SyntaxCheckerRegistry 
      * 
-     * @param syntaxCheckerOid the SyntaxChecker OID to unregister
+     * @param String the SyntaxChecker OID to unregister
      * @throws NamingException if the SyntaxChecker is invalid
      */
     SchemaObject unregisterSyntaxChecker( String syntaxCheckerOid ) throws NamingException;

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaLoader.java?rev=893971&r1=893970&r2=893971&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaLoader.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaLoader.java
Sat Dec 26 13:34:40 2009
@@ -27,7 +27,7 @@
 
 
 /**
- * Loads schemas into a SchemaManager's registries.
+ * Loads schemas into registres.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
@@ -69,7 +69,7 @@
      *
      * @param registries the registry to load all enabled schemas into
      * @param check tells if the Registries must be checked after having been loaded
-     * @return the list of errors we met during the loading of schemas
+     * @return the list of erros we met during the loading of schemas
      * @throws Exception if there are any failures
      *
     List<Throwable> loadAllEnabled( Registries registries, boolean check ) throws Exception;
@@ -91,7 +91,6 @@
      * a list of specified schema
      *
      * @param schemas the schemas from which AttributeTypes are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing AttributeType information
      */
     List<Entry> loadAttributeTypes( Schema... schemas ) throws Exception;
@@ -102,7 +101,6 @@
      * a list of specific schema, using their name
      *
      * @param schemaNames the schema names from which AttributeTypes are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing AttributeType information
      */
     List<Entry> loadAttributeTypes( String... schemaNames ) throws Exception;
@@ -113,7 +111,6 @@
      * a list of specific schema.
      *
      * @param schemas the schemas from which Comparators are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing Comparator information
      */
     List<Entry> loadComparators( Schema... schemas ) throws Exception;
@@ -124,7 +121,6 @@
      * a list of specific schema, using their name
      *
      * @param schemaNames the schema names from which Comparators are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing Comparator information
      */
     List<Entry> loadComparators( String... schemaNames ) throws Exception;
@@ -135,7 +131,6 @@
      * a list of specific schema.
      *
      * @param schemas the schemas from which DitContentRules are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing DitContentRule information
      */
     List<Entry> loadDitContentRules( Schema... schemas ) throws Exception;
@@ -146,10 +141,9 @@
      * a list of specified schema names
      *
      * @param schemaNames the schema names from which DitContentRules are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing DitContentRule information
      */
-    List<Entry> loadDitContentRules( String... schemaNames ) throws Exception;
+    List<Entry> loadDitContentRules( String... schemanames ) throws Exception;
 
 
     /**
@@ -157,7 +151,6 @@
      * a list of specific schema.
      *
      * @param schemas the schemas from which DitStructureRules are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing DitStructureRule information
      */
     List<Entry> loadDitStructureRules( Schema... schemas ) throws Exception;
@@ -168,10 +161,9 @@
      * a list of specified schema names
      *
      * @param schemaNames the schema names from which DitStructureRules are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing DitStructureRule information
      */
-    List<Entry> loadDitStructureRules( String... schemaNames ) throws Exception;
+    List<Entry> loadDitStructureRules( String... schemanames ) throws Exception;
 
 
     /**
@@ -179,7 +171,6 @@
      * a list of specific schema
      *
      * @param schemas the schemas from which MatchingRules are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing MatchingRule information
      */
     List<Entry> loadMatchingRules( Schema... schemas ) throws Exception;
@@ -190,7 +181,6 @@
      * a list of specific schema, using their name
      *
      * @param schemaNames the schema names from which MatchingRules are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing MatchingRule information
      */
     List<Entry> loadMatchingRules( String... schemaNames ) throws Exception;
@@ -201,7 +191,6 @@
      * a list of specific schema.
      *
      * @param schemas the schemas from which MatchingRuleUses are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing MatchingRuleUse information
      */
     List<Entry> loadMatchingRuleUses( Schema... schemas ) throws Exception;
@@ -212,10 +201,9 @@
      * a list of specified schema names
      *
      * @param schemaNames the schema names from which MatchingRuleUses are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing MatchingRuleUses information
      */
-    List<Entry> loadMatchingRuleUses( String... schemaNames ) throws Exception;
+    List<Entry> loadMatchingRuleUses( String... schemanames ) throws Exception;
 
 
     /**
@@ -223,7 +211,6 @@
      * a list of specific schema.
      *
      * @param schemas the schemas from which NameForms are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing NameForm information
      */
     List<Entry> loadNameForms( Schema... schemas ) throws Exception;
@@ -234,10 +221,9 @@
      * a list of specified schema names
      *
      * @param schemaNames the schema names from which NameForms are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing NameForms information
      */
-    List<Entry> loadNameForms( String... schemaNames ) throws Exception;
+    List<Entry> loadNameForms( String... schemanames ) throws Exception;
 
 
     /**
@@ -245,7 +231,6 @@
      * a list of specified schema
      *
      * @param schemas the schemas from which Normalizers are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing Normalizer information
      */
     List<Entry> loadNormalizers( Schema... schemas ) throws Exception;
@@ -256,7 +241,6 @@
      * a list of specified schema names
      *
      * @param schemaNames the schema names from which Normalizers are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing Normalizer information
      */
     List<Entry> loadNormalizers( String... schemaNames ) throws Exception;
@@ -267,7 +251,6 @@
      * a list of specific schema.
      *
      * @param schemas the schemas from which ObjectClasses are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing ObjectClass information
      */
     List<Entry> loadObjectClasses( Schema... schemas ) throws Exception;
@@ -278,7 +261,6 @@
      * a list of specified schema names
      *
      * @param schemaNames the schema names from which ObjectClasses are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing ObjectClasses information
      */
     List<Entry> loadObjectClasses( String... schemaNames ) throws Exception;
@@ -289,7 +271,6 @@
      * a list of specified schema
      *
      * @param schemas the schemas from which Syntaxes are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing Syntax information
      */
     List<Entry> loadSyntaxes( Schema... schemas ) throws Exception;
@@ -300,7 +281,6 @@
      * a list of specified schema names
      *
      * @param schemaNames the schema names from which Syntaxes are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing Syntax information
      */
     List<Entry> loadSyntaxes( String... schemaNames ) throws Exception;
@@ -311,7 +291,6 @@
      * a list of specified schema
      *
      * @param schemas the schemas from which SyntaxCheckers are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing SyntaxChecker information
      */
     List<Entry> loadSyntaxCheckers( Schema... schemas ) throws Exception;
@@ -322,10 +301,9 @@
      * a list of specified schema names
      *
      * @param schemaNames the schema names from which SyntaxCheckers are loaded
-     * @return a List of LDAP entries representing schema entities
      * @throws Exception if there are failures accessing SyntaxChecker information
      */
-    List<Entry> loadSyntaxCheckers( String... schemaNames ) throws Exception;
+    List<Entry> loadSyntaxCheckers( String... schemanames ) throws Exception;
 
 
     /**
@@ -344,16 +322,12 @@
     
     /**
      * Add a new schema to the schema's list
-     *
-     * @param schema Schema to add to this loader
      */
-    void addSchema( Schema schema );
+    public void addSchema( Schema schema );
 
     
     /**
      * Remove a schema from the schema's list
-     *
-     * @param schema Schema to remove from this loader
      */
-    void removeSchema( Schema schema );
+    public void removeSchema( Schema schema );
 }



Mime
View raw message