Partial fix for OPENDJ-39: Consider rebranding OpenDS -> OpenDJ in 3.0 tree

Matthew Swift

23.39.2011 5491b25ff97dc85c5cc0ac8a6f87a86e5107156b

Partial fix for OPENDJ-39: Consider rebranding OpenDS -> OpenDJ in 3.0 tree

Combine Checkstyle and TestNG modules into single opendj-build-tools.

 opendj3/opendj-build-tools/.classpath

File was renamed from opendj3/opendj-maven-checkstyle/.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"/>

 opendj3/opendj-build-tools/.project

 opendj3/opendj-build-tools/.settings/org.eclipse.jdt.core.prefs

 opendj3/opendj-build-tools/.settings/org.maven.ide.eclipse.prefs

 opendj3/opendj-build-tools/pom.xml

File was renamed from opendj3/opendj-maven-testng/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>

 opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/OpenDJTestCase.java

File was renamed from opendj3/opendj-maven-testng/src/main/java/org/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;




 opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/OpenDJTestListener.java

File was renamed from opendj3/opendj-maven-testng/src/main/java/org/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;




 opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/package-info.java

File was renamed from opendj3/opendj-maven-testng/src/main/java/org/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;




 opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/check-src.xml

 opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/check-unit-tests.xml

 opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/opendj.sourceheader

 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>

 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;



 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;



 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;


 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;


 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;

 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;



 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;


 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;



 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;



 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;



 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;



 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>

 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;



 opendj3/opendj-maven-checkstyle/.project

File was deleted

 opendj3/opendj-maven-checkstyle/.settings/org.eclipse.jdt.core.prefs

File was deleted

 opendj3/opendj-maven-checkstyle/.settings/org.maven.ide.eclipse.prefs

File was deleted

 opendj3/opendj-maven-checkstyle/pom.xml

File was deleted

 opendj3/opendj-maven-testng/.classpath

File was deleted

 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>