From 05fc91b048752514f09c1ed8d6d3ab4af3c42e4b Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 12 Mar 2014 16:45:47 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/api/AttributeSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/types/Schema.java | 4
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java | 6 +-
opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java | 2
opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 2
opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 8 +-
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java | 4 +
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java | 2
66 files changed, 77 insertions(+), 75 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
index 3f55a61..1d0a40a 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
@@ -197,7 +197,7 @@
*/
public void update(AttributeSyntax<?> syntax, Schema schema)
{
- String n = syntax.getSyntaxName();
+ String n = syntax.getName();
if (n == null)
{
n = NOT_APPLICABLE.toString();
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
index 08c63b9..a58f767 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
@@ -842,7 +842,7 @@
{
if (mustAdd(syntax))
{
- String name = syntax.getSyntaxName();
+ String name = syntax.getName();
if (name == null)
{
name = syntax.getOID();
@@ -1619,7 +1619,7 @@
String oid = syntax.getOID();
values.add(oid);
- String name = syntax.getSyntaxName();
+ String name = syntax.getName();
if (name != null)
{
values.add(name);
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
index 9636003..2d35a35 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -711,7 +711,7 @@
for (String key : schema.getSyntaxes().keySet())
{
AttributeSyntax<?> syntax = schema.getSyntax(key);
- String name = syntax.getSyntaxName();
+ String name = syntax.getName();
if (name == null)
{
name = syntax.getOID();
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
index ecb2457..0e69b5f 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -202,7 +202,7 @@
for (String key : schema.getSyntaxes().keySet())
{
AttributeSyntax<?> syntax = schema.getSyntax(key);
- String name = syntax.getSyntaxName();
+ String name = syntax.getName();
if (name == null)
{
name = syntax.getOID();
@@ -323,7 +323,7 @@
{
AttributeSyntax<?> syn =
(AttributeSyntax<?>)syntax.getModel().getElementAt(i);
- if ("DirectoryString".equals(syn.getSyntaxName()))
+ if ("DirectoryString".equals(syn.getName()))
{
syntax.setSelectedIndex(i);
break;
@@ -519,7 +519,7 @@
for (AttributeSyntax<?> attr : schema.getSyntaxes().values())
{
- String n = attr.getSyntaxName();
+ String n = attr.getName();
if (n != null)
{
if (n.equalsIgnoreCase(name))
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
index 28661c1..dcadd63 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -1550,7 +1550,7 @@
if (attr != null)
{
// There is no name for a regex syntax.
- String syntaxName = attr.getSyntax().getSyntaxName();
+ String syntaxName = attr.getSyntax().getName();
if (syntaxName!=null) {
mustAddBrowseButton=syntaxName.equalsIgnoreCase(
SchemaConstants.SYNTAX_DN_NAME);
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
index 94efd51..c7cdf71 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
@@ -70,7 +70,7 @@
{
if (value instanceof AttributeSyntax<?>)
{
- String syntaxName = ((AttributeSyntax<?>)value).getSyntaxName();
+ String syntaxName = ((AttributeSyntax<?>)value).getName();
if (syntaxName == null)
{
value = ((AttributeSyntax<?>)value).getOID();
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index fb1e2b7..4068095 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -2196,7 +2196,7 @@
public static String getSyntaxText(AttributeSyntax<?> syntax)
{
String returnValue;
- String syntaxName = syntax.getSyntaxName();
+ String syntaxName = syntax.getName();
String syntaxOID = syntax.getOID();
if (syntaxName == null)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AttributeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/api/AttributeSyntax.java
index 72b51bb..b423aab 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AttributeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AttributeSyntax.java
@@ -123,7 +123,7 @@
*
* @return The common name for this attribute syntax.
*/
- public abstract String getSyntaxName();
+ public abstract String getName();
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
index 31a8ebf..1d4c680 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
@@ -259,7 +259,7 @@
if (oid.equals(at.getSyntax().getOID()))
{
LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_DELETE_SYNTAX_IN_USE.get(
- syntax.getSyntaxName(), at.getNameOrOID());
+ syntax.getName(), at.getNameOrOID());
unacceptableReasons.add(message);
configAcceptable = false;
@@ -330,7 +330,7 @@
{
LocalizableMessage message =
WARN_CONFIG_SCHEMA_CANNOT_DISABLE_SYNTAX_IN_USE.get(
- syntax.getSyntaxName(),
+ syntax.getName(),
at.getNameOrOID());
unacceptableReasons.add(message);
return false;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
index f734a0d..920a2eb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
@@ -236,7 +236,7 @@
}
else
{
- String syntax = passwordAttribute.getSyntax().getSyntaxName();
+ String syntax = passwordAttribute.getSyntax().getName();
if ((syntax == null) || (syntax.length() == 0))
{
syntax = syntaxOID;
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
index 135cfa6..f40508a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -1203,7 +1203,7 @@
}
boolean isGeneralizedTime =
- type.getSyntax().getSyntaxName().equals(SYNTAX_GENERALIZED_TIME_NAME);
+ type.getSyntax().getName().equals(SYNTAX_GENERALIZED_TIME_NAME);
lastLoginTime = -1;
List<Attribute> attrList = userEntry.getAttribute(type);
@@ -1322,7 +1322,7 @@
{
SimpleDateFormat dateFormat = new SimpleDateFormat(format);
// If the attribute has a Generalized Time syntax, make it UTC time.
- if (type.getSyntax().getSyntaxName()
+ if (type.getSyntax().getName()
.equals(SYNTAX_GENERALIZED_TIME_NAME))
{
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java b/opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java
index e1ae149..fe7ecf9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java
@@ -194,7 +194,7 @@
}
else
{
- String syntax = pPasswordAttribute.getSyntax().getSyntaxName();
+ String syntax = pPasswordAttribute.getSyntax().getName();
if (syntax == null || syntax.length() == 0)
{
syntax = syntaxOID;
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index 64c0275..3a0142f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -327,7 +327,7 @@
unacceptableReasons.add(
ERR_PLUGIN_REFERENT_INVALID_ATTRIBUTE_SYNTAX.get(
type.getNameOrOID(),
- type.getSyntax().getSyntaxName()));
+ type.getSyntax().getName()));
}
for (DN baseDN : cfgBaseDNs)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
index 705d476..0481ec2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
@@ -106,7 +106,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_ACI_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
index 87c55c2..b5139df 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
@@ -155,7 +155,7 @@
* {@inheritDoc}
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_ATTRIBUTE_TYPE_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
index d61937d..cccc523 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
@@ -102,7 +102,7 @@
* @return The common name for this attribute syntax.
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_AUTH_PASSWORD_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
index 528fbf2..889f0c0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
@@ -131,7 +131,7 @@
* @return The common name for this attribute syntax.
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_BINARY_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
index 276e158..673a17d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
@@ -95,7 +95,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_BIT_STRING_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
index b80dd6f..e409036 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
@@ -130,7 +130,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_BOOLEAN_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java
index 8e613f7..6092395 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java
@@ -116,7 +116,7 @@
/**
* {@inheritDoc}
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
index 051b298..12b7872 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
@@ -116,7 +116,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_CERTLIST_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
index 6a0bd5e..f6aeb68 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
@@ -116,7 +116,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_CERTPAIR_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
index 351c0fb..822aed6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
@@ -161,7 +161,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_CERTIFICATE_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
index 5fa4e42..bb8e03a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
@@ -172,7 +172,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_COUNTRY_STRING_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
index 03a86b9..d31d1f6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
@@ -129,7 +129,7 @@
* {@inheritDoc}
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_DIT_CONTENT_RULE_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
index a7c70e8..8c01b81 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
@@ -130,7 +130,7 @@
/**
* {@inheritDoc}
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_DIT_STRUCTURE_RULE_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
index 860619a..e5f4de2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
@@ -176,7 +176,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_DELIVERY_METHOD_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
index 5554bc8..76ea94c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
@@ -188,7 +188,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_DIRECTORY_STRING_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
index 1d21f01..ce9e690 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
@@ -124,7 +124,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_DN_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
index e07be0d..d1fb216 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -119,7 +119,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_ENHANCED_GUIDE_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
index f19956d..3ceba51 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
@@ -149,7 +149,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_FAXNUMBER_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
index a52979d..77b6aa9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
@@ -115,7 +115,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_FAX_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
index 98c2e20..47d7175 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
@@ -137,7 +137,7 @@
* @return The common name for this attribute syntax.
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_GENERALIZED_TIME_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
index 7e2700b..1375107 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
@@ -116,7 +116,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_GUIDE_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
index bef781c..c3b7af0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
@@ -127,7 +127,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_IA5_STRING_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
index 8fd5daa..594f0c8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
@@ -146,7 +146,7 @@
* @return The common name for this attribute syntax.
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_INTEGER_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
index fefb82a..ce3a1b9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
@@ -131,7 +131,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_JPEG_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index 37a462c..551c278 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -128,7 +128,7 @@
* @return The common name for this attribute syntax.
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_LDAP_SYNTAX_NAME;
}
@@ -962,7 +962,7 @@
* {@inheritDoc}
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
// There is no name for a substitution syntax.
return null;
@@ -1132,7 +1132,7 @@
* {@inheritDoc}
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
// There is no name for a regex syntax.
return null;
@@ -1331,7 +1331,7 @@
* {@inheritDoc}
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
// There is no name for a enum syntax.
return null;
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
index b95e15b..0e87d29 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
@@ -126,7 +126,7 @@
* @return The common name for this attribute syntax.
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_MATCHING_RULE_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
index dd3495f..08b798c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
@@ -131,7 +131,7 @@
/**
* {@inheritDoc}
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_MATCHING_RULE_USE_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
index ba3d6f6..e1ec46f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
@@ -111,7 +111,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_NAME_AND_OPTIONAL_UID_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
index f6538c6..cd1bf74 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
@@ -128,7 +128,7 @@
* {@inheritDoc}
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_NAME_FORM_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
index 87ef3d4..d09d826 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
@@ -119,7 +119,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_NUMERIC_STRING_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
index e778571..67d848d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
@@ -105,7 +105,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_OID_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
index ba63424..ca972bf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
@@ -132,7 +132,7 @@
* {@inheritDoc}
*/
@Override
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_OBJECTCLASS_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
index 20dee48..6b37aaa 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
@@ -115,7 +115,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_OCTET_STRING_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
index 851a52f..7cad718 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
@@ -108,7 +108,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_OTHER_MAILBOX_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
index 2c96f4d..a51fe5a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
@@ -109,7 +109,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_POSTAL_ADDRESS_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
index 835e30d..7adc26a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
@@ -129,7 +129,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_PRESENTATION_ADDRESS_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
index d1ec3d0..6e970a8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
@@ -131,7 +131,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_PRINTABLE_STRING_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
index a1fa9e7..2730101 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
@@ -129,7 +129,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_PROTOCOL_INFORMATION_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
index 2bc50b4..b37de33 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
@@ -119,7 +119,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_SUBSTRING_ASSERTION_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
index 774f214..9f5584f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
@@ -147,7 +147,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName() {
+ public String getName() {
return SYNTAX_SUBTREE_SPECIFICATION_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
index b92ba58..31a4c34 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
@@ -119,7 +119,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_SUPPORTED_ALGORITHM_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
index b1f4ae1..a319440 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
@@ -147,7 +147,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_TELEPHONE_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
index 1e13fb9..f1e7d60 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
@@ -150,7 +150,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_TELETEX_TERM_ID_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
index c64d149..90a04bd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
@@ -115,7 +115,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_TELEX_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
index da815d4..844d16f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
@@ -173,7 +173,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_UTC_TIME_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
index b8224aa..eef80db 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
@@ -104,7 +104,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_UUID_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
index 1768c77..4e627e5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
@@ -109,7 +109,7 @@
*
* @return The common name for this attribute syntax.
*/
- public String getSyntaxName()
+ public String getName()
{
return SYNTAX_USER_PASSWORD_NAME;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/Schema.java b/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
index c291787..b3d75b2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
@@ -928,8 +928,8 @@
AttributeSyntax<?> conflictingSyntax = syntaxes.get(oid);
LocalizableMessage message = ERR_SCHEMA_CONFLICTING_SYNTAX_OID.
- get(syntax.getSyntaxName(), oid,
- conflictingSyntax.getSyntaxName());
+ get(syntax.getName(), oid,
+ conflictingSyntax.getName());
throw new DirectoryException(
ResultCode.CONSTRAINT_VIOLATION, message);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
index 30e0e60..71257d7 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
@@ -80,7 +80,7 @@
syntax.getOID();
syntax.getOrderingMatchingRule();
syntax.getSubstringMatchingRule();
- syntax.getSyntaxName();
+ syntax.getName();
syntax.toString();
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java
index 8af3d15..08250fb 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java
@@ -80,7 +80,7 @@
syntax.getOID();
syntax.getOrderingMatchingRule();
syntax.getSubstringMatchingRule();
- syntax.getSyntaxName();
+ syntax.getName();
syntax.toString();
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
index 6652c0f..fe4437a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
@@ -93,7 +93,7 @@
syntax.getOID();
syntax.getOrderingMatchingRule();
syntax.getSubstringMatchingRule();
- syntax.getSyntaxName();
+ syntax.getName();
syntax.toString();
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
index f8edc45..4e2a603 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
@@ -137,7 +137,7 @@
syntax.getOID();
syntax.getOrderingMatchingRule();
syntax.getSubstringMatchingRule();
- syntax.getSyntaxName();
+ syntax.getName();
syntax.toString();
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java
index 85b22e3..eb8dcf1 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java
@@ -22,6 +22,8 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS.
+ *
*/
package org.opends.server.schema;
@@ -90,7 +92,7 @@
{
if (! isNumericOID(as.getOID()))
{
- invalidOIDs.add(as.getSyntaxName());
+ invalidOIDs.add(as.getName());
}
}
--
Gitblit v1.10.0