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/MatchingRuleConfigManager.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/MatchingRuleConfigManager.java b/opends/src/server/org/opends/server/core/MatchingRuleConfigManager.java
index 5f787d3..d2946eb 100644
--- a/opends/src/server/org/opends/server/core/MatchingRuleConfigManager.java
+++ b/opends/src/server/org/opends/server/core/MatchingRuleConfigManager.java
@@ -135,7 +135,7 @@
if (mrConfiguration.isEnabled())
{
- String className = mrConfiguration.getMatchingRuleClass();
+ String className = mrConfiguration.getJavaClass();
try
{
MatchingRule matchingRule =
@@ -175,7 +175,7 @@
{
// Get the name of the class and make sure we can instantiate it as a
// matching rule.
- String className = configuration.getMatchingRuleClass();
+ String className = configuration.getJavaClass();
try
{
loadMatchingRule(className, configuration, false);
@@ -213,7 +213,7 @@
// Get the name of the class and make sure we can instantiate it as a
// matching rule.
- String className = configuration.getMatchingRuleClass();
+ String className = configuration.getJavaClass();
try
{
matchingRule = loadMatchingRule(className, configuration, true);
@@ -374,7 +374,7 @@
{
// Get the name of the class and make sure we can instantiate it as a
// matching rule.
- String className = configuration.getMatchingRuleClass();
+ String className = configuration.getJavaClass();
try
{
loadMatchingRule(className, configuration, false);
@@ -507,7 +507,7 @@
// changed then we'll at least need to indicate that administrative action
// is required. If the matching rule is disabled, then instantiate the
// class and initialize and register it as a matching rule.
- String className = configuration.getMatchingRuleClass();
+ String className = configuration.getJavaClass();
if (existingRule != null)
{
if (! className.equals(existingRule.getClass().getName()))
@@ -584,7 +584,7 @@
ApproximateMatchingRuleCfgDefn definition =
ApproximateMatchingRuleCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getMatchingRuleClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends ApproximateMatchingRule> approximateMatchingRuleClass =
propertyDefinition.loadClass(className,
ApproximateMatchingRule.class);
@@ -595,7 +595,7 @@
EqualityMatchingRuleCfgDefn definition =
EqualityMatchingRuleCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getMatchingRuleClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends EqualityMatchingRule> equalityMatchingRuleClass =
propertyDefinition.loadClass(className,
EqualityMatchingRule.class);
@@ -606,7 +606,7 @@
OrderingMatchingRuleCfgDefn definition =
OrderingMatchingRuleCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getMatchingRuleClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends OrderingMatchingRule> orderingMatchingRuleClass =
propertyDefinition.loadClass(className,
OrderingMatchingRule.class);
@@ -617,7 +617,7 @@
SubstringMatchingRuleCfgDefn definition =
SubstringMatchingRuleCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getMatchingRuleClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends SubstringMatchingRule> substringMatchingRuleClass =
propertyDefinition.loadClass(className,
SubstringMatchingRule.class);
--
Gitblit v1.10.0