You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/28 21:03:54 UTC
svn commit: r1064849 - in /directory/shared/trunk:
ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/
ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/
ldap/src/main/java/org/apache/directory/shared/ldap...
Author: akarasulu
Date: Fri Jan 28 20:03:53 2011
New Revision: 1064849
URL: http://svn.apache.org/viewvc?rev=1064849&view=rev
Log:
cleaning up: formatting, spelling, dead code removal
Modified:
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolEncoder.java
directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaLoader.java
Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolEncoder.java?rev=1064849&r1=1064848&r2=1064849&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolEncoder.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/protocol/LdapProtocolEncoder.java Fri Jan 28 20:03:53 2011
@@ -46,7 +46,7 @@ public class LdapProtocolEncoder impleme
*/
public void encode( IoSession session, Object message, ProtocolEncoderOutput out ) throws Exception
{
- ByteBuffer buffer = ENCODER.encodeMessage( (Message) message );
+ ByteBuffer buffer = ENCODER.encodeMessage( ( Message ) message );
IoBuffer ioBuffer = IoBuffer.wrap( buffer );
Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1064849&r1=1064848&r2=1064849&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Fri Jan 28 20:03:53 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.model.constants.MetaSchemaConstants;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.entry.*;
+import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.entry.Entry;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java?rev=1064849&r1=1064848&r2=1064849&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java Fri Jan 28 20:03:53 2011
@@ -18,6 +18,7 @@
*/
package org.apache.directory.shared.ldap.model.entry;
+
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
@@ -28,6 +29,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
+
/**
* A generic interface mocking the Attribute JNDI interface. This interface
* will be the base interface for the ServerAttribute and ClientAttribute.
@@ -367,69 +369,6 @@ public interface EntryAttribute extends
String getString() throws LdapInvalidAttributeValueException;
- /*
- * Puts some values to this attribute.
- * <p>
- * The new values will replace the previous values.
- * </p>
- * <p>
- * This method returns the number of values that were put.
- * </p>
- *
- * @param val some values to be put which may be null
- * @return the number of added values, or 0 if none has been added
- *
- int put( String... vals );
-
-
- /**
- * Puts some values to this attribute.
- * <p>
- * The new values will replace the previous values.
- * </p>
- * <p>
- * This method returns the number of values that were put.
- * </p>
- *
- * @param val some values to be put which may be null
- * @return the number of added values, or 0 if none has been added
- *
- int put( byte[]... vals );
-
-
- /**
- * Puts some values to this attribute.
- * <p>
- * The new values are replace the previous values.
- * </p>
- * <p>
- * This method returns the number of values that were put.
- * </p>
- *
- * @param val some values to be put which may be null
- * @return the number of added values, or 0 if none has been added
- *
- int put( Value<?>... vals );
-
-
- /**
- * <p>
- * Puts a list of values into this attribute.
- * </p>
- * <p>
- * The new values will replace the previous values.
- * </p>
- * <p>
- * This method returns the number of values that were put.
- * </p>
- *
- * @param vals the values to be put
- * @return the number of added values, or 0 if none has been added
- *
- int put( List<Value<?>> vals );
- */
-
-
/**
* <p>
* Removes all the values that are equal to the given values.
@@ -495,7 +434,7 @@ public interface EntryAttribute extends
/**
- * Set the normalized ID. The ID will be lowercased, and spaces
+ * Set the normalized ID. The ID will be lower cased, and spaces
* will be trimmed.
*
* @param id The attribute ID
@@ -507,7 +446,7 @@ public interface EntryAttribute extends
/**
* Set the user provided ID. It will also set the ID, normalizing
- * the upId (removing spaces before and after, and lowercasing it)
+ * the upId (removing spaces before and after, and lower casing it)
*
* @param upId The attribute ID
* @throws IllegalArgumentException If the ID is empty or null or
@@ -530,7 +469,7 @@ public interface EntryAttribute extends
* </p>
* <p>
* In any case, the ATtributeType will be changed. The caller is responsible for
- * the present values to be compatoble with the new AttributeType.
+ * the present values to be compatible with the new AttributeType.
* </p>
*
* @param upId The attribute ID
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java?rev=1064849&r1=1064848&r2=1064849&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java Fri Jan 28 20:03:53 2011
@@ -27,12 +27,14 @@ import java.util.Set;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
-import org.apache.directory.shared.ldap.model.schema.registries.*;
import org.apache.directory.shared.ldap.model.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.ComparatorRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.DITContentRuleRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.DITStructureRuleRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.LdapSyntaxRegistry;
+import org.apache.directory.shared.ldap.model.schema.registries.MatchingRuleRegistry;
+import org.apache.directory.shared.ldap.model.schema.registries.MatchingRuleUseRegistry;
+import org.apache.directory.shared.ldap.model.schema.registries.NameFormRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.NormalizerRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.ObjectClassRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.OidRegistry;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java?rev=1064849&r1=1064848&r2=1064849&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java Fri Jan 28 20:03:53 2011
@@ -130,7 +130,7 @@ public interface SchemaObject extends Se
/**
* Add a new name to the list of names for this SchemaObject. The name
- * is lowercased and trimmed.
+ * is lower cased and trimmed.
*
* @param names The names to add
*/
@@ -139,7 +139,7 @@ public interface SchemaObject extends Se
/**
* Sets the list of names for this SchemaObject. The names are
- * lowercased and trimmed.
+ * lower cased and trimmed.
*
* @param names The list of names. Can be empty
*/
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java?rev=1064849&r1=1064848&r2=1064849&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java Fri Jan 28 20:03:53 2011
@@ -57,7 +57,7 @@ public class OidRegistry implements Iter
* Tells if the given OID is present on this registry
*
* @param oid The OID to lookup
- * @return true if the OID alreadyexists
+ * @return true if the OID already exists
*/
public boolean contains( String oid )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaLoader.java?rev=1064849&r1=1064848&r2=1064849&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaLoader.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaLoader.java Fri Jan 28 20:03:53 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
/**
- * Loads schemas into registres.
+ * Loads schemas into registries.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -51,41 +51,6 @@ public interface SchemaLoader
*/
Schema getSchema( String schemaName );
-
- /*
- * Loads a set of schemas. A best effort should be made to load the dependended
- * schemas that these schemas may rely on even if they are not included in the collection.
- *
- * @param registries the registries to populate with these schemas
- * @param check tells if the Registries must be checked after having been loaded
- * @param schemas the set of schemas to load
- * @return the list of erros we met during the loading of schemas
- * @throws Exception if any kind of problems are encountered during the load
- *
- List<Throwable> loadWithDependencies( Registries registries, boolean check, Schema... schemas ) throws Exception;
-
-
- /**
- * Loads all available enabled schemas.
- *
- * @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 erros we met during the loading of schemas
- * @throws Exception if there are any failures
- *
- List<Throwable> loadAllEnabled( Registries registries, boolean check ) throws Exception;
-
-
- /**
- * Loads a single schema. Do not try to resolve dependencies while implementing this method.
- *
- * @param schema the schema to load
- * @param registries the registries to populate with these schemas
- * @param isDepLoad tells the loader if this load request is to satisfy a dependency
- * @throws Exception if any kind of problems are encountered during the load
- *
- void load( Schema schema, Registries registries, boolean isDepLoad ) throws Exception;
- */
/**
* Build a list of AttributeTypes read from the underlying storage for