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/09/02 10:06:59 UTC
svn commit: r810405 - in /directory/shared/branches/shared-schema:
ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/
ldap/src/main/java/org/apache/directory/shared/ldap/schema/
ldap/src/main/java/org/apache/directory/shar...
Author: elecharny
Date: Wed Sep 2 08:06:58 2009
New Revision: 810405
URL: http://svn.apache.org/viewvc?rev=810405&view=rev
Log:
o Fixed the way the Registries was propagated to the Normalizers when using a CachingNormalizer
o Removed useless imports
Modified:
directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/LdifSchemaLoader.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDeepTrimNormalizer.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDeepTrimToLowerNormalizer.java
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/CachingNormalizer.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java
Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/LdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/LdifSchemaLoader.java?rev=810405&r1=810404&r2=810405&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/LdifSchemaLoader.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/loader/ldif/LdifSchemaLoader.java Wed Sep 2 08:06:58 2009
@@ -36,7 +36,6 @@
import org.apache.directory.shared.ldap.schema.registries.AbstractSchemaLoader;
import org.apache.directory.shared.ldap.schema.registries.Schema;
import org.apache.directory.shared.ldap.schema.registries.Registries;
-import org.apache.directory.shared.ldap.schema.syntaxCheckers.AcceptAllSyntaxChecker;
import org.apache.directory.shared.ldap.util.DateUtils;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.Entry;
@@ -59,8 +58,6 @@
import java.util.Map;
import java.util.Stack;
-import javax.naming.NamingException;
-
/**
* Loads schema data from LDIF files containing entries representing schema
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java?rev=810405&r1=810404&r2=810405&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java Wed Sep 2 08:06:58 2009
@@ -23,6 +23,7 @@
import javax.naming.NamingException;
import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.schema.registries.Registries;
/**
@@ -75,4 +76,16 @@
* @throws NamingException if an error results during normalization
*/
public abstract String normalize( String value ) throws NamingException;
+
+
+ /**
+ * Associate the registries to the normalizer, if needed.
+ *
+ * @param registries The Registries
+ */
+ public void setRegistries( Registries registries )
+ {
+ // Do nothing. The extended class will store the Registries if needed
+ }
+
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDeepTrimNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDeepTrimNormalizer.java?rev=810405&r1=810404&r2=810405&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDeepTrimNormalizer.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDeepTrimNormalizer.java Wed Sep 2 08:06:58 2009
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.ldap.schema.normalizers;
+import org.apache.directory.shared.ldap.schema.registries.Registries;
+
/**
* A deep trimming normalizer that caches normalizations to prevent repeat
@@ -39,4 +41,13 @@
{
super( new DeepTrimNormalizer() );
}
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setRegistries( Registries registries )
+ {
+ super.setRegistries( registries );
+ }
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDeepTrimToLowerNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDeepTrimToLowerNormalizer.java?rev=810405&r1=810404&r2=810405&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDeepTrimToLowerNormalizer.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingDeepTrimToLowerNormalizer.java Wed Sep 2 08:06:58 2009
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.ldap.schema.normalizers;
+import org.apache.directory.shared.ldap.schema.registries.Registries;
+
/**
* A deep trimming normalizer that caches normalizations to prevent repeat
@@ -39,4 +41,13 @@
{
super( new DeepTrimToLowerNormalizer() );
}
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setRegistries( Registries registries )
+ {
+ super.setRegistries( registries );
+ }
}
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=810405&r1=810404&r2=810405&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 Wed Sep 2 08:06:58 2009
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.ldap.schema.normalizers;
+import org.apache.directory.shared.ldap.schema.registries.Registries;
+
/**
* A deep trimming normalizer that caches normalizations to prevent repeat
@@ -39,4 +41,13 @@
{
super( new DnNormalizer() );
}
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setRegistries( Registries registries )
+ {
+ super.setRegistries( registries );
+ }
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingNormalizer.java?rev=810405&r1=810404&r2=810405&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingNormalizer.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingNormalizer.java Wed Sep 2 08:06:58 2009
@@ -24,6 +24,7 @@
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.schema.Normalizer;
+import org.apache.directory.shared.ldap.schema.registries.Registries;
import org.apache.directory.shared.ldap.util.SynchronizedLRUMap;
@@ -114,7 +115,7 @@
return null;
}
- Value<?> result =(Value<?>)cache.get( value );
+ Value<?> result = (Value<?>)cache.get( value );
if ( result != null )
{
@@ -137,7 +138,7 @@
return null;
}
- String normalized =(String)cache.get( value );
+ String normalized = (String)cache.get( value );
if ( normalized != null )
{
@@ -148,4 +149,13 @@
cache.put( value, normalized );
return normalized;
}
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setRegistries( Registries registries )
+ {
+ normalizer.setRegistries( registries );
+ }
}
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=810405&r1=810404&r2=810405&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 Wed Sep 2 08:06:58 2009
@@ -65,6 +65,9 @@
}
+ /**
+ * {@inheritDoc}
+ */
public void setRegistries( Registries registries )
{
this.attrRegistry = registries.getAttributeTypeRegistry();