From d70586b00b9530ab99ab4b8f003e9a54793e419f Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 09 Jan 2014 00:13:14 +0000
Subject: [PATCH] Reorganize opendj-config packaging, removing all references to opends and renaming admin to config
---
opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
index 32f2082..f255f9a 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
@@ -33,19 +33,19 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import org.forgerock.opendj.config.AbsoluteInheritedDefaultBehaviorProvider;
+import org.forgerock.opendj.config.AliasDefaultBehaviorProvider;
+import org.forgerock.opendj.config.Configuration;
+import org.forgerock.opendj.config.DefaultBehaviorProvider;
+import org.forgerock.opendj.config.DefaultBehaviorProviderVisitor;
+import org.forgerock.opendj.config.DefinedDefaultBehaviorProvider;
+import org.forgerock.opendj.config.ManagedObjectDefinition;
+import org.forgerock.opendj.config.PropertyDefinition;
+import org.forgerock.opendj.config.PropertyDefinitionsOptions;
+import org.forgerock.opendj.config.PropertyOption;
+import org.forgerock.opendj.config.RelativeInheritedDefaultBehaviorProvider;
+import org.forgerock.opendj.config.UndefinedDefaultBehaviorProvider;
import org.mockito.invocation.InvocationOnMock;
-import org.opends.server.admin.AbsoluteInheritedDefaultBehaviorProvider;
-import org.opends.server.admin.AliasDefaultBehaviorProvider;
-import org.opends.server.admin.Configuration;
-import org.opends.server.admin.DefaultBehaviorProvider;
-import org.opends.server.admin.DefaultBehaviorProviderVisitor;
-import org.opends.server.admin.DefinedDefaultBehaviorProvider;
-import org.opends.server.admin.ManagedObjectDefinition;
-import org.opends.server.admin.PropertyDefinition;
-import org.opends.server.admin.PropertyDefinitionsOptions;
-import org.opends.server.admin.PropertyOption;
-import org.opends.server.admin.RelativeInheritedDefaultBehaviorProvider;
-import org.opends.server.admin.UndefinedDefaultBehaviorProvider;
/**
* Provides Mockito mocks for Configuration objects with default values
@@ -116,11 +116,12 @@
/**
* Retrieve class name of definition from class name of configuration.
* <p>
- * Convert class name "[package].admin.server.FooCfg" to
- * "[package].admin.meta.FooCfgDef"
+ * Convert class name "[package].server.FooCfg" to "[package].meta.FooCfgDef"
*/
private String toDefinitionClassName(String configClassName) {
- return configClassName.replaceAll("\\.admin\\.server", ".admin.meta") + "Defn";
+ int finalDot = configClassName.lastIndexOf('.');
+ return configClassName.substring(0, finalDot - 6) + "meta."
+ + configClassName.substring(finalDot + 1) + "Defn";
}
/**
--
Gitblit v1.10.0