From 5491b25ff97dc85c5cc0ac8a6f87a86e5107156b Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 23 May 2011 20:39:44 +0000
Subject: [PATCH] Partial fix for OPENDJ-39: Consider rebranding OpenDS -> OpenDJ in 3.0 tree
---
opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/check-unit-tests.xml | 0
opendj3/opendj-build-tools/.project | 0
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java | 2
opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/OpenDJTestListener.java | 2
opendj3/opendj-ldap-toolkit/pom.xml | 2
opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/package-info.java | 2
opendj3/opendj-build-tools/.settings/org.maven.ide.eclipse.prefs | 0
opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/opendj.sourceheader | 0
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java | 2
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java | 2
opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java | 2
opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/check-src.xml | 0
opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java | 2
opendj3/opendj-build-tools/.classpath | 1
opendj3/opendj-ldap-sdk/pom.xml | 2
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java | 2
opendj3/opendj-build-tools/.settings/org.eclipse.jdt.core.prefs | 0
opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java | 2
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java | 2
opendj3/opendj-build-tools/pom.xml | 7 ++-
opendj3/pom.xml | 15 +++----
/dev/null | 7 ---
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java | 2
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java | 2
opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/OpenDJTestCase.java | 2
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java | 2
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java | 2
27 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/opendj3/opendj-maven-checkstyle/.classpath b/opendj3/opendj-build-tools/.classpath
similarity index 85%
rename from opendj3/opendj-maven-checkstyle/.classpath
rename to opendj3/opendj-build-tools/.classpath
index 72f855f..fb2f7c1 100644
--- a/opendj3/opendj-maven-checkstyle/.classpath
+++ b/opendj3/opendj-build-tools/.classpath
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
diff --git a/opendj3/opendj-maven-testng/.project b/opendj3/opendj-build-tools/.project
similarity index 100%
rename from opendj3/opendj-maven-testng/.project
rename to opendj3/opendj-build-tools/.project
diff --git a/opendj3/opendj-maven-testng/.settings/org.eclipse.jdt.core.prefs b/opendj3/opendj-build-tools/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from opendj3/opendj-maven-testng/.settings/org.eclipse.jdt.core.prefs
rename to opendj3/opendj-build-tools/.settings/org.eclipse.jdt.core.prefs
diff --git a/opendj3/opendj-maven-testng/.settings/org.maven.ide.eclipse.prefs b/opendj3/opendj-build-tools/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from opendj3/opendj-maven-testng/.settings/org.maven.ide.eclipse.prefs
rename to opendj3/opendj-build-tools/.settings/org.maven.ide.eclipse.prefs
diff --git a/opendj3/opendj-maven-testng/pom.xml b/opendj3/opendj-build-tools/pom.xml
similarity index 87%
rename from opendj3/opendj-maven-testng/pom.xml
rename to opendj3/opendj-build-tools/pom.xml
index acab514..d7dce79 100644
--- a/opendj3/opendj-maven-testng/pom.xml
+++ b/opendj3/opendj-build-tools/pom.xml
@@ -34,11 +34,12 @@
<groupId>org.forgerock.opendj</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>opendj-maven-testng</artifactId>
+ <artifactId>opendj-build-tools</artifactId>
<packaging>jar</packaging>
- <name>OpenDJ TestNG Support</name>
+ <name>OpenDJ Maven Build Tools</name>
<description>
- This module includes common TestNG unit test infrastructure for use in OpenDJ modules.
+ This module includes infrastructure required for building OpenDJ, comprising
+ of TestNG listeners, Checkstyle configuration, etc.
</description>
<dependencies>
<dependency>
diff --git a/opendj3/opendj-maven-testng/src/main/java/org/opendj/maven/testng/OpenDJTestCase.java b/opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/OpenDJTestCase.java
similarity index 98%
rename from opendj3/opendj-maven-testng/src/main/java/org/opendj/maven/testng/OpenDJTestCase.java
rename to opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/OpenDJTestCase.java
index 95f3f70..12c343c 100644
--- a/opendj3/opendj-maven-testng/src/main/java/org/opendj/maven/testng/OpenDJTestCase.java
+++ b/opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/OpenDJTestCase.java
@@ -26,7 +26,7 @@
* Portions copyright 2011 ForgeRock AS
*/
-package org.opendj.maven.testng;
+package org.forgerock.opendj.maven.testng;
diff --git a/opendj3/opendj-maven-testng/src/main/java/org/opendj/maven/testng/OpenDJTestListener.java b/opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/OpenDJTestListener.java
similarity index 99%
rename from opendj3/opendj-maven-testng/src/main/java/org/opendj/maven/testng/OpenDJTestListener.java
rename to opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/OpenDJTestListener.java
index ddc9c90..b7d4e04 100755
--- a/opendj3/opendj-maven-testng/src/main/java/org/opendj/maven/testng/OpenDJTestListener.java
+++ b/opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/OpenDJTestListener.java
@@ -25,7 +25,7 @@
* Copyright 2008 Sun Microsystems, Inc.
* Portions copyright 2011 ForgeRock AS
*/
-package org.opendj.maven.testng;
+package org.forgerock.opendj.maven.testng;
diff --git a/opendj3/opendj-maven-testng/src/main/java/org/opendj/maven/testng/package-info.java b/opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/package-info.java
similarity index 95%
rename from opendj3/opendj-maven-testng/src/main/java/org/opendj/maven/testng/package-info.java
rename to opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/package-info.java
index a887727..caaa92f 100644
--- a/opendj3/opendj-maven-testng/src/main/java/org/opendj/maven/testng/package-info.java
+++ b/opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/package-info.java
@@ -27,7 +27,7 @@
/**
* TestNG unit testing infrastructure necessary for the OpenDJ project.
*/
-package org.opendj.maven.testng;
+package org.forgerock.opendj.maven.testng;
diff --git a/opendj3/opendj-maven-checkstyle/src/main/resources/org/opendj/maven/checkstyle/check-src.xml b/opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/check-src.xml
similarity index 100%
rename from opendj3/opendj-maven-checkstyle/src/main/resources/org/opendj/maven/checkstyle/check-src.xml
rename to opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/check-src.xml
diff --git a/opendj3/opendj-maven-checkstyle/src/main/resources/org/opendj/maven/checkstyle/check-unit-tests.xml b/opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/check-unit-tests.xml
similarity index 100%
rename from opendj3/opendj-maven-checkstyle/src/main/resources/org/opendj/maven/checkstyle/check-unit-tests.xml
rename to opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/check-unit-tests.xml
diff --git a/opendj3/opendj-maven-checkstyle/src/main/resources/org/opendj/maven/checkstyle/opendj.sourceheader b/opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/opendj.sourceheader
similarity index 100%
rename from opendj3/opendj-maven-checkstyle/src/main/resources/org/opendj/maven/checkstyle/opendj.sourceheader
rename to opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/opendj.sourceheader
diff --git a/opendj3/opendj-ldap-sdk/pom.xml b/opendj3/opendj-ldap-sdk/pom.xml
index 246c77f..7ba1ba7 100644
--- a/opendj3/opendj-ldap-sdk/pom.xml
+++ b/opendj3/opendj-ldap-sdk/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-maven-testng</artifactId>
+ <artifactId>opendj-build-tools</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
index 9e2a514..f5fb9dc 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
@@ -29,7 +29,7 @@
-import org.opendj.maven.testng.OpenDJTestCase;
+import org.forgerock.opendj.maven.testng.OpenDJTestCase;
import org.testng.annotations.Test;
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java
index b7409ce..0a16ec5 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java
@@ -29,7 +29,7 @@
-import org.opendj.maven.testng.OpenDJTestCase;
+import org.forgerock.opendj.maven.testng.OpenDJTestCase;
import org.testng.annotations.Test;
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java
index 33bf4f3..18ad048 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java
@@ -39,7 +39,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
-import org.opendj.maven.testng.OpenDJTestCase;
+import org.forgerock.opendj.maven.testng.OpenDJTestCase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java
index a2a0a9c..31848c1 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java
@@ -40,7 +40,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DecodeException;
-import org.opendj.maven.testng.OpenDJTestCase;
+import org.forgerock.opendj.maven.testng.OpenDJTestCase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java
index f3f7b1e..df3747e 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java
@@ -34,7 +34,7 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.schema.Schema;
-import org.opendj.maven.testng.OpenDJTestCase;
+import org.forgerock.opendj.maven.testng.OpenDJTestCase;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java
index 77fdd8d..3edac39 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java
@@ -28,7 +28,7 @@
-import org.opendj.maven.testng.OpenDJTestCase;
+import org.forgerock.opendj.maven.testng.OpenDJTestCase;
import org.testng.annotations.Test;
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java
index 0503750..843f40c 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java
@@ -30,7 +30,7 @@
import org.forgerock.opendj.ldap.TestCaseUtils;
-import org.opendj.maven.testng.OpenDJTestCase;
+import org.forgerock.opendj.maven.testng.OpenDJTestCase;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java
index a662eb6..ab30e62 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java
@@ -29,7 +29,7 @@
-import org.opendj.maven.testng.OpenDJTestCase;
+import org.forgerock.opendj.maven.testng.OpenDJTestCase;
import org.testng.annotations.Test;
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java
index f3b070c..5ea55ea 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java
@@ -29,7 +29,7 @@
-import org.opendj.maven.testng.OpenDJTestCase;
+import org.forgerock.opendj.maven.testng.OpenDJTestCase;
import org.testng.annotations.Test;
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java
index fd77550..6b0d846 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java
@@ -28,7 +28,7 @@
-import org.opendj.maven.testng.OpenDJTestCase;
+import org.forgerock.opendj.maven.testng.OpenDJTestCase;
import org.testng.annotations.Test;
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
index 2dbe6d3..ff31a58 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
@@ -28,7 +28,7 @@
-import org.opendj.maven.testng.OpenDJTestCase;
+import org.forgerock.opendj.maven.testng.OpenDJTestCase;
import org.testng.annotations.Test;
diff --git a/opendj3/opendj-ldap-toolkit/pom.xml b/opendj3/opendj-ldap-toolkit/pom.xml
index 0e4bae0..30d109b 100644
--- a/opendj3/opendj-ldap-toolkit/pom.xml
+++ b/opendj3/opendj-ldap-toolkit/pom.xml
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-maven-testng</artifactId>
+ <artifactId>opendj-build-tools</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java b/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java
index 4056c92..567b66a 100644
--- a/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java
+++ b/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java
@@ -29,7 +29,7 @@
-import org.opendj.maven.testng.OpenDJTestCase;
+import org.forgerock.opendj.maven.testng.OpenDJTestCase;
import org.testng.annotations.Test;
diff --git a/opendj3/opendj-maven-checkstyle/.project b/opendj3/opendj-maven-checkstyle/.project
deleted file mode 100644
index 69396fe..0000000
--- a/opendj3/opendj-maven-checkstyle/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>opendj-build-tools-checkstyle</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/opendj3/opendj-maven-checkstyle/.settings/org.eclipse.jdt.core.prefs b/opendj3/opendj-maven-checkstyle/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index bc81eeb..0000000
--- a/opendj3/opendj-maven-checkstyle/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Fri Feb 11 18:59:22 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/opendj3/opendj-maven-checkstyle/.settings/org.maven.ide.eclipse.prefs b/opendj3/opendj-maven-checkstyle/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 6e90395..0000000
--- a/opendj3/opendj-maven-checkstyle/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Fri Feb 11 18:59:22 CET 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/opendj3/opendj-maven-checkstyle/pom.xml b/opendj3/opendj-maven-checkstyle/pom.xml
deleted file mode 100644
index 63a72fc..0000000
--- a/opendj3/opendj-maven-checkstyle/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ! CDDL HEADER START
- !
- ! The contents of this file are subject to the terms of the
- ! Common Development and Distribution License, Version 1.0 only
- ! (the "License"). You may not use this file except in compliance
- ! with the License.
- !
- ! You can obtain a copy of the license at
- ! trunk/opends/resource/legal-notices/CDDLv1_0.txt
- ! or http://forgerock.org/license/CDDLv1.0.html.
- ! See the License for the specific language governing permissions
- ! and limitations under the License.
- !
- ! When distributing Covered Code, include this CDDL HEADER in each
- ! file and include the License file at
- ! trunk/opends/resource/legal-notices/CDDLv1_0.txt. If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
- ! Portions Copyright [yyyy] [name of copyright owner]
- !
- ! CDDL HEADER END
- !
- ! Copyright 2011 ForgeRock AS
- !
- -->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>opendj-project</artifactId>
- <groupId>org.forgerock.opendj</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>opendj-maven-checkstyle</artifactId>
- <packaging>jar</packaging>
- <name>OpenDJ Checkstyle Configuration</name>
- <description>
- This module contains Checkstyle configuration.
- </description>
-</project>
diff --git a/opendj3/opendj-maven-testng/.classpath b/opendj3/opendj-maven-testng/.classpath
deleted file mode 100644
index 1f3c1ff..0000000
--- a/opendj3/opendj-maven-testng/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/opendj3/pom.xml b/opendj3/pom.xml
index 1afbe79..7406c76 100644
--- a/opendj3/pom.xml
+++ b/opendj3/pom.xml
@@ -88,8 +88,7 @@
</site>
</distributionManagement>
<modules>
- <module>opendj-maven-checkstyle</module>
- <module>opendj-maven-testng</module>
+ <module>opendj-build-tools</module>
<module>opendj-ldap-sdk</module>
<module>opendj-ldap-toolkit</module>
</modules>
@@ -286,7 +285,7 @@
</property>
<property>
<name>listener</name>
- <value>org.opendj.maven.testng.OpenDJTestListener</value>
+ <value>org.forgerock.opendj.maven.testng.OpenDJTestListener</value>
</property>
</properties>
</configuration>
@@ -324,7 +323,7 @@
<dependencies>
<dependency>
<groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-maven-checkstyle</artifactId>
+ <artifactId>opendj-build-tools</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -332,8 +331,8 @@
<execution>
<id>process-classes</id>
<configuration>
- <configLocation>org/opendj/maven/checkstyle/check-src.xml</configLocation>
- <headerLocation>org/opendj/maven/checkstyle/opendj.sourceheader</headerLocation>
+ <configLocation>org/forgerock/opendj/maven/checkstyle/check-src.xml</configLocation>
+ <headerLocation>org/forgerock/opendj/maven/checkstyle/opendj.sourceheader</headerLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
@@ -347,8 +346,8 @@
<id>process-test-classes</id>
<configuration>
<sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
- <configLocation>org/opendj/maven/checkstyle/check-unit-tests.xml</configLocation>
- <headerLocation>org/opendj/maven/checkstyle/opendj.sourceheader</headerLocation>
+ <configLocation>org/forgerock/opendj/maven/checkstyle/check-unit-tests.xml</configLocation>
+ <headerLocation>org/forgerock/opendj/maven/checkstyle/opendj.sourceheader</headerLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
--
Gitblit v1.10.0