From 09cf0ade4fd10e5e1e7aa7b220e0b7a616a89cfc Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] Switch imports from old config to new config
---
opendj-server-legacy/replace.rb | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/replace.rb b/opendj-server-legacy/replace.rb
index dfa1fa9..2ac9e16 100755
--- a/opendj-server-legacy/replace.rb
+++ b/opendj-server-legacy/replace.rb
@@ -182,7 +182,7 @@
NEW_CONFIG = {
:dirs => JAVA_DIRS + SNMP_DIR,
:extensions => ["java"],
- :stoplist => ["org/opends/server/admin", "api/Config", "MatchingRuleConfigManager"],
+ :stoplist => ["org/opends/server/admin", "api/Config", "MatchingRuleConfigManager", "ConfigEntry"],
:replacements =>
[
/import org.opends.server.admin.std.server\.([^;]+);/,
@@ -194,6 +194,9 @@
/import org.opends.server.admin.std.client\.([^;]+);/,
'import org.forgerock.opendj.server.config.client.\1;',
+ /import org.opends.server.config.ConfigEntry;/,
+ 'import org.opends.server.types.Entry;',
+
/import org.opends.server.admin.client\.(\w+);/,
'import org.forgerock.opendj.config.client.\1;',
@@ -270,7 +273,16 @@
/(\s+)AttributeType (\w+) = (configuration|config|cfg|\w+Cfg).get(\w+)Attribute\(\);/,
'\1AttributeType \2 = \3.get\4Attribute();',
- /^(\s+)public DN dn\(\)/,
+ /\bConfigEntry\b/,
+ 'Entry',
+
+ /configEntry.getEntry\(\)/,
+ 'configEntry',
+
+ /configEntry.getDN\(\)/,
+ 'configEntry.getName()',
+
+ /^(\s+)public DN dn\(\)/,
'\1public org.forgerock.opendj.ldap.DN dn()',
]
@@ -406,7 +418,7 @@
############################### List of replacements to run #################################
- REPLACEMENTS = [ ATTRTYPE ]
+ REPLACEMENTS = [ NEW_CONFIG ]
################################### Processing methods ########################################
--
Gitblit v1.10.0