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 2009/08/28 22:20:25 UTC
svn commit: r809015 - in /directory:
apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/
apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/
apacheds/b...
Author: akarasulu
Date: Fri Aug 28 20:20:23 2009
New Revision: 809015
URL: http://svn.apache.org/viewvc?rev=809015&view=rev
Log:
moving inner classes in producers for normalizers and comparators that are referred to in the FQCN attribute of LDIF entries
Added:
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/DeepTrimCachingNormalizingComparator.java
Removed:
directory/apacheds/branches/apacheds-schema/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisComparatorProducer.java
directory/apacheds/branches/apacheds-schema/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisMatchingRuleProducer.java
directory/apacheds/branches/apacheds-schema/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/NisSyntaxProducer.java
Modified:
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
directory/apacheds/branches/apacheds-schema/schema-data/src/main/resources/schema/schema/nis/comparators/1.3.6.1.4.1.4203.1.2.1.ldif
directory/apacheds/branches/apacheds-schema/schema-data/src/main/resources/schema/schema/nis/normalizers/1.3.6.1.4.1.4203.1.2.1.ldif
directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/SchemaEntityFactory.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapComparator.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LoadableSchemaObject.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/SchemaObject.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ComparableComparator.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/NormalizingComparator.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/DeepTrimNormalizer.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/AudioSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificateListSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificatePairSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificateSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/ComparatorSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/EnhancedGuideSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/FacsimileTelephoneNumberSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/FaxSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/GuideSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/NormalizerSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/PresentationAddressSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SubstringAssertionSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SupportedAlgorithmSyntaxChecker.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SyntaxCheckerSyntaxChecker.java
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java Fri Aug 28 20:20:23 2009
@@ -204,7 +204,7 @@
LdapComparator<?> comparator = factory.getLdapComparator( entry, targetRegistries );
comparatorRegistry.unregister( oldOid );
LdapComparatorDescription comparatorDescription = getLdapComparatorDescription( schema.getSchemaName(), entry );
- comparatorDescription.changeOid( oid );
+ comparatorDescription.setOid( oid );
comparatorRegistry.register( comparatorDescription, comparator );
}
}
@@ -240,7 +240,7 @@
if ( ! newSchema.isDisabled() )
{
LdapComparatorDescription comparatorDescription = getLdapComparatorDescription( newSchema.getSchemaName(), entry );
- comparatorDescription.changeOid( oid );
+ comparatorDescription.setOid( oid );
comparatorRegistry.register( comparatorDescription, comparator );
}
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java Fri Aug 28 20:20:23 2009
@@ -207,7 +207,7 @@
normalizerRegistry.unregister( oldOid );
NormalizerDescription normalizerDescription = getNormalizerDescription( schema.getSchemaName(), entry );
- normalizerDescription.changeOid( oid );
+ normalizerDescription.setOid( oid );
normalizerRegistry.register( normalizerDescription, normalizer );
}
}
@@ -243,7 +243,7 @@
if ( ! newSchema.isDisabled() )
{
NormalizerDescription normalizerDescription = getNormalizerDescription( newSchema.getSchemaName(), entry );
- normalizerDescription.changeOid( oid );
+ normalizerDescription.setOid( oid );
normalizerRegistry.register( normalizerDescription, normalizer );
}
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java Fri Aug 28 20:20:23 2009
@@ -218,7 +218,7 @@
syntaxCheckerRegistry.unregister( oldOid );
SyntaxCheckerDescription syntaxCheckerDescription =
getSyntaxCheckerDescription( schema.getSchemaName(), entry );
- syntaxCheckerDescription.changeOid( newOid );
+ syntaxCheckerDescription.setOid( newOid );
syntaxCheckerRegistry.register( syntaxCheckerDescription, syntaxChecker );
}
}
@@ -261,7 +261,7 @@
{
SyntaxCheckerDescription syntaxCheckerDescription =
getSyntaxCheckerDescription( newSchema.getSchemaName(), entry );
- syntaxCheckerDescription.changeOid( newOid );
+ syntaxCheckerDescription.setOid( newOid );
syntaxCheckerRegistry.register( syntaxCheckerDescription, syntaxChecker );
}
}
Modified: directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/BootstrapSchemaLoader.java Fri Aug 28 20:20:23 2009
@@ -235,7 +235,7 @@
normalizerRegistry = registries.getNormalizerRegistry();
NormalizerDescription normalizerDescription = new NormalizerDescription();
- normalizerDescription.changeOid( id );
+ normalizerDescription.setOid( id );
normalizerDescription.setFqcn( normalizer.getClass().getName() );
normalizerDescription.addExtension( MetaSchemaConstants.X_SCHEMA, values );
Modified: directory/apacheds/branches/apacheds-schema/schema-data/src/main/resources/schema/schema/nis/comparators/1.3.6.1.4.1.4203.1.2.1.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-data/src/main/resources/schema/schema/nis/comparators/1.3.6.1.4.1.4203.1.2.1.ldif?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-data/src/main/resources/schema/schema/nis/comparators/1.3.6.1.4.1.4203.1.2.1.ldif (original)
+++ directory/apacheds/branches/apacheds-schema/schema-data/src/main/resources/schema/schema/nis/comparators/1.3.6.1.4.1.4203.1.2.1.ldif Fri Aug 28 20:20:23 2009
@@ -7,5 +7,5 @@
objectclass: top
entrycsn: 20090818052728.031000Z#000000#000#000000
m-oid: 1.3.6.1.4.1.4203.1.2.1
-m-fqcn: org.apache.directory.server.schema.bootstrap.NisComparatorProducer$DeepT
- rimCachingNormalizingComparator
+m-fqcn: org.apache.directory.shared.ldap.schema.comparators.DeepTrimCachingNorma
+ lizingComparator
Modified: directory/apacheds/branches/apacheds-schema/schema-data/src/main/resources/schema/schema/nis/normalizers/1.3.6.1.4.1.4203.1.2.1.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-data/src/main/resources/schema/schema/nis/normalizers/1.3.6.1.4.1.4203.1.2.1.ldif?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-data/src/main/resources/schema/schema/nis/normalizers/1.3.6.1.4.1.4203.1.2.1.ldif (original)
+++ directory/apacheds/branches/apacheds-schema/schema-data/src/main/resources/schema/schema/nis/normalizers/1.3.6.1.4.1.4203.1.2.1.ldif Fri Aug 28 20:20:23 2009
@@ -7,5 +7,5 @@
objectclass: top
entrycsn: 20090818052727.557000Z#000000#000#000000
m-oid: 1.3.6.1.4.1.4203.1.2.1
-m-fqcn: org.apache.directory.server.schema.bootstrap.NisNormalizerProducer$Cachi
- ngDeepTrimNormalizer
+m-fqcn: org.apache.directory.shared.ldap.schema.normalizers.CachingDeepTrimNorma
+ lizer
Modified: directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/SchemaEntityFactory.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/SchemaEntityFactory.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-loader/src/main/java/org/apache/directory/server/schema/loader/ldif/SchemaEntityFactory.java Fri Aug 28 20:20:23 2009
@@ -19,7 +19,6 @@
*/
package org.apache.directory.server.schema.loader.ldif;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashSet;
@@ -35,8 +34,6 @@
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
-import org.apache.directory.shared.ldap.exception.LdapNamingException;
-import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.LdapComparator;
import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -66,9 +63,6 @@
/** Used for looking up the setRegistries(Registries) method */
private final static Class<?>[] parameterTypes = new Class[] { Registries.class };
- /** Used for looking up the setSyntaxOid(String) method */
- private final static Class<?>[] setOidParameterTypes = new Class[] { String.class };
-
private static final List<String> EMPTY_LIST = new ArrayList<String>();
private static final String[] EMPTY_ARRAY = new String[] {};
@@ -76,13 +70,13 @@
private final AttributeClassLoader classLoader;
- public SchemaEntityFactory() throws NamingException
+ public SchemaEntityFactory() throws Exception
{
this.classLoader = new AttributeClassLoader();
}
- public Schema getSchema( Entry entry ) throws NamingException
+ public Schema getSchema( Entry entry ) throws Exception
{
String name;
String owner;
@@ -133,55 +127,27 @@
}
- private SyntaxChecker getSyntaxChecker( String syntaxOid, String className, EntryAttribute bytecode, Registries targetRegistries )
- throws NamingException
+ private SyntaxChecker getSyntaxChecker( String syntaxOid, String className,
+ EntryAttribute bytecode, Registries targetRegistries ) throws Exception
{
Class<?> clazz = null;
SyntaxChecker syntaxChecker = null;
- try
+ if ( bytecode == null )
{
- if ( bytecode == null )
- {
- clazz = Class.forName( className );
- }
- else
- {
- classLoader.setAttribute( bytecode );
- clazz = classLoader.loadClass( className );
- }
+ clazz = Class.forName( className );
}
- catch ( ClassNotFoundException e )
+ else
{
- LdapNamingException ne = new LdapNamingException(
- "Normalizer class "+ className + " was not found", ResultCodeEnum.OTHER );
- ne.setRootCause( e );
- throw ne;
+ classLoader.setAttribute( bytecode );
+ clazz = classLoader.loadClass( className );
}
- try
- {
- syntaxChecker = ( SyntaxChecker ) clazz.newInstance();
- }
- catch ( InstantiationException e )
- {
- LdapNamingException ne = new LdapNamingException( "Failed to instantiate SyntaxChecker class "+ className
- + ".\nCheck that a default constructor exists for the class.", ResultCodeEnum.OTHER );
- ne.setRootCause( e );
- throw ne;
- }
- catch ( IllegalAccessException e )
- {
- LdapNamingException ne = new LdapNamingException( "Failed to instantiate SyntaxChecker class "+ className
- + ".\nCheck that a **PUBLIC** accessible default constructor exists for the class.",
- ResultCodeEnum.OTHER );
- ne.setRootCause( e );
- throw ne;
- }
+ syntaxChecker = ( SyntaxChecker ) clazz.newInstance();
// try now before returning to check if we can inject a Registries object
+ syntaxChecker.setOid( syntaxOid );
injectRegistries( syntaxChecker, targetRegistries );
- injectOid( syntaxOid, syntaxChecker );
return syntaxChecker;
}
@@ -193,7 +159,7 @@
* @return the loaded SyntaxChecker
* @throws NamingException if anything fails during loading
*/
- public SyntaxChecker getSyntaxChecker( Entry entry, Registries targetRegistries ) throws NamingException
+ public SyntaxChecker getSyntaxChecker( Entry entry, Registries targetRegistries ) throws Exception
{
if ( entry == null )
{
@@ -214,7 +180,7 @@
public SyntaxChecker getSyntaxChecker( SyntaxCheckerDescription syntaxCheckerDescription,
- Registries targetRegistries ) throws NamingException
+ Registries targetRegistries ) throws Exception
{
EntryAttribute attr = null;
@@ -229,69 +195,32 @@
}
- private LdapComparator<?> getLdapComparator( String className, EntryAttribute bytecode, Registries targetRegistries )
- throws NamingException
+ private LdapComparator<?> getLdapComparator( String oid, String className,
+ EntryAttribute bytecode, Registries targetRegistries ) throws Exception
{
LdapComparator<?> comparator = null;
Class<?> clazz = null;
if ( bytecode == null )
{
- try
- {
- clazz = Class.forName( className );
- }
- catch ( ClassNotFoundException e )
- {
- LdapNamingException ne = new LdapNamingException( "Comparator class "+ className + " was not found",
- ResultCodeEnum.OTHER );
- ne.setRootCause( e );
- throw ne;
- }
+ clazz = Class.forName( className );
}
else
{
classLoader.setAttribute( bytecode );
-
- try
- {
- clazz = classLoader.loadClass( className );
- }
- catch ( ClassNotFoundException e )
- {
- LdapNamingException ne = new LdapNamingException( "Comparator class "+ className + " was not found",
- ResultCodeEnum.OTHER );
- ne.setRootCause( e );
- throw ne;
- }
- }
-
- try
- {
- comparator = ( LdapComparator<?> ) clazz.newInstance();
- }
- catch ( InstantiationException e )
- {
- NamingException ne = new NamingException( "Failed to instantiate comparator class "+ className
- + ".\nCheck that a default constructor exists for the class." );
- ne.setRootCause( e );
- throw ne;
- }
- catch ( IllegalAccessException e )
- {
- NamingException ne = new NamingException( "Failed to instantiate comparator class "+ className
- + ".\nCheck that a **PUBLIC** accessible default constructor exists for the class." );
- ne.setRootCause( e );
- throw ne;
+ clazz = classLoader.loadClass( className );
}
+ comparator = ( LdapComparator<?> ) clazz.newInstance();
+ comparator.setOid( oid );
injectRegistries( comparator, targetRegistries );
return comparator;
}
- public LdapComparator<?> getLdapComparator( LdapComparatorDescription comparatorDescription, Registries targetRegistries )
- throws NamingException
+ public LdapComparator<?> getLdapComparator(
+ LdapComparatorDescription comparatorDescription,
+ Registries targetRegistries ) throws Exception
{
EntryAttribute attr = null;
@@ -301,7 +230,8 @@
attr = new DefaultClientAttribute( MetaSchemaConstants.M_BYTECODE_AT, bytecode );
}
- return getLdapComparator( comparatorDescription.getFqcn(), attr, targetRegistries );
+ return getLdapComparator( comparatorDescription.getOid(),
+ comparatorDescription.getFqcn(), attr, targetRegistries );
}
@@ -312,7 +242,8 @@
* @return the loaded Comparator
* @throws NamingException if anything fails during loading
*/
- public LdapComparator<?> getLdapComparator( Entry entry, Registries targetRegistries ) throws NamingException
+ public LdapComparator<?> getLdapComparator( Entry entry,
+ Registries targetRegistries ) throws Exception
{
if ( entry == null )
{
@@ -326,64 +257,36 @@
}
String className = entry.get( MetaSchemaConstants.M_FQCN_AT ).get().getString();
- return getLdapComparator( className, entry.get( MetaSchemaConstants.M_BYTECODE_AT ), targetRegistries );
+ return getLdapComparator( entry.get( MetaSchemaConstants.M_OID_AT ).toString(),
+ className, entry.get( MetaSchemaConstants.M_BYTECODE_AT ), targetRegistries );
}
- private Normalizer getNormalizer( String className, EntryAttribute bytecode, Registries targetRegistries )
- throws NamingException
+ private Normalizer getNormalizer( String oid, String className,
+ EntryAttribute bytecode, Registries targetRegistries ) throws Exception
{
Class<?> clazz = null;
Normalizer normalizer = null;
- try
- {
- if ( bytecode == null )
- {
- clazz = Class.forName( className );
- }
- else
- {
- classLoader.setAttribute( bytecode );
- clazz = classLoader.loadClass( className );
- }
- }
- catch ( ClassNotFoundException e )
- {
- LdapNamingException ne = new LdapNamingException(
- "Normalizer class "+ className + " was not found", ResultCodeEnum.OTHER );
- ne.setRootCause( e );
- throw ne;
- }
-
- try
+ if ( bytecode == null )
{
- normalizer = ( Normalizer ) clazz.newInstance();
+ clazz = Class.forName( className );
}
- catch ( InstantiationException e )
- {
- LdapNamingException ne = new LdapNamingException( "Failed to instantiate normalizer class "+ className
- + ".\nCheck that a default constructor exists for the class.", ResultCodeEnum.OTHER );
- ne.setRootCause( e );
- throw ne;
- }
- catch ( IllegalAccessException e )
+ else
{
- LdapNamingException ne = new LdapNamingException( "Failed to instantiate normalizer class "+ className
- + ".\nCheck that a **PUBLIC** accessible default constructor exists for the class.",
- ResultCodeEnum.OTHER );
- ne.setRootCause( e );
- throw ne;
+ classLoader.setAttribute( bytecode );
+ clazz = classLoader.loadClass( className );
}
- // try now before returning to check if we can inject a Registries object
+ normalizer = ( Normalizer ) clazz.newInstance();
+ normalizer.setOid( oid );
injectRegistries( normalizer, targetRegistries );
return normalizer;
}
- public Normalizer getNormalizer( NormalizerDescription normalizerDescription, Registries targetRegistries )
- throws NamingException
+ public Normalizer getNormalizer( NormalizerDescription normalizerDescription,
+ Registries targetRegistries ) throws Exception
{
EntryAttribute attr = null;
@@ -393,7 +296,8 @@
attr = new DefaultClientAttribute( MetaSchemaConstants.M_BYTECODE_AT, bytecode );
}
- return getNormalizer( normalizerDescription.getFqcn(), attr, targetRegistries );
+ return getNormalizer( normalizerDescription.getOid(),
+ normalizerDescription.getFqcn(), attr, targetRegistries );
}
@@ -404,7 +308,8 @@
* @return the loaded Normalizer
* @throws NamingException if anything fails during loading
*/
- public Normalizer getNormalizer( Entry entry, Registries targetRegistries ) throws NamingException
+ public Normalizer getNormalizer( Entry entry, Registries targetRegistries )
+ throws Exception
{
if ( entry == null )
{
@@ -417,8 +322,10 @@
+ MetaSchemaConstants.M_FQCN_AT + " attribute" );
}
- String className = entry.get( MetaSchemaConstants.M_FQCN_AT ).get().getString();
- return getNormalizer( className, entry.get( MetaSchemaConstants.M_BYTECODE_AT ), targetRegistries );
+ String className = entry.get( MetaSchemaConstants.M_FQCN_AT ).getString();
+ String oid = entry.get( MetaSchemaConstants.M_OID_AT ).getString();
+ EntryAttribute bytecode = entry.get( MetaSchemaConstants.M_BYTECODE_AT );
+ return getNormalizer( oid, className, bytecode, targetRegistries );
}
@@ -429,112 +336,17 @@
*
* @param obj a schema object to have a Registries dependency injected.
*/
- private void injectRegistries( Object obj, Registries targetRegistries ) throws NamingException
+ private void injectRegistries( Object obj, Registries targetRegistries ) throws Exception
{
- String className = obj.getClass().getName();
+ Method method = obj.getClass().getMethod( "setRegistries", parameterTypes );
- try
+ if ( method == null )
{
- Method method = obj.getClass().getMethod( "setRegistries", parameterTypes );
-
- if ( method == null )
- {
- return;
- }
-
- Object[] args = new Object[] { targetRegistries };
- method.invoke( obj, args );
+ return;
}
- catch ( SecurityException e )
- {
- NamingException ne = new NamingException( "SyntaxChecker class "+ className
- + " could not have the Registries dependency injected." );
- ne.setRootCause( e );
- throw ne;
- }
- catch ( NoSuchMethodException e )
- {
- // this is ok since not every object may have setRegistries()
- }
- catch ( IllegalArgumentException e )
- {
- NamingException ne = new NamingException( "SyntaxChecker class "+ className
- + " could not have the Registries dependency injected." );
- ne.setRootCause( e );
- throw ne;
- }
- catch ( IllegalAccessException e )
- {
- NamingException ne = new NamingException( "SyntaxChecker class "+ className
- + " could not have the Registries dependency injected." );
- ne.setRootCause( e );
- throw ne;
- }
- catch ( InvocationTargetException e )
- {
- NamingException ne = new NamingException( "SyntaxChecker class "+ className
- + " could not have the Registries dependency injected." );
- ne.setRootCause( e );
- throw ne;
- }
- }
-
-
- /**
- * Uses reflection to see if a setSyntaxOid( String ) method exists
- * on the object's class. If so then the oid dependency is injected into the
- * new SyntaxChecker.
- *
- * @param obj a schema object to have a oid dependency injected.
- */
- private void injectOid( String syntaxOid, SyntaxChecker checker ) throws NamingException
- {
- String className = checker.getClass().getName();
- try
- {
- Method method = checker.getClass().getMethod( "setSyntaxOid", setOidParameterTypes );
-
- if ( method == null )
- {
- return;
- }
-
- Object[] args = new Object[] { syntaxOid};
- method.invoke( checker, args );
- }
- catch ( SecurityException e )
- {
- NamingException ne = new NamingException( "SyntaxChecker class "+ className
- + " could not have the oid dependency injected." );
- ne.setRootCause( e );
- throw ne;
- }
- catch ( NoSuchMethodException e )
- {
- // this is ok since not every object may have setSyntaxOid()
- }
- catch ( IllegalArgumentException e )
- {
- NamingException ne = new NamingException( "SyntaxChecker class "+ className
- + " could not have the oid dependency injected." );
- ne.setRootCause( e );
- throw ne;
- }
- catch ( IllegalAccessException e )
- {
- NamingException ne = new NamingException( "SyntaxChecker class "+ className
- + " could not have the oid dependency injected." );
- ne.setRootCause( e );
- throw ne;
- }
- catch ( InvocationTargetException e )
- {
- NamingException ne = new NamingException( "SyntaxChecker class "+ className
- + " could not have the oid dependency injected." );
- ne.setRootCause( e );
- throw ne;
- }
+ Object[] args = new Object[] { targetRegistries };
+ method.invoke( obj, args );
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapComparator.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapComparator.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LdapComparator.java Fri Aug 28 20:20:23 2009
@@ -42,4 +42,14 @@
{
super( SchemaObjectType.COMPARATOR, oid );
}
+
+
+ /**
+ * Create a new instance of a Comparator when the OID is not known until
+ * after instantiation.
+ */
+ protected LdapComparator()
+ {
+ super( SchemaObjectType.COMPARATOR );
+ }
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LoadableSchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LoadableSchemaObject.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LoadableSchemaObject.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/LoadableSchemaObject.java Fri Aug 28 20:20:23 2009
@@ -39,7 +39,8 @@
/**
- * The default constructor
+ * Constructor to use when the OID is known in advance.
+ *
* @param objectType The SchemaObject type
* @param oid The SchemaObject OID
*/
@@ -53,6 +54,20 @@
/**
+ * Constructor to use when the OID is not known until after instantiation.
+ *
+ * @param objectType The SchemaObject type
+ */
+ protected LoadableSchemaObject( SchemaObjectType objectType )
+ {
+ super( objectType );
+
+ fqcn = "";
+ bytecode = null;
+ }
+
+
+ /**
* @return The associated bytecode of this SchemaObject instance
*/
public String getBytecode()
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=809015&r1=809014&r2=809015&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 Fri Aug 28 20:20:23 2009
@@ -48,6 +48,16 @@
}
+ /**
+ * Use this default constructor when the Normalizer must be instantiated
+ * before setting the OID.
+ */
+ protected Normalizer()
+ {
+ super( SchemaObjectType.NORMALIZER );
+ }
+
+
/**
* Gets the normalized value.
*
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaObject.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaObject.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaObject.java Fri Aug 28 20:20:23 2009
@@ -103,7 +103,7 @@
/**
- * A default constructor for a SchemaObject instance. It must be
+ * A constructor for a SchemaObject instance. It must be
* invoked by the inherited class.
*
* @param objectType The SchemaObjectType to create
@@ -121,6 +121,23 @@
/**
+ * Constructor used when a generic reusable SchemaObject is assigned an
+ * OID after being instantiated.
+ *
+ * @param objectType The SchemaObjectType to create
+ */
+ protected SchemaObject( SchemaObjectType objectType )
+ {
+ this.objectType = objectType;
+ isEnabled = true;
+ isReadOnly = false;
+ extensions = new HashMap<String, List<String>>();
+ names = new ArrayList<String>();
+ names.add( oid );
+ }
+
+
+ /**
* Gets usually what is the numeric object identifier assigned to this
* SchemaObject. All schema objects except for MatchingRuleUses have an OID
* assigned specifically to then. A MatchingRuleUse's OID really is the OID
@@ -141,12 +158,9 @@
* change it's OID
* @param oid The new OID
*/
- public void changeOid( String oid )
+ public void setOid( String oid )
{
- if ( !isReadOnly )
- {
- this.oid = oid;
- }
+ this.oid = oid;
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ComparableComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ComparableComparator.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ComparableComparator.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/ComparableComparator.java Fri Aug 28 20:20:23 2009
@@ -33,7 +33,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class ComparableComparator extends LdapComparator<Object>
+public class ComparableComparator<T> extends LdapComparator<Comparable<T>>
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( ComparableComparator.class );
@@ -69,7 +69,7 @@
*
* @see Comparator#compare(Object, Object)
*/
- public int compare( Object o1, Object o2 )
+ public int compare( Comparable<T> o1, Comparable<T> o2 )
{
LOG.debug( "comparing objects '{}' with '{}'", o1, o2 );
@@ -86,7 +86,7 @@
}
else
{
- return ( ( Comparable ) o1 ).compareTo( o2 );
+ return o1.compareTo( ( T ) o2 );
}
}
@@ -102,7 +102,7 @@
}
else
{
- return -( ( Comparable ) o2 ).compareTo( o1 );
+ return - o2.compareTo( ( T ) o1 );
}
}
Added: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/DeepTrimCachingNormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/DeepTrimCachingNormalizingComparator.java?rev=809015&view=auto
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/DeepTrimCachingNormalizingComparator.java (added)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/DeepTrimCachingNormalizingComparator.java Fri Aug 28 20:20:23 2009
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.shared.ldap.schema.comparators;
+
+
+import org.apache.directory.shared.ldap.schema.normalizers.CachingNormalizer;
+import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimNormalizer;
+
+
+/**
+ * TODO DeepTrimCachingNormalizingComparator.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class DeepTrimCachingNormalizingComparator extends NormalizingComparator
+{
+ private static final long serialVersionUID = -3462901701103045845L;
+
+
+ public DeepTrimCachingNormalizingComparator()
+ {
+ super( new CachingNormalizer( new DeepTrimNormalizer(), 10 ),
+ new ComparableComparator() );
+ }
+}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/NormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/NormalizingComparator.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/NormalizingComparator.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/NormalizingComparator.java Fri Aug 28 20:20:23 2009
@@ -20,11 +20,12 @@
package org.apache.directory.shared.ldap.schema.comparators;
-import java.util.Comparator;
+import java.util.Comparator;
import javax.naming.NamingException;
import org.apache.directory.shared.ldap.schema.LdapComparator;
import org.apache.directory.shared.ldap.schema.Normalizer;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,7 +37,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class NormalizingComparator
+public class NormalizingComparator extends LdapComparator<String>
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( NormalizingComparator.class );
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=809015&r1=809014&r2=809015&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 Fri Aug 28 20:20:23 2009
@@ -54,12 +54,12 @@
/**
* Creates a CachingNormalizer that decorates another normalizer using a
- * default cache size.
+ * default cache size. This Normalizer delegates
*
* @param oid The MR OID to use with this Normalizer
* @param normalizer the underlying Normalizer being decorated
*/
- public CachingNormalizer( String oid, Normalizer normalizer )
+ public CachingNormalizer( Normalizer normalizer )
{
this( normalizer, CACHE_MAX );
}
@@ -79,6 +79,29 @@
cache = new SynchronizedLRUMap( cacheSz );
}
+
+ /**
+ * Overrides default behavior by returning the OID of the wrapped
+ * Normalizer.
+ */
+ @Override
+ public String getOid()
+ {
+ return normalizer.getOid();
+ }
+
+
+ /**
+ * Overrides default behavior by setting the OID of the wrapped Normalizer.
+ *
+ * @param oid the object identifier to set
+ */
+ @Override
+ public void setOid( String oid )
+ {
+ normalizer.setOid( oid );
+ }
+
/**
* {@inheritDoc}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java Fri Aug 28 20:20:23 2009
@@ -43,8 +43,9 @@
/** The serial UID */
public static final long serialVersionUID = 1L;
+
/**
- * Creates a new instance of DeepTrimNormalizer.
+ * Creates a new instance of DeepTrimNormalizer with OID known.
*
* @param oid The MR OID to use with this Normalizer
*/
@@ -54,6 +55,15 @@
}
+ /**
+ * Creates a new instance of DeepTrimNormalizer when the Normalizer must be
+ * instantiated before setting the OID.
+ */
+ public DeepTrimNormalizer()
+ {
+ }
+
+
/**
* {@inheritDoc}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/OpenLdapSchemaParser.java Fri Aug 28 20:20:23 2009
@@ -164,13 +164,13 @@
// apply object identifier macros to object classes
for ( ObjectClass objectClass : objectClasses )
{
- objectClass.changeOid( getResolveOid( objectClass.getOid() ) );
+ objectClass.setOid( getResolveOid( objectClass.getOid() ) );
}
// apply object identifier macros to attribute types
for ( AttributeType attributeType : attributeTypes )
{
- attributeType.changeOid( getResolveOid( attributeType.getOid() ) );
+ attributeType.setOid( getResolveOid( attributeType.getOid() ) );
attributeType.setSyntaxOid( getResolveOid( attributeType.getSyntaxOid() ) );
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/AudioSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/AudioSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/AudioSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/AudioSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -50,7 +50,7 @@
public AudioSyntaxChecker()
{
super();
- changeOid( SchemaConstants.AUDIO_SYNTAX );
+ setOid( SchemaConstants.AUDIO_SYNTAX );
}
/**
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificateListSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificateListSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificateListSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificateListSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -52,7 +52,7 @@
public CertificateListSyntaxChecker()
{
super();
- changeOid( SchemaConstants.CERTIFICATE_LIST_SYNTAX );
+ setOid( SchemaConstants.CERTIFICATE_LIST_SYNTAX );
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificatePairSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificatePairSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificatePairSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificatePairSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -52,7 +52,7 @@
public CertificatePairSyntaxChecker()
{
super();
- changeOid( SchemaConstants.CERTIFICATE_PAIR_SYNTAX );
+ setOid( SchemaConstants.CERTIFICATE_PAIR_SYNTAX );
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificateSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificateSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificateSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/CertificateSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -52,7 +52,7 @@
public CertificateSyntaxChecker()
{
super();
- changeOid( SchemaConstants.CERTIFICATE_SYNTAX );
+ setOid( SchemaConstants.CERTIFICATE_SYNTAX );
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/ComparatorSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/ComparatorSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/ComparatorSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/ComparatorSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -40,6 +40,6 @@
public ComparatorSyntaxChecker()
{
super();
- changeOid( SchemaConstants.COMPARATOR_SYNTAX );
+ setOid( SchemaConstants.COMPARATOR_SYNTAX );
}
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/EnhancedGuideSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/EnhancedGuideSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/EnhancedGuideSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/EnhancedGuideSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -47,7 +47,7 @@
public EnhancedGuideSyntaxChecker()
{
super();
- changeOid( SchemaConstants.ENHANCED_GUIDE_SYNTAX );
+ setOid( SchemaConstants.ENHANCED_GUIDE_SYNTAX );
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/FacsimileTelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/FacsimileTelephoneNumberSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/FacsimileTelephoneNumberSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/FacsimileTelephoneNumberSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -89,7 +89,7 @@
public FacsimileTelephoneNumberSyntaxChecker()
{
super();
- changeOid( SchemaConstants.FACSIMILE_TELEPHONE_NUMBER_SYNTAX );
+ setOid( SchemaConstants.FACSIMILE_TELEPHONE_NUMBER_SYNTAX );
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/FaxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/FaxSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/FaxSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/FaxSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -47,7 +47,7 @@
public FaxSyntaxChecker()
{
super();
- changeOid( SchemaConstants.FAX_SYNTAX );
+ setOid( SchemaConstants.FAX_SYNTAX );
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/GuideSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/GuideSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/GuideSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/GuideSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -46,7 +46,7 @@
public GuideSyntaxChecker()
{
super();
- changeOid( SchemaConstants.GUIDE_SYNTAX );
+ setOid( SchemaConstants.GUIDE_SYNTAX );
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/NormalizerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/NormalizerSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/NormalizerSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/NormalizerSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -38,6 +38,6 @@
public NormalizerSyntaxChecker()
{
super();
- changeOid( SchemaConstants.NORMALIZER_SYNTAX );
+ setOid( SchemaConstants.NORMALIZER_SYNTAX );
}
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/PresentationAddressSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/PresentationAddressSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/PresentationAddressSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/PresentationAddressSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -46,7 +46,7 @@
public PresentationAddressSyntaxChecker()
{
super();
- changeOid( SchemaConstants.PRESENTATION_ADDRESS_SYNTAX );
+ setOid( SchemaConstants.PRESENTATION_ADDRESS_SYNTAX );
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SubstringAssertionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SubstringAssertionSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SubstringAssertionSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SubstringAssertionSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -47,7 +47,7 @@
public SubstringAssertionSyntaxChecker()
{
super();
- changeOid( SchemaConstants.SUBSTRING_ASSERTION_SYNTAX );
+ setOid( SchemaConstants.SUBSTRING_ASSERTION_SYNTAX );
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SupportedAlgorithmSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SupportedAlgorithmSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SupportedAlgorithmSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SupportedAlgorithmSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -46,7 +46,7 @@
public SupportedAlgorithmSyntaxChecker()
{
super();
- changeOid( SchemaConstants.SUPPORTED_ALGORITHM_SYNTAX );
+ setOid( SchemaConstants.SUPPORTED_ALGORITHM_SYNTAX );
}
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SyntaxCheckerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SyntaxCheckerSyntaxChecker.java?rev=809015&r1=809014&r2=809015&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SyntaxCheckerSyntaxChecker.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxChecker/SyntaxCheckerSyntaxChecker.java Fri Aug 28 20:20:23 2009
@@ -38,6 +38,6 @@
public SyntaxCheckerSyntaxChecker()
{
super();
- changeOid( SchemaConstants.SYNTAX_CHECKER_SYNTAX );
+ setOid( SchemaConstants.SYNTAX_CHECKER_SYNTAX );
}
}