OPENDJ-844 Patches don't affect ControlPanel.app OPENDJ-842 On Windows, the...

Jean-Noel Rouvignac

23.16.2013 fc05ead2464e5708e39d3cb3c5d5b7fc73ac947f

OPENDJ-844 Patches don't affect ControlPanel.app
OPENDJ-842 On Windows, the setup command hangs when the length of the install path is too long


Code review and initial idea: violette


Now that the application starts with the single bootstrap jar, MacOS X can take advantage of this by referencing it statically in the plist files. In other words, it is no longer necessary to build the plist files dynamically.


Info.plist:
Hardcoded the path to bootstrap.jar

build.xml:
Removed the code that appended the jars to the **/Info.plist files for MacOS X.

 opends/build.xml

@@ -1243,39 +1243,12 @@
    <chmod file="${pdir}/lib/_mixed-script.sh"  perm="755" />
    <chmod file="${pdir}/lib/_script-util.sh"   perm="755" />

    <!-- Append all the claspath entries to the plist files for MacOS -->
    <taskdef name="foreach" classname="net.sf.antcontrib.logic.ForEach" classpath="${ant.lib.dir}/ant-contrib-1.0b3.jar" />
    <foreach target="append-jar-to-plist-file" param="classpath.entry" inheritall="true">
      <path>
        <fileset dir="${pdir}/lib">
          <include name="*.jar" />
        </fileset>
      </path>
    </foreach>
    <chmod perm="444">
      <fileset dir="${pdir}/template" />
    </chmod>
  </target>


  <target name="append-jar-to-plist-file">
    <basename property="jarfile" file="${classpath.entry}" />
    <echo message="appending ${jarfile}" />
    <replace file="${pdir}/bin/ControlPanel.app/Contents/Info.plist"
             token="&lt;/array&gt;"
             value="&lt;string&gt;$JAVAROOT/../../../../../lib/${jarfile}&lt;/string&gt;${line.separator}&lt;/array&gt;"
    />
    <replace file="${pdir}/QuickSetup.app/Contents/Info.plist"
             token="&lt;/array&gt;"
             value="&lt;string&gt;$JAVAROOT/../../../../lib/${jarfile}&lt;/string&gt;${line.separator}&lt;/array&gt;"
    />
    <replace file="${pdir}/Uninstall.app/Contents/Info.plist"
             token="&lt;/array&gt;"
             value="&lt;string&gt;$JAVAROOT/../../../../lib/${jarfile}&lt;/string&gt;${line.separator}&lt;/array&gt;"
    />
  </target>


  <!-- Package the Directory Server for distribution. -->
  <target name="package" depends="prepackage"
       description="Package the Directory Server for distribution.">

 opends/resource/mac/ControlPanel.app/Contents/Info.plist

@@ -32,7 +32,8 @@
        <string>1.6+</string>
        <key>ClassPath</key>
        <array>
<string>$JAVAROOT/../../../../../classes</string>
            <string>$JAVAROOT/../../../../../classes</string>
            <string>$JAVAROOT/../../../../../lib/bootstrap.jar</string>
        </array>
    </dict>
    <key>NSHighResolutionCapable</key>

 opends/resource/mac/QuickSetup.app/Contents/Info.plist

@@ -32,7 +32,8 @@
        <string>1.6+</string>
        <key>ClassPath</key>
        <array>
<string>$JAVAROOT/../../../../classes</string>
            <string>$JAVAROOT/../../../../classes</string>
            <string>$JAVAROOT/../../../../lib/bootstrap.jar</string>
        </array>
    </dict>
    <key>NSHighResolutionCapable</key>

 opends/resource/mac/Uninstall.app/Contents/Info.plist

@@ -32,7 +32,8 @@
        <string>1.6+</string>
        <key>ClassPath</key>
        <array>
<string>$JAVAROOT/../../../../classes</string>
            <string>$JAVAROOT/../../../../classes</string>
            <string>$JAVAROOT/../../../../lib/bootstrap.jar</string>
        </array>
    </dict>
    <key>NSHighResolutionCapable</key>