opendj-sdk/opendj3/opendj-build-tools/pom.xml
File was deleted opendj-sdk/opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/OpenDJTestCase.java
File was deleted opendj-sdk/opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/OpenDJTestListener.java
File was deleted opendj-sdk/opendj3/opendj-build-tools/src/main/java/org/forgerock/opendj/maven/testng/package-info.java
File was deleted opendj-sdk/opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/check-src.xml
File was deleted opendj-sdk/opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/check-unit-tests.xml
File was deleted opendj-sdk/opendj3/opendj-build-tools/src/main/resources/org/forgerock/opendj/maven/checkstyle/opendj.sourceheader
File was deleted opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
@@ -47,29 +47,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <windowtitle>OpenDJ LDAP SDK Examples Documentation</windowtitle> <doctitle>OpenDJ LDAP SDK Examples Documentation</doctitle> <links> <link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link> </links> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <executions> <execution> @@ -103,23 +84,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.8</version> <configuration> <author>false</author> <quiet>true</quiet> <windowtitle>OpenDJ LDAP SDK Examples Documentation</windowtitle> <doctitle>OpenDJ LDAP SDK Examples Documentation</doctitle> <links> <link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link> <link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link> </links> </configuration> <reportSets> <reportSet> <reports> <report>javadoc</report> </reports> </reportSet> </reportSets> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> opendj-sdk/opendj3/opendj-ldap-sdk-examples/src/main/javadoc/overview.html
New file @@ -0,0 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <body> The OpenDJ SDK Examples contains various example applications illustrating usage of the OpenDJ LDAP SDK. </body> </html> opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml
@@ -51,9 +51,9 @@ <scope>compile</scope> </dependency> <dependency> <groupId>org.forgerock.opendj</groupId> <artifactId>opendj-build-tools</artifactId> <version>${project.version}</version> <groupId>org.forgerock</groupId> <artifactId>forgerock-build-tools</artifactId> <version>${forgerockBuildToolsVersion}</version> <scope>test</scope> </dependency> </dependencies> @@ -92,23 +92,8 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <windowtitle>OpenDJ LDAP SDK Documentation</windowtitle> <doctitle>OpenDJ LDAP SDK Documentation</doctitle> <links> <link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link> </links> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> </plugins> </build> <reporting> @@ -132,25 +117,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.8</version> <configuration> <author>false</author> <quiet>true</quiet> <windowtitle>OpenDJ LDAP SDK Documentation</windowtitle> <doctitle>OpenDJ LDAP SDK Documentation</doctitle> <show>protected</show> <excludePackageNames>com.*</excludePackageNames> <links> <link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link> <link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link> </links> </configuration> <reportSets> <reportSet> <reports> <report>javadoc</report> </reports> </reportSet> </reportSets> </plugin> </plugins> </reporting> opendj-sdk/opendj3/opendj-ldap-sdk/src/main/javadoc/overview.html
@@ -12,8 +12,7 @@ search. The search results are output as LDIF to the standard output: <br> <table bgcolor="#cccccc" border="0" cellpadding="2" cellspacing="2" width="100%"> <table width="100%"> <tbody> <tr> <td> opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
@@ -23,13 +23,14 @@ * * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012 ForgeRock AS. */ package com.forgerock.opendj.ldap; import org.forgerock.opendj.maven.testng.OpenDJTestCase; import org.forgerock.testng.ForgeRockTestCase; import org.testng.annotations.Test; @@ -40,6 +41,6 @@ */ @Test(groups = { "precommit", "ldap", "sdk" }) public abstract class LDAPTestCase extends OpenDJTestCase public abstract class LDAPTestCase extends ForgeRockTestCase { } opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java
@@ -23,13 +23,14 @@ * * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012 ForgeRock AS. */ package com.forgerock.opendj.util; import org.forgerock.opendj.maven.testng.OpenDJTestCase; import org.forgerock.testng.ForgeRockTestCase; import org.testng.annotations.Test; @@ -39,6 +40,6 @@ * classes found directly under the package org.forgerock.opendj.ldap.util. */ @Test(groups = { "precommit", "util", "sdk" }) public abstract class UtilTestCase extends OpenDJTestCase public abstract class UtilTestCase extends ForgeRockTestCase { } opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1ReaderTestCase.java
@@ -23,6 +23,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.asn1; @@ -39,7 +40,7 @@ import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.forgerock.opendj.ldap.DecodeException; import org.forgerock.opendj.maven.testng.OpenDJTestCase; import org.forgerock.testng.ForgeRockTestCase; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -49,7 +50,7 @@ * An abstract base class for all ASN1Reader test cases. */ @Test(groups = { "precommit", "asn1", "sdk" }) public abstract class ASN1ReaderTestCase extends OpenDJTestCase public abstract class ASN1ReaderTestCase extends ForgeRockTestCase { /** opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/asn1/ASN1WriterTestCase.java
@@ -23,6 +23,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.asn1; @@ -40,7 +41,7 @@ import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.ByteStringBuilder; import org.forgerock.opendj.ldap.DecodeException; import org.forgerock.opendj.maven.testng.OpenDJTestCase; import org.forgerock.testng.ForgeRockTestCase; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -53,7 +54,7 @@ */ @Test(groups = { "precommit", "asn1", "sdk" }) @SuppressWarnings("javadoc") public abstract class ASN1WriterTestCase extends OpenDJTestCase public abstract class ASN1WriterTestCase extends ForgeRockTestCase { // Create an array with all of the valid single-byte types. We don't opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java
@@ -23,6 +23,7 @@ * * * Copyright 200-2010 Sun Microsystems, Inc. * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -34,7 +35,6 @@ import org.forgerock.i18n.LocalizedIllegalArgumentException; import org.forgerock.opendj.ldap.AttributeDescription; import org.forgerock.opendj.ldap.schema.Schema; import org.forgerock.opendj.maven.testng.OpenDJTestCase; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -45,7 +45,7 @@ * Test {@code AttributeDescription}. */ @SuppressWarnings("javadoc") public final class AttributeDescriptionTestCase extends OpenDJTestCase public final class AttributeDescriptionTestCase extends SdkTestCase { @DataProvider(name = "dataForCompareCoreSchema") public Object[][] dataForCompareCoreSchema() opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java
@@ -23,12 +23,13 @@ * * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap; import org.forgerock.opendj.maven.testng.OpenDJTestCase; import org.forgerock.testng.ForgeRockTestCase; import org.testng.annotations.Test; @@ -39,6 +40,6 @@ */ @Test(groups = { "precommit", "types", "sdk" }) public abstract class SdkTestCase extends OpenDJTestCase public abstract class SdkTestCase extends ForgeRockTestCase { } opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java
@@ -23,6 +23,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -30,7 +31,7 @@ import org.forgerock.opendj.ldap.TestCaseUtils; import org.forgerock.opendj.maven.testng.OpenDJTestCase; import org.forgerock.testng.ForgeRockTestCase; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -43,7 +44,7 @@ */ @Test(groups = { "precommit", "controls", "sdk" }) public abstract class ControlsTestCase extends OpenDJTestCase public abstract class ControlsTestCase extends ForgeRockTestCase { /** * Set up the environment for performing the tests in this suite. opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java
@@ -23,13 +23,14 @@ * * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; import org.forgerock.opendj.maven.testng.OpenDJTestCase; import org.forgerock.testng.ForgeRockTestCase; import org.testng.annotations.Test; @@ -41,6 +42,6 @@ */ @Test(groups = { "precommit", "requests", "sdk" }) public abstract class RequestsTestCase extends OpenDJTestCase public abstract class RequestsTestCase extends ForgeRockTestCase { } opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java
@@ -23,13 +23,14 @@ * * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; import org.forgerock.opendj.maven.testng.OpenDJTestCase; import org.forgerock.testng.ForgeRockTestCase; import org.testng.annotations.Test; @@ -41,6 +42,6 @@ */ @Test(groups = { "precommit", "responses", "sdk" }) public abstract class ResponsesTestCase extends OpenDJTestCase public abstract class ResponsesTestCase extends ForgeRockTestCase { } opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java
@@ -23,12 +23,13 @@ * * * Copyright 2009 Sun Microsystems, Inc. * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; import org.forgerock.opendj.maven.testng.OpenDJTestCase; import org.forgerock.testng.ForgeRockTestCase; import org.testng.annotations.Test; @@ -37,6 +38,6 @@ * An abstract class that all schema unit test should extend. */ @Test(groups = { "precommit", "schema", "sdk" }) public abstract class SchemaTestCase extends OpenDJTestCase public abstract class SchemaTestCase extends ForgeRockTestCase { } opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
@@ -23,12 +23,13 @@ * * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldif; import org.forgerock.opendj.maven.testng.OpenDJTestCase; import org.forgerock.testng.ForgeRockTestCase; import org.testng.annotations.Test; @@ -39,6 +40,6 @@ */ @Test(groups = { "precommit", "types", "sdk" }) public abstract class LDIFTestCase extends OpenDJTestCase public abstract class LDIFTestCase extends ForgeRockTestCase { } opendj-sdk/opendj3/opendj-ldap-sync/pom.xml
@@ -80,10 +80,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml
@@ -46,9 +46,9 @@ <scope>compile</scope> </dependency> <dependency> <groupId>org.forgerock.opendj</groupId> <artifactId>opendj-build-tools</artifactId> <version>${project.version}</version> <groupId>org.forgerock</groupId> <artifactId>forgerock-build-tools</artifactId> <version>${forgerockBuildToolsVersion}</version> <scope>test</scope> </dependency> <dependency> @@ -81,10 +81,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> opendj-sdk/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java
@@ -23,13 +23,14 @@ * * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; import org.forgerock.opendj.maven.testng.OpenDJTestCase; import org.forgerock.testng.ForgeRockTestCase; import org.testng.annotations.Test; @@ -40,6 +41,6 @@ */ @Test(groups = { "precommit", "tools", "sdk" }) public abstract class ToolsTestCase extends OpenDJTestCase public abstract class ToolsTestCase extends ForgeRockTestCase { } opendj-sdk/opendj3/opendj-rest2ldap/pom.xml
@@ -51,6 +51,12 @@ <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.forgerock.commons</groupId> <artifactId>json-fluent</artifactId> <version>1.1.0</version> <scope>compile</scope> </dependency> </dependencies> <build> <plugins> @@ -77,10 +83,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> </plugins> </build> <reporting> opendj-sdk/opendj3/pom.xml
@@ -25,12 +25,14 @@ ! Copyright 2011-2012 ForgeRock AS ! --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.forgerock</groupId> <artifactId>forgerock-parent</artifactId> <version>1.0.0</version> <version>1.1.0-SNAPSHOT</version> </parent> <groupId>org.forgerock.opendj</groupId> <artifactId>opendj-project</artifactId> @@ -91,11 +93,12 @@ </site> </distributionManagement> <modules> <module>opendj-build-tools</module> <module>opendj-ldap-sdk</module> <module>opendj-ldap-toolkit</module> <!-- <module>opendj-ldap-sync</module> <module>opendj-rest2ldap</module> --> <module>opendj-ldap-sdk-examples</module> </modules> <properties> @@ -109,6 +112,7 @@ <gaId>UA-23412190-8</gaId> </properties> <build> <!-- <plugins> <plugin> <groupId>org.forgerock.commons</groupId> @@ -137,6 +141,7 @@ </executions> </plugin> </plugins> --> <pluginManagement> <plugins> <plugin> @@ -159,7 +164,7 @@ </property> <property> <name>listener</name> <value>org.forgerock.opendj.maven.testng.OpenDJTestListener</value> <value>org.forgerock.testng.ForgeRockTestListener</value> </property> </properties> </configuration> @@ -168,17 +173,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <show>protected</show> <quiet>true</quiet> <excludePackageNames>com.*</excludePackageNames> <links> <link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link> </links> </configuration> <executions> <execution> <goals> <goal>jar</goal> </goals> </execution> </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -193,49 +191,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>2.8</version> <dependencies> <dependency> <groupId>org.forgerock.opendj</groupId> <artifactId>opendj-build-tools</artifactId> <version>${project.version}</version> </dependency> </dependencies> <executions> <execution> <id>process-classes</id> <configuration> <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> </configuration> <phase>process-classes</phase> <goals> <goal>checkstyle</goal> </goals> </execution> <execution> <id>process-test-classes</id> <configuration> <sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory> <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> </configuration> <phase>process-test-classes</phase> <goals> <goal>checkstyle</goal> </goals> </execution> </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <configuration> <locales>en</locales>