mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noel Rouvignac
12.34.2013 c6036507479b5bf58ad95dcb158218f6076fb436
Fix build in Jenkins.

Code review: Matthew Swift

build.xml:
Removed special checks checkstyle for org.opends.server.api, org.opends.server.protocols.internal, org.opends.server.types packages. Matt said they were added to ease embedding code into the docs, but this never happened, so this feature is basically dead.
Extracted property named "buildtools.jar"

opends-doctarget-checkstyle.xml: REMOVED
1 files deleted
1 files modified
52 ■■■■■ changed files
opends/build.xml 17 ●●●● patch | view | raw | blame | history
opends/ext/checkstyle/opends-doctarget-checkstyle.xml 35 ●●●●● patch | view | raw | blame | history
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. -->
opends/ext/checkstyle/opends-doctarget-checkstyle.xml
File was deleted