You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/06/05 02:20:44 UTC
svn commit: r781877 [2/2] - in /directory:
apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/
apacheds/trunk/schema-extras/src/main/java/org/apache/directory/server/schema/bootstrap/
shared/trunk/ldap-constants/...
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ProtocolInformationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ProtocolInformationSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ProtocolInformationSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ProtocolInformationSyntaxChecker.java Fri Jun 5 00:20:42 2009
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntaxes;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
@@ -31,16 +32,12 @@
*/
public class ProtocolInformationSyntaxChecker extends AbstractSyntaxChecker
{
- /** the Apache assigned internal OID for this syntax checker */
- private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.42";
-
-
/**
* Private default constructor to prevent unnecessary instantiation.
*/
public ProtocolInformationSyntaxChecker()
{
- super( SC_OID );
+ super( SchemaConstants.PROTOCOL_INFORMATION_SYNTAX );
}
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SubstringAssertionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SubstringAssertionSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SubstringAssertionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SubstringAssertionSyntaxChecker.java Fri Jun 5 00:20:42 2009
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.ldap.schema.syntaxes;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+
/**
* A SyntaxChecker which verifies that a value is a SubstringAssertion
@@ -31,16 +33,12 @@
*/
public class SubstringAssertionSyntaxChecker extends BinarySyntaxChecker
{
- /** the Apache assigned internal OID for this syntax checker */
- private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.58";
-
-
/**
* Private default constructor to prevent unnecessary instantiation.
*/
public SubstringAssertionSyntaxChecker()
{
- super( SC_OID );
+ super( SchemaConstants.SUBSTRING_ASSERTION_SYNTAX );
}
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SubtreeSpecificationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SubtreeSpecificationSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SubtreeSpecificationSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SubtreeSpecificationSyntaxChecker.java Fri Jun 5 00:20:42 2009
@@ -21,6 +21,7 @@
import java.text.ParseException;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationChecker;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -36,9 +37,6 @@
*/
public class SubtreeSpecificationSyntaxChecker extends AbstractSyntaxChecker
{
- /** the Apache assigned internal OID for this syntax checker */
- private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.45";
-
private SubtreeSpecificationChecker checker = new SubtreeSpecificationChecker();
/**
@@ -46,7 +44,7 @@
*/
public SubtreeSpecificationSyntaxChecker()
{
- super( SC_OID );
+ super( SchemaConstants.SUBTREE_SPECIFICATION_SYNTAX );
}
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierAndConsumerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierAndConsumerSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierAndConsumerSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierAndConsumerSyntaxChecker.java Fri Jun 5 00:20:42 2009
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntaxes;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
@@ -30,16 +31,12 @@
*/
public class SupplierAndConsumerSyntaxChecker extends AbstractSyntaxChecker
{
- /** the Apache assigned internal OID for this syntax checker */
- private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.48";
-
-
/**
* Private default constructor to prevent unnecessary instantiation.
*/
public SupplierAndConsumerSyntaxChecker()
{
- super( SC_OID );
+ super( SchemaConstants.SUPPLIER_AND_CONSUMER_SYNTAX );
}
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierInformationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierInformationSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierInformationSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierInformationSyntaxChecker.java Fri Jun 5 00:20:42 2009
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntaxes;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
@@ -30,16 +31,12 @@
*/
public class SupplierInformationSyntaxChecker extends AbstractSyntaxChecker
{
- /** the Apache assigned internal OID for this syntax checker */
- private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.46";
-
-
/**
* Private default constructor to prevent unnecessary instantiation.
*/
public SupplierInformationSyntaxChecker()
{
- super( SC_OID );
+ super( SchemaConstants.SUPPLIER_INFORMATION_SYNTAX );
}
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierOrConsumerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierOrConsumerSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierOrConsumerSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupplierOrConsumerSyntaxChecker.java Fri Jun 5 00:20:42 2009
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.schema.syntaxes;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
@@ -30,16 +31,12 @@
*/
public class SupplierOrConsumerSyntaxChecker extends AbstractSyntaxChecker
{
- /** the Apache assigned internal OID for this syntax checker */
- private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.47";
-
-
/**
* Private default constructor to prevent unnecessary instantiation.
*/
public SupplierOrConsumerSyntaxChecker()
{
- super( SC_OID );
+ super( SchemaConstants.SUPPLIER_OR_CONSUMER_SYNTAX );
}
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupportedAlgorithmSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupportedAlgorithmSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupportedAlgorithmSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/SupportedAlgorithmSyntaxChecker.java Fri Jun 5 00:20:42 2009
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.ldap.schema.syntaxes;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+
/**
* A SyntaxChecker which verifies that a value is a SupportedAlgorithm according to RFC 2252.
@@ -30,16 +32,12 @@
*/
public class SupportedAlgorithmSyntaxChecker extends BinarySyntaxChecker
{
- /** the Apache assigned internal OID for this syntax checker */
- private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.49";
-
-
/**
* Private default constructor to prevent unnecessary instantiation.
*/
public SupportedAlgorithmSyntaxChecker()
{
- super( SC_OID );
+ super( SchemaConstants.SUPPORTED_ALGORITHM_SYNTAX );
}
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TelephoneNumberSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TelephoneNumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TelephoneNumberSyntaxChecker.java Fri Jun 5 00:20:42 2009
@@ -25,6 +25,7 @@
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -45,9 +46,6 @@
*/
public class TelephoneNumberSyntaxChecker extends AbstractSyntaxChecker
{
- /** The Syntax OID, according to RFC 4517, par. 3.3.31 */
- private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.50";
-
/** Other regexps to extend the initial one */
private List<String> regexps;
@@ -68,7 +66,7 @@
*/
public TelephoneNumberSyntaxChecker()
{
- super( SC_OID );
+ super( SchemaConstants.TELEPHONE_NUMBER_SYNTAX );
}
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TeletexTerminalIdentifierSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TeletexTerminalIdentifierSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TeletexTerminalIdentifierSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TeletexTerminalIdentifierSyntaxChecker.java Fri Jun 5 00:20:42 2009
@@ -20,6 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntaxes;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -41,9 +42,6 @@
*/
public class TeletexTerminalIdentifierSyntaxChecker extends AbstractSyntaxChecker
{
- /** The Syntax OID, according to RFC 4517 */
- private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.51";
-
/**
*
* Creates a new instance of TeletexTerminalIdentifier.
@@ -51,7 +49,7 @@
*/
public TeletexTerminalIdentifierSyntaxChecker()
{
- super( SC_OID );
+ super( SchemaConstants.TELETEX_TERMINAL_IDENTIFIER_SYNTAX );
}
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TelexNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TelexNumberSyntaxChecker.java?rev=781877&r1=781876&r2=781877&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TelexNumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/TelexNumberSyntaxChecker.java Fri Jun 5 00:20:42 2009
@@ -20,6 +20,7 @@
package org.apache.directory.shared.ldap.schema.syntaxes;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.schema.AbstractSyntaxChecker;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -38,9 +39,6 @@
*/
public class TelexNumberSyntaxChecker extends AbstractSyntaxChecker
{
- /** The Syntax OID, according to RFC 4517 */
- private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.52";
-
/**
*
* Creates a new instance of TelexNumberSyntaxChecker.
@@ -48,7 +46,7 @@
*/
public TelexNumberSyntaxChecker()
{
- super( SC_OID );
+ super( SchemaConstants.TELEX_NUMBER_SYNTAX );
}
/**