You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/11/22 23:42:44 UTC
svn commit: r883170 - in
/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers:
CachingDnNormalizer.java DnNormalizer.java NameAndOptionalUIDNormalizer.java
Author: elecharny
Date: Sun Nov 22 22:42:43 2009
New Revision: 883170
URL: http://svn.apache.org/viewvc?rev=883170&view=rev
Log:
Added the setSchemaManager method
Modified:
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDnNormalizer.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NameAndOptionalUIDNormalizer.java
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDnNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDnNormalizer.java?rev=883170&r1=883169&r2=883170&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDnNormalizer.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDnNormalizer.java Sun Nov 22 22:42:43 2009
@@ -21,6 +21,7 @@
import javax.naming.NamingException;
+import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.registries.Registries;
@@ -38,7 +39,7 @@
{
/** serial version UID */
private static final long serialVersionUID = -206263185305284269L;
-
+
public CachingDnNormalizer()
{
super( new DnNormalizer() );
@@ -52,4 +53,14 @@
{
super.applyRegistries( registries );
}
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setSchemaManager( SchemaManager schemaManager )
+ {
+ super.normalizer.setSchemaManager( schemaManager );
+ }
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java?rev=883170&r1=883169&r2=883170&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java Sun Nov 22 22:42:43 2009
@@ -41,6 +41,9 @@
// The serial UID
private static final long serialVersionUID = 1L;
+ /** A reference to the schema manager used to normalize the DN */
+ private SchemaManager schemaManager;
+
/**
* Empty constructor
*/
@@ -100,7 +103,7 @@
/**
* {@inheritDoc}
*/
- public void applySchemaManager( SchemaManager schemaManager )
+ public void setSchemaManager( SchemaManager schemaManager )
{
this.schemaManager = schemaManager;
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NameAndOptionalUIDNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NameAndOptionalUIDNormalizer.java?rev=883170&r1=883169&r2=883170&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NameAndOptionalUIDNormalizer.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NameAndOptionalUIDNormalizer.java Sun Nov 22 22:42:43 2009
@@ -22,10 +22,12 @@
import javax.naming.NamingException;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.Normalizer;
+import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -37,16 +39,16 @@
*/
public class NameAndOptionalUIDNormalizer extends Normalizer
{
- private static final String OID = "2.5.13.23";
-
// The serial UID
private static final long serialVersionUID = 1L;
- //public final static NameAndOptionalUIDNormalizer INSTANCE = new NameAndOptionalUIDNormalizer();
+ /** A reference to the schema manager used to normalize the DN */
+ private SchemaManager schemaManager;
+
public NameAndOptionalUIDNormalizer()
{
- super( OID );
+ super( SchemaConstants.UNIQUE_MEMBER_MATCH_MATCH_MR_OID );
}
@@ -146,4 +148,13 @@
return new LdapDN( value ).getNormName();
}
}
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setSchemaManager( SchemaManager schemaManager )
+ {
+ this.schemaManager = schemaManager;
+ }
}