The following modifications have the following goals:

jvergara

08.32.2007 ee3642c86959b44af3ff0e9fde9950a966527596

 opends/build.xml

@@ -77,13 +77,13 @@
  <property name="quicksetup.src.dir" location="src/quicksetup"       />
  <property name="quicksetup.classes.dir"
            location="${build.dir}/quicksetup/classes"                />
   <property name="quicksetup.globalcompile.classes.dir"
                  location="${classes.dir}/org/opends/quicksetup" />
  <property name="ads.src.dir" location="src/ads"       />
  <property name="ads.class.dir" location="${classes.dir}/org/opends/admin/ads"/>
  <property name="ads.classes.dir" location="${classes.dir}/org/opends/admin/ads"/>

  <!-- Properties for use with the Status Panel.                      -->
  <property name="statuspanel.src.dir" location="src/statuspanel"       />
  <property name="statuspanel.classes.dir"
            location="${build.dir}/statuspanel/classes"                />
  <!-- Properties for use with the GUI Tools that go in OpenDS jar.                      -->
     <property name="guitools.src.dir" location="src/guitools"       />

  <!-- Properties for coverage diff reports                        -->
  <property name="cvgdiff.dir" location="build/diff"                />
@@ -391,7 +391,7 @@

    <checkstyle config="${checkstyle.dir}/opends-checkstyle.xml"
         failOnViolation="true">
      <fileset dir="${statuspanel.src.dir}" includes="**/*.java" />
      <fileset dir="${guitools.src.dir}" includes="**/*.java" />
      <formatter type="plain" />
    </checkstyle>

@@ -422,7 +422,7 @@

  <!-- Compile the Directory Server source files. -->
  <target name="cleancompile"
       depends="cleaninit,compilequicksetup,weave,compilestatuspanel"
       depends="cleaninit,compilequicksetup,weave"
       description="Recompile the Directory Server source files.">
  </target>

@@ -433,7 +433,7 @@
       description="Compile the Directory Server source files.">
    <mkdir dir="${classes.dir}" />

    <javac srcdir="${src.dir}:${admin.src.dir}:${ads.src.dir}" destdir="${classes.dir}"
    <javac srcdir="${src.dir}:${admin.src.dir}:${ads.src.dir}:${quicksetup.src.dir}:${guitools.src.dir}" destdir="${classes.dir}"
         excludes="**/package-info.java"
         debug="on" debuglevel="${build.debuglevel}" source="1.5" target="1.5"
         deprecation="true" fork="true" memoryInitialSize="${MEM}"
@@ -444,11 +444,16 @@
        <fileset dir="${lib.dir}">
          <include name="*.jar" />
        </fileset>
         <fileset dir="${build.dir}/build-tools">
          <include name="build-tools.jar" />
         </fileset>
      </classpath>
    </javac>

    <copy todir="${classes.dir}">
      <fileset dir="${src.dir}" includes="**/*.properties" />
      <fileset dir="${quicksetup.src.dir}" includes="**/*.properties, **/*.gif, **/*.png" />
      <fileset dir="${guitools.src.dir}" includes="**/*.properties, **/*.gif, **/*.png" />
    </copy>
  </target>

@@ -462,7 +467,7 @@



  <target name="weave" if="weave.enabled" depends="compilestatuspanel, prepweave">
  <target name="weave" if="weave.enabled" depends="prepweave">
    <echo message="  Weaving the source code with automatic AspectJ debug logging."/>
    <echo message="  Build with -DWEAVE_ENABLED=false to turn this off."/>
    <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
@@ -530,30 +535,6 @@
  </target>



  <!-- Compile the Status Panel source files. -->
  <target name="compilestatuspanel" depends="compilequicksetup"
           description="Compile the Status Panel source files.">
    <mkdir dir="${statuspanel.classes.dir}" />
    <javac srcdir="${statuspanel.src.dir}" destdir="${statuspanel.classes.dir}"
           debug="on" debuglevel="${build.debuglevel}" source="1.5"
           target="1.5" deprecation="true" fork="true" memoryInitialSize="${MEM}"
           memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />

      <classpath>
        <pathelement path="${classes.dir}"/>
        <pathelement path="${quicksetup.classes.dir}"/>
      </classpath>
    </javac>
    <copy todir="${statuspanel.classes.dir}">
      <fileset dir="${statuspanel.src.dir}"
               includes="**/*.properties, **/*.gif, **/*.png" />
    </copy>
  </target>



  <!--
   ! Rebuild the Directory Server without destroying any existing configuration
   ! or data.  It will only overwrite the libraries, classes, and scripts, and
@@ -591,14 +572,13 @@
    <delete file="${pdir}.zip" />
    <delete dir="${quicksetup.classes.dir}" />
    <delete file="${package.dir}/lib/quicksetup.jar" />
    <delete file="${package.dir}/lib/statuspanel.jar" />

    <!-- Regenerate configuration files if necessary -->
    <antcall target="compileadmin" />

    <!-- Recreate the classes directory and recompile into it. -->
    <mkdir dir="${classes.dir}" />
    <javac srcdir="${src.dir}:${admin.src.dir}:${ads.src.dir}"
    <javac srcdir="${src.dir}:${admin.src.dir}:${ads.src.dir}:${quicksetup.src.dir}:${guitools.src.dir}"
         destdir="${classes.dir}"
         debug="on" debuglevel="${build.debuglevel}" source="1.5" target="1.5"
         deprecation="true" fork="true" memoryInitialSize="${MEM}"
@@ -609,16 +589,23 @@
        <fileset dir="${lib.dir}">
          <include name="*.jar" />
        </fileset>
         <fileset dir="${build.dir}/build-tools">
          <include name="build-tools.jar" />
         </fileset>
      </classpath>
    </javac>

    <copy todir="${classes.dir}">
      <fileset dir="${src.dir}" includes="**/*.properties" />
      <fileset dir="${quicksetup.src.dir}" includes="**/*.properties, **/*.gif, **/*.png" />
      <fileset dir="${guitools.src.dir}" includes="**/*.properties, **/*.gif, **/*.png" />
    </copy>

    <!-- Generate the OpenDS.jar file -->
    <jar jarfile="${pdir}/lib/${SHORT_NAME}.jar"
         basedir="${classes.dir}" compress="true" index="true" />
         basedir="${classes.dir}"
        excludes="${ads.classes.dir}, ${quicksetup.globalcompile.classes.dir}"
          compress="true" index="true" />

    <!-- Recreate the quicksetup classes directory and recompile into it. -->
    <mkdir dir="${quicksetup.classes.dir}" />
@@ -668,29 +655,6 @@
    <jar jarfile="${pdir}/lib/quicksetup.jar"
         basedir="${quicksetup.classes.dir}" compress="true" index="true" />

    <!-- Recreate the statuspanel classes directory and recompile into it. -->
    <mkdir dir="${statuspanel.classes.dir}" />
    <javac srcdir="${statuspanel.src.dir}" destdir="${statuspanel.classes.dir}"
        debug="on" debuglevel="${build.debuglevel}" source="1.5" target="1.5"
        deprecation="true" fork="true" memoryInitialSize="${MEM}"
        memoryMaximumSize="${MEM}">
      <compilerarg value="-Xlint:all" />
      <classpath>
        <fileset dir="${pdir}/lib">
          <include name="${SHORT_NAME}.jar" />
        </fileset>
      </classpath>
    </javac>

    <copy todir="${statuspanel.classes.dir}">
      <fileset dir="${statuspanel.src.dir}"
            includes="**/*.properties, **/*.gif, **/*.png"/>
    </copy>

    <!-- Generate the statuspanel.jar file -->
    <jar jarfile="${pdir}/lib/statuspanel.jar"
        basedir="${statuspanel.classes.dir}" compress="true" index="true" />

    <!-- Regenerate example plugin. -->
    <antcall target="example-plugin" />
  </target>
@@ -724,16 +688,14 @@
    <mkdir dir="${pdir}/locks"           />
    <mkdir dir="${pdir}/logs"            />

    <delete dir="${ads.class.dir}"       />
    <jar jarfile="${pdir}/lib/${SHORT_NAME}.jar"
         basedir="${classes.dir}" compress="true" index="true" />
         basedir="${classes.dir}" 
          excludes="${ads.classes.dir}, ${quicksetup.globalcompile.classes.dir}"    
        compress="true" index="true" />

    <jar jarfile="${pdir}/lib/quicksetup.jar"
         basedir="${quicksetup.classes.dir}" compress="true" index="true" />

    <jar jarfile="${pdir}/lib/statuspanel.jar"
           basedir="${statuspanel.classes.dir}" compress="true" index="true" />

    <copy todir="${pdir}/lib">
      <fileset file="${lib.dir}/*.jar" />
    </copy>
@@ -1624,7 +1586,7 @@
           dirmode="755" />
      <zipfileset dir="${quicksetup.src.dir}" excludes="**/.svn" filemode="644"
           dirmode="755" />
      <zipfileset dir="${statuspanel.src.dir}" excludes="**/.svn" filemode="644"
      <zipfileset dir="${guitools.src.dir}" excludes="**/.svn" filemode="644"
           dirmode="755" />
    </zip>
  </target>