From 53a4852439e9f33e7548702eb461b6bb1a56e422 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 12 Dec 2013 13:34:15 +0000
Subject: [PATCH] Fix build in Jenkins.
---
/dev/null | 35 -----------------------------------
opendj-sdk/opends/build.xml | 17 ++++-------------
2 files changed, 4 insertions(+), 48 deletions(-)
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index 12024ac..dd8142f 100644
--- a/opendj-sdk/opends/build.xml
+++ b/opendj-sdk/opends/build.xml
@@ -72,6 +72,7 @@
<!-- Properties for build tools -->
<property name="buildtools.src.dir" location="src/build-tools" />
<property name="buildtools.classes.dir" location="${build.dir}/build-tools/classes" />
+ <property name="buildtools.jar" location="${build.dir}/build-tools/build-tools.jar" />
<!-- Properties for use in unit testing. -->
<property name="unittest.testng.dir" location="tests/unit-tests-testng"/>
@@ -713,16 +714,6 @@
<formatter type="plain" />
</checkstyle>
- <checkstyle config="${checkstyle.dir}/opends-doctarget-checkstyle.xml"
- failOnViolation="true">
- <fileset dir="${src.dir}/org/opends/server/api" includes="**/*.java" />
- <fileset dir="${src.dir}/org/opends/server/protocols/internal"
- includes="**/*.java" />
- <fileset dir="${src.dir}/org/opends/server/types"
- includes="**/*.java" excludes="**/PublicAPI.java"/>
- <formatter type="plain" />
- </checkstyle>
-
<checkstyle config="${checkstyle.dir}/opends-unittest-checkstyle.xml"
failOnViolation="true">
<fileset dir="${unittest.testng.src.dir}" includes="**/*.java" />
@@ -1939,7 +1930,7 @@
<mkdir dir="${unittest.resource.dir}" />
<typedef name="preptestng" classname="org.opends.build.tools.PrepTestNG"
- classpath="${build.dir}/build-tools/build-tools.jar" />
+ classpath="${buildtools.jar}" />
<preptestng file="${testng.dir}/testng.xml"
@@ -2474,7 +2465,7 @@
</classpath>
</javac>
- <jar jarfile="${build.dir}/build-tools/build-tools.jar"
+ <jar jarfile="${buildtools.jar}"
basedir="${buildtools.classes.dir}" compress="true" index="true" />
</target>
@@ -2669,7 +2660,7 @@
<copy todir="${plugin.temp.dir}/example-plugin/src/com/example/opends">
<fileset dir="${admin.rules.dir}/example-plugin" includes="*.java,*.xml" excludes="build.xml" />
</copy>
- <copy todir="${plugin.temp.dir}/example-plugin/lib" file="${build.dir}/build-tools/build-tools.jar" />
+ <copy todir="${plugin.temp.dir}/example-plugin/lib" file="${buildtools.jar}" />
<copy todir="${plugin.temp.dir}/example-plugin/resource/messages/com/example/opends/messages" file="${admin.rules.dir}/example-plugin/example_plugin.properties" />
<copy todir="${plugin.temp.dir}/example-plugin/resource/messages/com/example/opends/messages" file="${admin.rules.dir}/example-plugin/example_plugin_fr.properties" />
<!-- Package up the plugin in the OpenDJ package folder. -->
diff --git a/opendj-sdk/opends/ext/checkstyle/opends-doctarget-checkstyle.xml b/opendj-sdk/opends/ext/checkstyle/opends-doctarget-checkstyle.xml
deleted file mode 100644
index 7798f86..0000000
--- a/opendj-sdk/opends/ext/checkstyle/opends-doctarget-checkstyle.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-
-<module name="Checker">
- <module name="TreeWalker">
- <property name="cacheFile" value="${basedir}/.checkstyle-cache/opends-doctarget-checkstyle.cache" />
-
- <!-- Ensure that all methods (including private) are documented -->
- <module name="JavadocMethod">
- <property name="scope" value="private" />
- <property name="allowUndeclaredRTE" value="false" />
- <property name="allowMissingParamTags" value="false" />
- <property name="allowMissingJavadoc" value="false" />
- </module>
-
-
- <!-- Ensure that all Javadoc comments are well-formed -->
- <module name="JavadocStyle">
- <property name="scope" value="private" />
- <property name="checkFirstSentence" value="true" />
- <property name="checkEmptyJavadoc" value="true" />
- <property name="checkHtml" value="true" />
- </module>
-
-
- <!-- Ensure that no line exceeds 80 characters in length -->
- <module name="LineLength">
- <property name="max" value="80" />
- </module>
- </module>
-</module>
-
--
Gitblit v1.10.0