From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java b/opends/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
index 8bc4fbe..1dc9f1f 100644
--- a/opends/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
+++ b/opends/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
@@ -125,7 +125,7 @@
if (syntaxConfiguration.isEnabled())
{
- String className = syntaxConfiguration.getSyntaxClass();
+ String className = syntaxConfiguration.getJavaClass();
try
{
AttributeSyntax syntax = loadSyntax(className, syntaxConfiguration,
@@ -166,7 +166,7 @@
{
// Get the name of the class and make sure we can instantiate it as an
// attribute syntax.
- String className = configuration.getSyntaxClass();
+ String className = configuration.getJavaClass();
try
{
loadSyntax(className, configuration, false);
@@ -205,7 +205,7 @@
// Get the name of the class and make sure we can instantiate it as an
// attribute syntax.
- String className = configuration.getSyntaxClass();
+ String className = configuration.getJavaClass();
try
{
syntax = loadSyntax(className, configuration, true);
@@ -308,7 +308,7 @@
{
// Get the name of the class and make sure we can instantiate it as an
// attribute syntax.
- String className = configuration.getSyntaxClass();
+ String className = configuration.getJavaClass();
try
{
loadSyntax(className, configuration, false);
@@ -387,7 +387,7 @@
// changed then we'll at least need to indicate that administrative action
// is required. If the syntax is disabled, then instantiate the class and
// initialize and register it as an attribute syntax.
- String className = configuration.getSyntaxClass();
+ String className = configuration.getJavaClass();
if (existingSyntax != null)
{
if (! className.equals(existingSyntax.getClass().getName()))
@@ -462,7 +462,7 @@
AttributeSyntaxCfgDefn definition =
AttributeSyntaxCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getSyntaxClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends AttributeSyntax> syntaxClass =
propertyDefinition.loadClass(className, AttributeSyntax.class);
AttributeSyntax syntax = syntaxClass.newInstance();
--
Gitblit v1.10.0