- add missing nodetach in run-server and nb-debug-server targets. - enable ...

abobrov

24.47.2007 39aaef958dd55f55de27cebc833210db5d7e7822

- add missing nodetach in run-server and nb-debug-server targets.
- enable debug in nb-debug-server target.
- add new nb-profile-server target for one click server profiling from NetBeans.
- fix formatting and trailing spaces.

 opendj-sdk/opends/build.xml

@@ -1065,11 +1065,10 @@
  </target>


  <!-- Internal target to run directly the Directory Server. -->
  <!-- Internal target to run the Directory Server directly. -->
  <target name="run-server" depends="dynamicconstants">
          <!-- Set properties needed to find the packaged files -->
      <property name="pdir"
                location="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" />
    <property name="pdir" location="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}"/>
    <java fork="true" classname="org.opends.server.core.DirectoryServer" failonerror="true">
      <classpath>
        <fileset dir="${lib.dir}">
@@ -1082,14 +1081,14 @@
      <jvmarg  value="-Dorg.opends.server.ServerRoot=${pdir}" />
      <arg value="--configClass=org.opends.server.extensions.ConfigFileHandler"/>
      <arg value="--configFile=${pdir}/config/config.ldif"/>
      <arg value="--nodetach"/>
    </java>      
  </target>
  
  <!-- Netbeans target to debug the DS server. -->
  <!-- Netbeans target to debug the Directory Server. -->
  <target name="nb-debug-server" depends="dynamicconstants">
    <!-- Set properties needed to find the packaged files -->
    <property name="pdir"
              location="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" />
    <property name="pdir" location="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}"/>
    <path id="cp">
      <fileset dir="${lib.dir}">
        <include name="*.jar" />
@@ -1106,8 +1105,41 @@
      <jvmarg  value="-Dorg.opends.server.BuildRoot=${pdir}" />
      <jvmarg  value="-Dorg.opends.server.scriptName=start-ds" />
      <jvmarg  value="-Dorg.opends.server.ServerRoot=${pdir}" />
      <jvmarg value="-Dorg.opends.server.debug.enabled=true"/>
      <arg value="--configClass=org.opends.server.extensions.ConfigFileHandler"/>
      <arg value="--configFile=${pdir}/config/config.ldif"/>     
      <arg value="--nodetach"/>
    </java>
  </target>

  <!-- Netbeans target to profile the Directory Server. -->
  <target name="nb-profile-server" depends="dynamicconstants">
    <!-- Set properties needed to find the packaged files -->
    <property name="pdir" location="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}"/>
    <path id="cp">
      <fileset dir="${lib.dir}">
        <include name="*.jar"/>
      </fileset>
      <dirset dir="${classes.dir}"/>
    </path>
    <nbprofiledirect>
      <classpath refid="cp"/>
    </nbprofiledirect>
    <java fork="true" classname="org.opends.server.core.DirectoryServer"
      jvm="${profiler.info.jvm}">
      <classpath>
        <fileset dir="${lib.dir}">
          <include name="*.jar"/>
        </fileset>
        <dirset dir="${classes.dir}"/>
      </classpath>
      <jvmarg value="${profiler.info.jvmargs.agent}"/>
      <jvmarg value="-Dorg.opends.server.BuildRoot=${pdir}"/>
      <jvmarg value="-Dorg.opends.server.scriptName=start-ds"/>
      <jvmarg value="-Dorg.opends.server.ServerRoot=${pdir}"/>
      <arg value="--configClass=org.opends.server.extensions.ConfigFileHandler"/>
      <arg value="--configFile=${pdir}/config/config.ldif"/>
      <arg value="--nodetach"/>
    </java>
  </target>