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/03/12 18:54:27 UTC
svn commit: r1080957 [3/3] - in /directory:
apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/
apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/
...
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class OtherMailboxSyntaxChecker extends MutableSyntaxCheckerImpl
+public class OtherMailboxSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( OtherMailboxSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PostalAddressSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PostalAddressSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PostalAddressSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PostalAddressSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class PostalAddressSyntaxChecker extends MutableSyntaxCheckerImpl
+public class PostalAddressSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( PostalAddressSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class PrintableStringSyntaxChecker extends MutableSyntaxCheckerImpl
+public class PrintableStringSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( PrintableStringSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ProtocolInformationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ProtocolInformationSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ProtocolInformationSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ProtocolInformationSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class ProtocolInformationSyntaxChecker extends MutableSyntaxCheckerImpl
+public class ProtocolInformationSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( ProtocolInformationSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/RegexSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/RegexSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/RegexSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/RegexSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class RegexSyntaxChecker extends MutableSyntaxCheckerImpl
+public class RegexSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( RegexSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -23,7 +23,7 @@ import java.text.ParseException;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.ldap.model.subtree.SubtreeSpecificationChecker;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class SubtreeSpecificationSyntaxChecker extends MutableSyntaxCheckerImpl
+public class SubtreeSpecificationSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( SubtreeSpecificationSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierAndConsumerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierAndConsumerSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierAndConsumerSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierAndConsumerSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class SupplierAndConsumerSyntaxChecker extends MutableSyntaxCheckerImpl
+public class SupplierAndConsumerSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( SupplierAndConsumerSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierInformationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierInformationSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierInformationSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierInformationSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class SupplierInformationSyntaxChecker extends MutableSyntaxCheckerImpl
+public class SupplierInformationSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( SupplierInformationSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierOrConsumerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierOrConsumerSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierOrConsumerSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierOrConsumerSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class SupplierOrConsumerSyntaxChecker extends MutableSyntaxCheckerImpl
+public class SupplierOrConsumerSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( SupplierOrConsumerSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class TelephoneNumberSyntaxChecker extends MutableSyntaxCheckerImpl
+public class TelephoneNumberSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( TelephoneNumberSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class TeletexTerminalIdentifierSyntaxChecker extends MutableSyntaxCheckerImpl
+public class TeletexTerminalIdentifierSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( TeletexTerminalIdentifierSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelexNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelexNumberSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelexNumberSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelexNumberSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class TelexNumberSyntaxChecker extends MutableSyntaxCheckerImpl
+public class TelexNumberSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( TelexNumberSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UtcTimeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UtcTimeSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UtcTimeSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UtcTimeSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
import java.util.regex.Pattern;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class UtcTimeSyntaxChecker extends MutableSyntaxCheckerImpl
+public class UtcTimeSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( UtcTimeSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UuidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UuidSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UuidSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UuidSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings("serial")
-public class UuidSyntaxChecker extends MutableSyntaxCheckerImpl
+public class UuidSyntaxChecker extends AbstractSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( UuidSyntaxChecker.class );
Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java Sat Mar 12 17:54:24 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
import org.apache.directory.shared.ldap.model.schema.comparators.ByteArrayComparator;
import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
import org.apache.directory.shared.util.StringConstants;
@@ -86,7 +86,7 @@ public class BinaryValueAttributeTypeTes
mr.setSyntax( s );
mr.setLdapComparator( new ByteArrayComparator( "1.1.1" ) );
- mr.setNormalizer( new Normalizer( "1.1.1" )
+ mr.setNormalizer( new AbstractNormalizer( "1.1.1" )
{
private static final long serialVersionUID = 1L;
Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java Sat Mar 12 17:54:24 2011
@@ -34,9 +34,10 @@ import java.io.ObjectOutputStream;
import java.util.Arrays;
import org.apache.directory.shared.ldap.model.exception.LdapException;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
import org.apache.directory.shared.ldap.model.schema.Normalizer;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.util.StringConstants;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
@@ -61,7 +62,7 @@ public class BinaryValueTest
private static final byte[] INVALID_BYTES = new byte[]{0x01, 0x02, 0x03, 0x04, 0x05};
private static final byte[] BYTES_MOD = new byte[]{0x11, 0x02, 0x03, 0x04};
- private static final Normalizer BINARY_NORMALIZER = new Normalizer( "1.1.1" )
+ private static final Normalizer BINARY_NORMALIZER = new AbstractNormalizer( "1.1.1" )
{
private static final long serialVersionUID = 1L;
@@ -95,7 +96,7 @@ public class BinaryValueTest
/**
* A binary normalizer which set the normalized value to a empty byte array
*/
- private static final Normalizer BINARY_NORMALIZER_EMPTY = new Normalizer( "1.1.1" )
+ private static final Normalizer BINARY_NORMALIZER_EMPTY = new AbstractNormalizer( "1.1.1" )
{
private static final long serialVersionUID = 1L;
@@ -116,7 +117,7 @@ public class BinaryValueTest
};
- private static final SyntaxChecker BINARY_CHECKER = new MutableSyntaxCheckerImpl( "1.1.1" )
+ private static final SyntaxChecker BINARY_CHECKER = new AbstractSyntaxChecker( "1.1.1" )
{
private static final long serialVersionUID = 1L;
Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java Sat Mar 12 17:54:24 2011
@@ -41,7 +41,7 @@ import java.util.List;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapComparator;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.ldap.model.schema.comparators.StringComparator;
import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
import org.apache.directory.shared.ldap.model.schema.normalizers.NoOpNormalizer;
@@ -443,7 +443,7 @@ public class StringValueAttributeTypeTes
*/
@Test public void testConstrainedString()
{
- s.setSyntaxChecker( new MutableSyntaxCheckerImpl( "1.1.1.1" ) {
+ s.setSyntaxChecker( new AbstractSyntaxChecker( "1.1.1.1" ) {
private static final long serialVersionUID = 1L;
public boolean isValidSyntax( Object value )
Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SyntaxCheckerTest.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SyntaxCheckerTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SyntaxCheckerTest.java Sat Mar 12 17:54:24 2011
@@ -40,10 +40,10 @@ import org.junit.runner.RunWith;
@Concurrency()
public class SyntaxCheckerTest
{
- MutableSyntaxCheckerImpl objectClassA;
- MutableSyntaxCheckerImpl objectClassACopy;
- MutableSyntaxCheckerImpl objectClassB;
- MutableSyntaxCheckerImpl objectClassC;
+ AbstractSyntaxChecker objectClassA;
+ AbstractSyntaxChecker objectClassACopy;
+ AbstractSyntaxChecker objectClassB;
+ AbstractSyntaxChecker objectClassC;
/**
Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Sat Mar 12 17:54:24 2011
@@ -44,6 +44,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
import org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
import org.apache.directory.shared.ldap.model.schema.Normalizer;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
@@ -51,7 +52,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.MutableSchemaObject;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescription;
import org.apache.directory.shared.ldap.model.schema.registries.Registries;
@@ -259,12 +260,12 @@ public class SchemaEntityFactory impleme
/**
* Class load a syntaxChecker instance
*/
- private MutableSyntaxCheckerImpl classLoadSyntaxChecker( SchemaManager schemaManager, String oid, String className, EntryAttribute byteCode )
+ private AbstractSyntaxChecker classLoadSyntaxChecker( SchemaManager schemaManager, String oid, String className, EntryAttribute byteCode )
throws Exception
{
// Try to class load the syntaxChecker
Class<?> clazz = null;
- MutableSyntaxCheckerImpl syntaxChecker = null;
+ AbstractSyntaxChecker syntaxChecker = null;
String byteCodeStr = StringConstants.EMPTY;
if ( byteCode == null )
@@ -279,7 +280,7 @@ public class SchemaEntityFactory impleme
}
// Create the syntaxChecker instance
- syntaxChecker = ( MutableSyntaxCheckerImpl ) clazz.newInstance();
+ syntaxChecker = ( AbstractSyntaxChecker ) clazz.newInstance();
// Update the common fields
syntaxChecker.setBytecode( byteCodeStr );
@@ -298,7 +299,7 @@ public class SchemaEntityFactory impleme
/**
* {@inheritDoc}
*/
- public MutableSyntaxCheckerImpl getSyntaxChecker( SchemaManager schemaManager, Entry entry, Registries targetRegistries,
+ public AbstractSyntaxChecker getSyntaxChecker( SchemaManager schemaManager, Entry entry, Registries targetRegistries,
String schemaName ) throws LdapException
{
checkEntry( entry, SchemaConstants.SYNTAX_CHECKER );
@@ -334,7 +335,7 @@ public class SchemaEntityFactory impleme
try
{
// Class load the syntaxChecker
- MutableSyntaxCheckerImpl syntaxChecker = classLoadSyntaxChecker( schemaManager, oid, className, byteCode );
+ AbstractSyntaxChecker syntaxChecker = classLoadSyntaxChecker( schemaManager, oid, className, byteCode );
// Update the common fields
setSchemaObjectProperties( syntaxChecker, entry, schema );
@@ -379,7 +380,7 @@ public class SchemaEntityFactory impleme
EntryAttribute byteCode = getByteCode( syntaxCheckerDescription, SchemaConstants.SYNTAX_CHECKER );
// Class load the SyntaxChecker
- MutableSyntaxCheckerImpl syntaxChecker = classLoadSyntaxChecker( schemaManager, oid, fqcn, byteCode );
+ AbstractSyntaxChecker syntaxChecker = classLoadSyntaxChecker( schemaManager, oid, fqcn, byteCode );
// Update the common fields
setSchemaObjectProperties( syntaxChecker, syntaxCheckerDescription, schema );
@@ -541,12 +542,12 @@ public class SchemaEntityFactory impleme
/**
* Class load a normalizer instances
*/
- private Normalizer classLoadNormalizer( SchemaManager schemaManager, String oid, String className,
+ private AbstractNormalizer classLoadNormalizer( SchemaManager schemaManager, String oid, String className,
EntryAttribute byteCode ) throws Exception
{
// Try to class load the normalizer
Class<?> clazz = null;
- Normalizer normalizer = null;
+ AbstractNormalizer normalizer = null;
String byteCodeStr = StringConstants.EMPTY;
if ( byteCode == null )
@@ -561,7 +562,7 @@ public class SchemaEntityFactory impleme
}
// Create the normalizer instance
- normalizer = ( Normalizer ) clazz.newInstance();
+ normalizer = ( AbstractNormalizer ) clazz.newInstance();
// Update the common fields
normalizer.setBytecode( byteCodeStr );
@@ -606,7 +607,7 @@ public class SchemaEntityFactory impleme
EntryAttribute byteCode = getByteCode( normalizerDescription, SchemaConstants.NORMALIZER );
// Class load the normalizer
- Normalizer normalizer = classLoadNormalizer( schemaManager, oid, fqcn, byteCode );
+ AbstractNormalizer normalizer = classLoadNormalizer( schemaManager, oid, fqcn, byteCode );
// Update the common fields
setSchemaObjectProperties( normalizer, normalizerDescription, schema );
@@ -618,7 +619,7 @@ public class SchemaEntityFactory impleme
/**
* {@inheritDoc}
*/
- public Normalizer getNormalizer( SchemaManager schemaManager, Entry entry, Registries targetRegistries,
+ public AbstractNormalizer getNormalizer( SchemaManager schemaManager, Entry entry, Registries targetRegistries,
String schemaName ) throws LdapException
{
checkEntry( entry, SchemaConstants.NORMALIZER );
@@ -654,7 +655,7 @@ public class SchemaEntityFactory impleme
try
{
// Class load the Normalizer
- Normalizer normalizer = classLoadNormalizer( schemaManager, oid, className, byteCode );
+ AbstractNormalizer normalizer = classLoadNormalizer( schemaManager, oid, className, byteCode );
// Update the common fields
setSchemaObjectProperties( normalizer, entry, schema );
Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Sat Mar 12 17:54:24 2011
@@ -49,6 +49,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject;
import org.apache.directory.shared.ldap.model.schema.MutableLoadableSchemaObject;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableNormalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
import org.apache.directory.shared.ldap.model.schema.Normalizer;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -56,7 +58,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.shared.ldap.model.schema.SchemaObjectWrapper;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
import org.apache.directory.shared.ldap.model.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.ComparatorRegistry;
@@ -756,8 +758,6 @@ public class DefaultSchemaManager implem
* - isRelaxed
* - disabledAccepted
*/
- // False positive
- @SuppressWarnings("PMD.UnusedPrivateMethod")
private boolean unload( Registries registries, Schema schema ) throws LdapException
{
if ( schema == null )
@@ -815,8 +815,6 @@ public class DefaultSchemaManager implem
/**
* Add all the Schema's DitContentRules
*/
- // Not yet implemented, but may be used
- @SuppressWarnings("PMD.UnusedFormalParameter")
private void addDitContentRules( Schema schema, Registries registries ) throws LdapException, IOException
{
if ( !schemaLoader.loadDitContentRules( schema ).isEmpty() )
@@ -829,8 +827,6 @@ public class DefaultSchemaManager implem
/**
* Add all the Schema's DitStructureRules
*/
- // Not yet implemented, but may be used
- @SuppressWarnings("PMD.UnusedFormalParameter")
private void addDitStructureRules( Schema schema, Registries registries ) throws LdapException, IOException
{
if ( !schemaLoader.loadDitStructureRules( schema ).isEmpty() )
@@ -857,8 +853,6 @@ public class DefaultSchemaManager implem
/**
* Add all the Schema's MatchingRuleUses
*/
- // Not yet implemented, but may be used
- @SuppressWarnings("PMD.UnusedFormalParameter")
private void addMatchingRuleUses( Schema schema, Registries registries ) throws LdapException, IOException
{
if ( !schemaLoader.loadMatchingRuleUses( schema ).isEmpty() )
@@ -875,8 +869,6 @@ public class DefaultSchemaManager implem
/**
* Add all the Schema's NameForms
*/
- // Not yet implemented, but may be used
- @SuppressWarnings("PMD.UnusedFormalParameter")
private void addNameForms( Schema schema, Registries registries ) throws LdapException, IOException
{
if ( !schemaLoader.loadNameForms( schema ).isEmpty() )
@@ -893,7 +885,7 @@ public class DefaultSchemaManager implem
{
for ( Entry entry : schemaLoader.loadNormalizers( schema ) )
{
- Normalizer normalizer = factory.getNormalizer( this, entry, registries, schema.getSchemaName() );
+ AbstractNormalizer normalizer = factory.getNormalizer( this, entry, registries, schema.getSchemaName() );
addSchemaObject( registries, normalizer, schema );
}
@@ -935,7 +927,7 @@ public class DefaultSchemaManager implem
{
for ( Entry entry : schemaLoader.loadSyntaxCheckers( schema ) )
{
- MutableSyntaxCheckerImpl syntaxChecker = factory.getSyntaxChecker( this, entry, registries, schema.getSchemaName() );
+ AbstractSyntaxChecker syntaxChecker = factory.getSyntaxChecker( this, entry, registries, schema.getSchemaName() );
addSchemaObject( registries, syntaxChecker, schema );
}
@@ -1485,7 +1477,7 @@ public class DefaultSchemaManager implem
/**
* {@inheritDoc}
*/
- public NormalizerRegistry getNormalizerRegistry()
+ public NormalizerRegistry<Normalizer> getNormalizerRegistry()
{
return new ImmutableNormalizerRegistry( registries.getNormalizerRegistry() );
}
@@ -1564,7 +1556,7 @@ public class DefaultSchemaManager implem
/**
* {@inheritDoc}
*/
- public Normalizer lookupNormalizerRegistry( String oid ) throws LdapException
+ public MutableNormalizer lookupNormalizerRegistry( String oid ) throws LdapException
{
return registries.getNormalizerRegistry().lookup( oid );
}
Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java Sat Mar 12 17:54:24 2011
@@ -43,11 +43,12 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.MutableNormalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
import org.apache.directory.shared.ldap.model.schema.comparators.BooleanComparator;
@@ -1171,7 +1172,7 @@ public class SchemaManagerAddTest
int goidSize = schemaManager.getGlobalOidRegistry().size();
String oid = "0.0.0";
- Normalizer normalizer = new NoOpNormalizer( oid );
+ AbstractNormalizer normalizer = new NoOpNormalizer( oid );
assertTrue( schemaManager.add( normalizer ) );
@@ -1181,7 +1182,7 @@ public class SchemaManagerAddTest
assertEquals( nrSize + 1, schemaManager.getNormalizerRegistry().size() );
assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
- Normalizer added = schemaManager.lookupNormalizerRegistry( oid );
+ MutableNormalizer added = schemaManager.lookupNormalizerRegistry( oid );
assertNotNull( added );
assertEquals( normalizer.getClass().getName(), added.getFqcn() );
@@ -1196,11 +1197,11 @@ public class SchemaManagerAddTest
int goidSize = schemaManager.getGlobalOidRegistry().size();
String oid = "0.0.0";
- Normalizer normalizer = new NoOpNormalizer( oid );
+ AbstractNormalizer normalizer = new NoOpNormalizer( oid );
assertTrue( schemaManager.add( normalizer ) );
- Normalizer added = schemaManager.lookupNormalizerRegistry( oid );
+ MutableNormalizer added = schemaManager.lookupNormalizerRegistry( oid );
assertNotNull( added );
assertEquals( normalizer.getClass().getName(), added.getFqcn() );
@@ -1210,7 +1211,7 @@ public class SchemaManagerAddTest
assertEquals( nrSize + 1, schemaManager.getNormalizerRegistry().size() );
assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
- Normalizer normalizer2 = new NoOpNormalizer( oid );
+ AbstractNormalizer normalizer2 = new NoOpNormalizer( oid );
assertFalse( schemaManager.add( normalizer2 ) );
@@ -1238,7 +1239,7 @@ public class SchemaManagerAddTest
int goidSize = schemaManager.getGlobalOidRegistry().size();
String oid = "0.0.0";
- Normalizer normalizer = new NoOpNormalizer( oid );
+ MutableNormalizer normalizer = new NoOpNormalizer( oid );
// using java.sql.ResultSet cause it is very unlikely to get loaded
// in ADS, as the FQCN is not the one expected
@@ -1923,7 +1924,7 @@ public class SchemaManagerAddTest
int goidSize = schemaManager.getGlobalOidRegistry().size();
String oid = "0.0.0";
- MutableSyntaxCheckerImpl syntaxChecker = new RegexSyntaxChecker( oid );
+ AbstractSyntaxChecker syntaxChecker = new RegexSyntaxChecker( oid );
assertTrue( schemaManager.add( syntaxChecker ) );
@@ -1948,7 +1949,7 @@ public class SchemaManagerAddTest
int goidSize = schemaManager.getGlobalOidRegistry().size();
String oid = "0.0.0";
- MutableSyntaxCheckerImpl syntaxChecker = new RegexSyntaxChecker( oid );
+ AbstractSyntaxChecker syntaxChecker = new RegexSyntaxChecker( oid );
assertTrue( schemaManager.add( syntaxChecker ) );
@@ -1962,7 +1963,7 @@ public class SchemaManagerAddTest
assertEquals( nrSize + 1, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
- MutableSyntaxCheckerImpl syntaxChecker2 = new RegexSyntaxChecker( oid );
+ AbstractSyntaxChecker syntaxChecker2 = new RegexSyntaxChecker( oid );
assertFalse( schemaManager.add( syntaxChecker2 ) );
@@ -1990,7 +1991,7 @@ public class SchemaManagerAddTest
int goidSize = schemaManager.getGlobalOidRegistry().size();
String oid = "0.0.0";
- MutableSyntaxCheckerImpl syntaxChecker = new RegexSyntaxChecker( oid );
+ AbstractSyntaxChecker syntaxChecker = new RegexSyntaxChecker( oid );
// using java.sql.ResultSet cause it is very unlikely to get loaded
// in ADS, as the FQCN is not the one expected
Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java Sat Mar 12 17:54:24 2011
@@ -41,12 +41,13 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxChecker;
+import org.apache.directory.shared.ldap.model.schema.MutableNormalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
import org.apache.directory.shared.ldap.model.schema.Normalizer;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.ldap.model.schema.comparators.BooleanComparator;
import org.apache.directory.shared.ldap.model.schema.normalizers.BooleanNormalizer;
import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.BooleanSyntaxChecker;
@@ -590,7 +591,7 @@ public class SchemaManagerDelTest
int nrSize = schemaManager.getNormalizerRegistry().size();
int goidSize = schemaManager.getGlobalOidRegistry().size();
- Normalizer nr = new BooleanNormalizer();
+ MutableNormalizer nr = new BooleanNormalizer();
nr.setOid( "0.1.1" );
assertTrue( schemaManager.add( nr ) );
@@ -624,7 +625,7 @@ public class SchemaManagerDelTest
int nrSize = schemaManager.getNormalizerRegistry().size();
int goidSize = schemaManager.getGlobalOidRegistry().size();
- Normalizer nr = new BooleanNormalizer();
+ AbstractNormalizer nr = new BooleanNormalizer();
nr.setOid( "0.0" );
assertFalse( schemaManager.delete( nr ) );
@@ -643,7 +644,7 @@ public class SchemaManagerDelTest
int nrSize = schemaManager.getNormalizerRegistry().size();
int goidSize = schemaManager.getGlobalOidRegistry().size();
- Normalizer nr = schemaManager.lookupNormalizerRegistry( "2.5.13.0" );
+ MutableNormalizer nr = schemaManager.lookupNormalizerRegistry( "2.5.13.0" );
// shouldn't be deleted cause there is a MR associated with it
assertFalse( schemaManager.delete( nr ) );
@@ -676,7 +677,7 @@ public class SchemaManagerDelTest
assertTrue( isNormalizerPresent( schemaManager, OID ) );
// Now try to remove the N
- Normalizer normalizer = schemaManager.lookupNormalizerRegistry( OID );
+ MutableNormalizer normalizer = schemaManager.lookupNormalizerRegistry( OID );
// shouldn't be deleted cause there is a MR associated with it
assertFalse( schemaManager.delete( normalizer ) );
@@ -1053,7 +1054,7 @@ public class SchemaManagerDelTest
int scrSize = schemaManager.getSyntaxCheckerRegistry().size();
int goidSize = schemaManager.getGlobalOidRegistry().size();
- MutableSyntaxCheckerImpl sc = new BooleanSyntaxChecker();
+ AbstractSyntaxChecker sc = new BooleanSyntaxChecker();
sc.setOid( "0.0" );
assertFalse( schemaManager.delete( sc ) );