From ce9f1eb916731bf325f5a9e27010dbd82cce1dcc Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 13 Feb 2015 10:50:38 +0000
Subject: [PATCH] OPENDJ-1777 Move opendj-server3x-adapter into opendj-server-legacy
---
opendj-server-legacy/src/test/resources/config/schema/03-pwpolicyextension.ldif | 0
opendj-server-legacy/src/test/resources/config/admin-backend.ldif | 0
opendj-server-legacy/src/test/resources/config/schema/02-config.ldif | 0
opendj-server-legacy/src/test/resources/config/admin-keystore | 0
opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java | 7 +
opendj-server-legacy/src/test/resources/locks/backend-userRoot.lock | 0
opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/package-info.java | 0
opendj-server-legacy/src/test/resources/config/schema/01-pwpolicy.ldif | 0
pom.xml | 2
opendj-server-legacy/src/test/resources/config/ads-truststore.pin | 0
opendj-server-legacy/pom.xml | 165 +++++++++++++++++++++--------------------
opendj-server-legacy/src/test/resources/locks/backend-backup.lock | 0
opendj-server-legacy/src/test/resources/locks/backend-monitor.lock | 0
opendj-server-legacy/src/test/resources/config/tasks.ldif | 0
opendj-server-legacy/src/test/resources/config/config.ldif | 0
opendj-server-legacy/src/test/resources/locks/backend-schema.lock | 0
opendj-server-legacy/src/test/resources/locks/backend-adminRoot.lock | 0
opendj-server-legacy/src/test/resources/config/schema/00-core.ldif | 0
opendj-server-legacy/src/test/resources/config/config.properties | 0
opendj-server-legacy/src/test/resources/locks/server.lock | 0
opendj-server-legacy/src/main/assembly/opendj-archive-component.xml | 1
opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java | 0
opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java | 7 +
opendj-server-legacy/src/test/resources/config/admin-truststore | 0
opendj-server-legacy/src/test/resources/config/ads-truststore | 0
opendj-server-legacy/src/test/resources/config/admin-keystore.pin | 0
opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java | 0
opendj-server-legacy/src/test/resources/locks/backend-tasks.lock | 0
opendj-server-legacy/src/test/resources/locks/backend-ads-truststore.lock | 0
opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/EmbeddedServerTestCaseUtils.java | 9 +-
opendj-server-legacy/src/test/resources/config/schema/04-rfc2307bis.ldif | 0
31 files changed, 97 insertions(+), 94 deletions(-)
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index a59d68b..ff1f8cc 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -105,21 +105,6 @@
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-server3x-adapter</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj3-server-dev</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-config</artifactId>
<version>${project.version}</version>
</dependency>
@@ -372,18 +357,15 @@
</execution>
</executions>
</plugin>
-
- <!-- OpenDJ maven plugin executions -->
<plugin>
<groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-maven-plugin</artifactId>
- <version>${project.version}</version>
+ <artifactId>opendj-manifest-classpath-maven-plugin</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<executions>
- <!-- Generates manifest classpath files -->
<execution>
<id>generate-bootstrap-manifest</id>
<goals>
- <goal>generate-manifest</goal>
+ <goal>generate</goal>
</goals>
<configuration>
<classPathProperty>classpath.bootstrap</classPathProperty>
@@ -393,11 +375,11 @@
<exclude>org.slf4j:slf4j-jdk14</exclude>
</excludes>
</configuration>
- </execution>
+ </execution>
<execution>
<id>generate-bootstrap-client-manifest</id>
<goals>
- <goal>generate-manifest</goal>
+ <goal>generate</goal>
</goals>
<configuration>
<classPathProperty>classpath.bootstrap-client</classPathProperty>
@@ -408,15 +390,22 @@
</excludes>
</configuration>
</execution>
-
- <!-- Generate configuration classes from XML definitions -->
- <!-- Leave default lifecycle phase once new config framework migration
- is done -->
+ </executions>
+ </plugin>
+
+ <!-- Generate configuration classes from XML definitions -->
+ <!-- Leave default lifecycle phase once new config framework migration
+ is done -->
+ <plugin>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-config-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <executions>
<execution>
<id>generate-config</id>
<phase>generate-sources</phase>
<goals>
- <goal>generate-config</goal>
+ <goal>generate</goal>
</goals>
<configuration>
<phase>none</phase>
@@ -424,58 +413,6 @@
<isExtension>false</isExtension>
</configuration>
</execution>
-
- <!-- Create consolidated schema file for use in upgrade -->
- <execution>
- <id>creates-base-schema-files</id>
- <goals>
- <goal>concat</goal>
- </goals>
- <configuration>
- <schemaDirectory>${basedir}/resource/schema</schemaDirectory>
- <outputDirectory>${project.build.directory}/upgrade</outputDirectory>
- <outputFile>schema.ldif.${buildRevision}</outputFile>
- </configuration>
- </execution>
-
- <!-- Generates references from messages for documentation -->
- <execution>
- <goals>
- <goal>generate-xml-messages-doc</goal>
- </goals>
- <configuration>
- <messagesDirectory>${basedir}/src/messages/org/opends/messages</messagesDirectory>
- <outputDirectory>${project.build.directory}/docgen/logref</outputDirectory>
- <logMessageReferenceFilePath>${basedir}/resource/log-message-reference.xml</logMessageReferenceFilePath>
- <messageFileNames>
- <!-- for xxx_yyy.properties generates a log-ref-xxx-yyy.xml
- file -->
- <messageFileName>admin</messageFileName>
- <messageFileName>backend</messageFileName>
- <messageFileName>config</messageFileName>
- <messageFileName>core</messageFileName>
- <messageFileName>dsconfig</messageFileName>
- <messageFileName>extension</messageFileName>
- <messageFileName>jeb</messageFileName>
- <messageFileName>logger</messageFileName>
- <messageFileName>plugin</messageFileName>
- <messageFileName>protocol</messageFileName>
- <messageFileName>replication</messageFileName>
- <messageFileName>schema</messageFileName>
- <messageFileName>task</messageFileName>
- <messageFileName>tool</messageFileName>
- <messageFileName>utility</messageFileName>
-
- <!-- Ignore following message files as we document only serious
- errors. -->
- <!-- <messageFileName>access_control</messageFileName> -->
- <!-- <messageFileName>admin_tool</messageFileName> -->
- <!-- <messageFileName>quicksetup.properties</messageFileName> -->
- <!-- <messageFileName>runtime_information.properties</messageFileName> -->
- <!-- <messageFileName>version.properties</messageFileName> -->
- </messageFileNames>
- </configuration>
- </execution>
</executions>
</plugin>
@@ -546,6 +483,26 @@
</executions>
</plugin>
+ <!-- Create consolidated schema file for use in upgrade -->
+ <plugin>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-concat-schema-maven-plugin</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>creates-base-schema-files</id>
+ <goals>
+ <goal>concat</goal>
+ </goals>
+ <configuration>
+ <schemaDirectory>${basedir}/resource/schema</schemaDirectory>
+ <outputDirectory>${project.build.directory}/upgrade</outputDirectory>
+ <outputFile>schema.ldif.${buildRevision}</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Compile unit tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1009,6 +966,52 @@
</executions>
</plugin>
+ <!-- Generates log references for documentation -->
+ <plugin>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-logref-doc-maven-plugin</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-xml-messages-doc</goal>
+ </goals>
+ <configuration>
+ <messagesDirectory>${basedir}/src/messages/org/opends/messages</messagesDirectory>
+ <outputDirectory>${project.build.directory}/docgen/logref</outputDirectory>
+ <logMessageReferenceFilePath>${basedir}/resource/log-message-reference.xml</logMessageReferenceFilePath>
+ <messageFileNames>
+ <!-- for xxx_yyy.properties generates a log-ref-xxx-yyy.xml
+ file -->
+ <messageFileName>admin</messageFileName>
+ <messageFileName>backend</messageFileName>
+ <messageFileName>config</messageFileName>
+ <messageFileName>core</messageFileName>
+ <messageFileName>dsconfig</messageFileName>
+ <messageFileName>extension</messageFileName>
+ <messageFileName>jeb</messageFileName>
+ <messageFileName>logger</messageFileName>
+ <messageFileName>plugin</messageFileName>
+ <messageFileName>protocol</messageFileName>
+ <messageFileName>replication</messageFileName>
+ <messageFileName>schema</messageFileName>
+ <messageFileName>task</messageFileName>
+ <messageFileName>tool</messageFileName>
+ <messageFileName>utility</messageFileName>
+
+ <!-- Ignore following message files as we document only serious
+ errors. -->
+ <!-- <messageFileName>access_control</messageFileName> -->
+ <!-- <messageFileName>admin_tool</messageFileName> -->
+ <!-- <messageFileName>quicksetup.properties</messageFileName> -->
+ <!-- <messageFileName>runtime_information.properties</messageFileName> -->
+ <!-- <messageFileName>version.properties</messageFileName> -->
+ </messageFileNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Generate documentation (guide) -->
<plugin>
<groupId>org.forgerock.commons</groupId>
@@ -1216,6 +1219,8 @@
<excludes>
<exclude>org/opends/server/snmp/**</exclude>
<exclude>org/opends/quicksetup/**</exclude>
+ <exclude>org/opends/quicksetup/**</exclude>
+ <exclude>org/forgerock/opendj/adapter/**</exclude>
</excludes>
<includes>
<include>**/Test*.java</include>
diff --git a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
index 639fb5e..a9a239b 100644
--- a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
+++ b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
@@ -35,7 +35,6 @@
<scope>runtime</scope>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<excludes>
- <exclude>org.forgerock.opendj:opendj3-server-dev</exclude>
<exclude>javax.activation:activation</exclude>
<exclude>org.forgerock.commons:json-resource-servlet:war</exclude>
</excludes>
diff --git a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
similarity index 100%
rename from opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
rename to opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
diff --git a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
similarity index 100%
rename from opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
rename to opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
diff --git a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/package-info.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/package-info.java
similarity index 100%
rename from opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/package-info.java
rename to opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/package-info.java
diff --git a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java
similarity index 99%
rename from opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java
rename to opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java
index 87acf0d..a683255 100644
--- a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2013-2014 ForgeRock AS
+ * Copyright 2013-2015 ForgeRock AS
*/
package org.forgerock.opendj.adapter.server3x;
@@ -69,6 +69,7 @@
import org.forgerock.opendj.ldap.responses.WhoAmIExtendedResult;
import org.forgerock.opendj.ldif.ConnectionEntryReader;
import org.forgerock.testng.ForgeRockTestCase;
+import org.opends.server.DirectoryServerTestCase;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
@@ -82,8 +83,8 @@
* This class defines a set of tests for the Adapters.class.
*/
@SuppressWarnings("javadoc")
-@Test
-public class AdaptersTestCase extends ForgeRockTestCase {
+@Test(sequential=true)
+public class AdaptersTestCase extends DirectoryServerTestCase {
/**
* Provides an anonymous connection factories.
diff --git a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
similarity index 99%
rename from opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
rename to opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
index d73581f..786afd4 100644
--- a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2013-2014 ForgeRock AS.
+ * Copyright 2013-2015 ForgeRock AS.
*/
package org.forgerock.opendj.adapter.server3x;
@@ -66,6 +66,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.protocols.ldap.LDAPFilter;
+import org.opends.server.DirectoryServerTestCase;
import org.opends.server.types.Attribute;
import org.opends.server.types.Attributes;
import org.opends.server.types.DirectoryException;
@@ -90,8 +91,8 @@
* </pre>
*/
@SuppressWarnings("javadoc")
-@Test
-public class ConvertersTestCase extends ForgeRockTestCase {
+@Test(sequential=true)
+public class ConvertersTestCase extends DirectoryServerTestCase {
/**
* Launched before the tests, this function starts the embedded server.
diff --git a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/EmbeddedServerTestCaseUtils.java b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/EmbeddedServerTestCaseUtils.java
similarity index 93%
rename from opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/EmbeddedServerTestCaseUtils.java
rename to opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/EmbeddedServerTestCaseUtils.java
index d55b523..c635212 100644
--- a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/EmbeddedServerTestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/EmbeddedServerTestCaseUtils.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2013-2014 ForgeRock AS.
+ * Copyright 2013-2015 ForgeRock AS.
*/
package org.forgerock.opendj.adapter.server3x;
@@ -37,7 +37,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.forgerock.testng.ForgeRockTestCase;
import org.opends.server.backends.MemoryBackend;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryEnvironmentConfig;
@@ -50,7 +49,7 @@
* This class defines a main functions for starting and stopping the embedded
* server in test cases.
*/
-class EmbeddedServerTestCaseUtils extends ForgeRockTestCase {
+class EmbeddedServerTestCaseUtils {
/**
* The configuration properties for the tests.
@@ -60,12 +59,12 @@
/**
* The path to the test classes.
*/
- static final String TEST_CLASSES_PATH = "./target/test-classes/";
+ static final String TEST_CLASSES_PATH = "./build/test-classes/";
/**
* The path to the configuration folder.
*/
- static final String TEST_CLASSES_PATH_CONFIG = "./target/test-classes/config/";
+ static final String TEST_CLASSES_PATH_CONFIG = "./build/test-classes/config/";
/**
* Starts the embedded server.
diff --git a/opendj-server3x-adapter/src/test/resources/config/admin-backend.ldif b/opendj-server-legacy/src/test/resources/config/admin-backend.ldif
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/admin-backend.ldif
rename to opendj-server-legacy/src/test/resources/config/admin-backend.ldif
diff --git a/opendj-server3x-adapter/src/test/resources/config/admin-keystore b/opendj-server-legacy/src/test/resources/config/admin-keystore
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/admin-keystore
rename to opendj-server-legacy/src/test/resources/config/admin-keystore
Binary files differ
diff --git a/opendj-server3x-adapter/src/test/resources/config/admin-keystore.pin b/opendj-server-legacy/src/test/resources/config/admin-keystore.pin
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/admin-keystore.pin
rename to opendj-server-legacy/src/test/resources/config/admin-keystore.pin
diff --git a/opendj-server3x-adapter/src/test/resources/config/admin-truststore b/opendj-server-legacy/src/test/resources/config/admin-truststore
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/admin-truststore
rename to opendj-server-legacy/src/test/resources/config/admin-truststore
Binary files differ
diff --git a/opendj-server3x-adapter/src/test/resources/config/ads-truststore b/opendj-server-legacy/src/test/resources/config/ads-truststore
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/ads-truststore
rename to opendj-server-legacy/src/test/resources/config/ads-truststore
Binary files differ
diff --git a/opendj-server3x-adapter/src/test/resources/config/ads-truststore.pin b/opendj-server-legacy/src/test/resources/config/ads-truststore.pin
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/ads-truststore.pin
rename to opendj-server-legacy/src/test/resources/config/ads-truststore.pin
diff --git a/opendj-server3x-adapter/src/test/resources/config/config.ldif b/opendj-server-legacy/src/test/resources/config/config.ldif
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/config.ldif
rename to opendj-server-legacy/src/test/resources/config/config.ldif
diff --git a/opendj-server3x-adapter/src/test/resources/config/config.properties b/opendj-server-legacy/src/test/resources/config/config.properties
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/config.properties
rename to opendj-server-legacy/src/test/resources/config/config.properties
diff --git a/opendj-server3x-adapter/src/test/resources/config/schema/00-core.ldif b/opendj-server-legacy/src/test/resources/config/schema/00-core.ldif
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/schema/00-core.ldif
rename to opendj-server-legacy/src/test/resources/config/schema/00-core.ldif
diff --git a/opendj-server3x-adapter/src/test/resources/config/schema/01-pwpolicy.ldif b/opendj-server-legacy/src/test/resources/config/schema/01-pwpolicy.ldif
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/schema/01-pwpolicy.ldif
rename to opendj-server-legacy/src/test/resources/config/schema/01-pwpolicy.ldif
diff --git a/opendj-server3x-adapter/src/test/resources/config/schema/02-config.ldif b/opendj-server-legacy/src/test/resources/config/schema/02-config.ldif
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/schema/02-config.ldif
rename to opendj-server-legacy/src/test/resources/config/schema/02-config.ldif
diff --git a/opendj-server3x-adapter/src/test/resources/config/schema/03-pwpolicyextension.ldif b/opendj-server-legacy/src/test/resources/config/schema/03-pwpolicyextension.ldif
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/schema/03-pwpolicyextension.ldif
rename to opendj-server-legacy/src/test/resources/config/schema/03-pwpolicyextension.ldif
diff --git a/opendj-server3x-adapter/src/test/resources/config/schema/04-rfc2307bis.ldif b/opendj-server-legacy/src/test/resources/config/schema/04-rfc2307bis.ldif
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/schema/04-rfc2307bis.ldif
rename to opendj-server-legacy/src/test/resources/config/schema/04-rfc2307bis.ldif
diff --git a/opendj-server3x-adapter/src/test/resources/config/tasks.ldif b/opendj-server-legacy/src/test/resources/config/tasks.ldif
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/config/tasks.ldif
rename to opendj-server-legacy/src/test/resources/config/tasks.ldif
diff --git a/opendj-server3x-adapter/src/test/resources/locks/backend-adminRoot.lock b/opendj-server-legacy/src/test/resources/locks/backend-adminRoot.lock
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/locks/backend-adminRoot.lock
rename to opendj-server-legacy/src/test/resources/locks/backend-adminRoot.lock
diff --git a/opendj-server3x-adapter/src/test/resources/locks/backend-ads-truststore.lock b/opendj-server-legacy/src/test/resources/locks/backend-ads-truststore.lock
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/locks/backend-ads-truststore.lock
rename to opendj-server-legacy/src/test/resources/locks/backend-ads-truststore.lock
diff --git a/opendj-server3x-adapter/src/test/resources/locks/backend-backup.lock b/opendj-server-legacy/src/test/resources/locks/backend-backup.lock
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/locks/backend-backup.lock
rename to opendj-server-legacy/src/test/resources/locks/backend-backup.lock
diff --git a/opendj-server3x-adapter/src/test/resources/locks/backend-monitor.lock b/opendj-server-legacy/src/test/resources/locks/backend-monitor.lock
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/locks/backend-monitor.lock
rename to opendj-server-legacy/src/test/resources/locks/backend-monitor.lock
diff --git a/opendj-server3x-adapter/src/test/resources/locks/backend-schema.lock b/opendj-server-legacy/src/test/resources/locks/backend-schema.lock
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/locks/backend-schema.lock
rename to opendj-server-legacy/src/test/resources/locks/backend-schema.lock
diff --git a/opendj-server3x-adapter/src/test/resources/locks/backend-tasks.lock b/opendj-server-legacy/src/test/resources/locks/backend-tasks.lock
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/locks/backend-tasks.lock
rename to opendj-server-legacy/src/test/resources/locks/backend-tasks.lock
diff --git a/opendj-server3x-adapter/src/test/resources/locks/backend-userRoot.lock b/opendj-server-legacy/src/test/resources/locks/backend-userRoot.lock
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/locks/backend-userRoot.lock
rename to opendj-server-legacy/src/test/resources/locks/backend-userRoot.lock
diff --git a/opendj-server3x-adapter/src/test/resources/locks/server.lock b/opendj-server-legacy/src/test/resources/locks/server.lock
similarity index 100%
rename from opendj-server3x-adapter/src/test/resources/locks/server.lock
rename to opendj-server-legacy/src/test/resources/locks/server.lock
diff --git a/pom.xml b/pom.xml
index 2a4f794..c04aa99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,8 +100,6 @@
<module>opendj-ldap-sdk-examples</module>
<module>opendj-rest2ldap</module>
<module>opendj-rest2ldap-servlet</module>
- <module>opendj-server2x-adapter</module>
- <module>opendj-server3x-adapter</module>
<module>opendj-server</module>
<module>opendj-server-example-plugin</module>
<module>opendj-slf4j-adapter</module>
--
Gitblit v1.10.0