external-software/github_OpenIdentityPlatform_OpenDJ.git

parent: afdb4ed6 | patch | commit | ignore whitespace

OPENDJ-844 (CR-1527) Patches don't affect ControlPanel.app

Jean-Noel Rouvignac

10.19.2013 4f7c39b4ffccb12e9ae9f8a70db359216f8115c8

OPENDJ-844 (CR-1527) Patches don't affect ControlPanel.app

build.xml:
Added code to automatically append the classpath entries to the **/Info.plist files for MacOS X. This includes the classes directory and all the jars too.

Info.plist:
Removed hardcoded paths.
Added classes directory first in the classpath to allow patches to work.

4 files modified

	opends/build.xml	34 ●●●●● patch \| view \| raw \| blame \| history
	opends/resource/mac/ControlPanel.app/Contents/Info.plist	19 ●●●●● patch \| view \| raw \| blame \| history
	opends/resource/mac/QuickSetup.app/Contents/Info.plist	19 ●●●●● patch \| view \| raw \| blame \| history
	opends/resource/mac/Uninstall.app/Contents/Info.plist	18 ●●●●● patch \| view \| raw \| blame \| history

 opends/build.xml

@@ -178,6 +178,7 @@
  <property name="snmp.classes.dir"
            location="${classes.dir}/org/opends/server/snmp" />

  <!-- sort-of Maven like properties for opendj dependencies-->
  <fileset id="opendj.runtime.jars" dir="${lib.dir}">
    <include name="**/jar/*.jar" />
    <include name="**/bundle/*.jar" />
@@ -1214,16 +1215,41 @@
    </chmod>

    <chmod perm="755">
      <fileset dir="${pdir}/bin">
      </fileset>
      <fileset dir="${pdir}/bin" />
    </chmod>
    <chmod file="${pdir}/lib/_client-script.sh" perm="755" />
    <chmod file="${pdir}/lib/_server-script.sh" perm="755" />
    <chmod file="${pdir}/lib/_mixed-script.sh" perm="755" />
    <chmod file="${pdir}/lib/_script-util.sh" perm="755" />
    <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>
  </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. -->

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

@@ -31,22 +31,9 @@
        <key>JVMVersion</key>
        <string>1.6+</string>
        <key>ClassPath</key>
            <array>
            <string>$JAVAROOT/../../../../../lib/OpenDJ.jar</string>
            <string>$JAVAROOT/../../../../../lib/activation.jar</string>
            <string>$JAVAROOT/../../../../../lib/je.jar</string>
            <string>$JAVAROOT/../../../../../lib/mail.jar</string>
            <string>$JAVAROOT/../../../../../lib/quicksetup.jar</string>
            <string>$JAVAROOT/../../../../../lib/OpenDJ_ca_ES.jar</string>
            <string>$JAVAROOT/../../../../../lib/OpenDJ_de.jar</string>
            <string>$JAVAROOT/../../../../../lib/OpenDJ_es.jar</string>
            <string>$JAVAROOT/../../../../../lib/OpenDJ_fr.jar</string>
            <string>$JAVAROOT/../../../../../lib/OpenDJ_ja.jar</string>
            <string>$JAVAROOT/../../../../../lib/OpenDJ_ko.jar</string>
            <string>$JAVAROOT/../../../../../lib/OpenDJ_pl.jar</string>
            <string>$JAVAROOT/../../../../../lib/OpenDJ_zh_CN.jar</string>
            <string>$JAVAROOT/../../../../../lib/OpenDJ_zh_TW.jar</string>
            </array>
        <array>
<string>$JAVAROOT/../../../../../classes</string>
        </array>
    </dict>
    <key>NSHighResolutionCapable</key>
    <true/>

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

@@ -31,22 +31,9 @@
        <key>JVMVersion</key>
        <string>1.6+</string>
        <key>ClassPath</key>
            <array>
            <string>$JAVAROOT/../../../../lib/OpenDJ.jar</string>
            <string>$JAVAROOT/../../../../lib/activation.jar</string>
            <string>$JAVAROOT/../../../../lib/je.jar</string>
            <string>$JAVAROOT/../../../../lib/mail.jar</string>
            <string>$JAVAROOT/../../../../lib/quicksetup.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_ca_ES.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_de.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_es.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_fr.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_ja.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_ko.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_pl.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_zh_CN.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_zh_TW.jar</string>
            </array>
        <array>
<string>$JAVAROOT/../../../../classes</string>
        </array>
    </dict>
    <key>NSHighResolutionCapable</key>
    <true/>

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

@@ -31,21 +31,9 @@
        <key>JVMVersion</key>
        <string>1.6+</string>
        <key>ClassPath</key>
            <array>
            <string>$JAVAROOT/../../../../lib/OpenDJ.jar</string>
            <string>$JAVAROOT/../../../../lib/activation.jar</string>
            <string>$JAVAROOT/../../../../lib/je.jar</string>
            <string>$JAVAROOT/../../../../lib/mail.jar</string>
            <string>$JAVAROOT/../../../../lib/quicksetup.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_ca_ES.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_de.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_es.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_fr.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_ja.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_pl.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_zh_CN.jar</string>
            <string>$JAVAROOT/../../../../lib/OpenDJ_zh_TW.jar</string>
            </array>
        <array>
<string>$JAVAROOT/../../../../classes</string>
        </array>
    </dict>
    <key>NSHighResolutionCapable</key>
    <true/>

			@@ -178,6 +178,7 @@
			<property name="snmp.classes.dir"
			location="${classes.dir}/org/opends/server/snmp" />

			<!-- sort-of Maven like properties for opendj dependencies-->
			<fileset id="opendj.runtime.jars" dir="${lib.dir}">
			<include name="*/jar/.jar" />
			<include name="*/bundle/.jar" />
			@@ -1214,16 +1215,41 @@
			</chmod>

			<chmod perm="755">
			<fileset dir="${pdir}/bin">
			</fileset>
			<fileset dir="${pdir}/bin" />
			</chmod>
			<chmod file="${pdir}/lib/_client-script.sh" perm="755" />
			<chmod file="${pdir}/lib/_server-script.sh" perm="755" />
			<chmod file="${pdir}/lib/_mixed-script.sh" perm="755" />
			<chmod file="${pdir}/lib/_script-util.sh" perm="755" />
			<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>
			</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="</array>"
			value="<string>$JAVAROOT/../../../../../lib/${jarfile}</string>${line.separator}</array>"
			/>
			<replace file="${pdir}/QuickSetup.app/Contents/Info.plist"
			token="</array>"
			value="<string>$JAVAROOT/../../../../lib/${jarfile}</string>${line.separator}</array>"
			/>
			<replace file="${pdir}/Uninstall.app/Contents/Info.plist"
			token="</array>"
			value="<string>$JAVAROOT/../../../../lib/${jarfile}</string>${line.separator}</array>"
			/>
			</target>


			<!-- Package the Directory Server for distribution. -->

			@@ -31,22 +31,9 @@
			<key>JVMVersion</key>
			<string>1.6+</string>
			<key>ClassPath</key>
			<array>
			<string>$JAVAROOT/../../../../../lib/OpenDJ.jar</string>
			<string>$JAVAROOT/../../../../../lib/activation.jar</string>
			<string>$JAVAROOT/../../../../../lib/je.jar</string>
			<string>$JAVAROOT/../../../../../lib/mail.jar</string>
			<string>$JAVAROOT/../../../../../lib/quicksetup.jar</string>
			<string>$JAVAROOT/../../../../../lib/OpenDJ_ca_ES.jar</string>
			<string>$JAVAROOT/../../../../../lib/OpenDJ_de.jar</string>
			<string>$JAVAROOT/../../../../../lib/OpenDJ_es.jar</string>
			<string>$JAVAROOT/../../../../../lib/OpenDJ_fr.jar</string>
			<string>$JAVAROOT/../../../../../lib/OpenDJ_ja.jar</string>
			<string>$JAVAROOT/../../../../../lib/OpenDJ_ko.jar</string>
			<string>$JAVAROOT/../../../../../lib/OpenDJ_pl.jar</string>
			<string>$JAVAROOT/../../../../../lib/OpenDJ_zh_CN.jar</string>
			<string>$JAVAROOT/../../../../../lib/OpenDJ_zh_TW.jar</string>
			</array>
			<array>
			<string>$JAVAROOT/../../../../../classes</string>
			</array>
			</dict>
			<key>NSHighResolutionCapable</key>
			<true/>

			@@ -31,21 +31,9 @@
			<key>JVMVersion</key>
			<string>1.6+</string>
			<key>ClassPath</key>
			<array>
			<string>$JAVAROOT/../../../../lib/OpenDJ.jar</string>
			<string>$JAVAROOT/../../../../lib/activation.jar</string>
			<string>$JAVAROOT/../../../../lib/je.jar</string>
			<string>$JAVAROOT/../../../../lib/mail.jar</string>
			<string>$JAVAROOT/../../../../lib/quicksetup.jar</string>
			<string>$JAVAROOT/../../../../lib/OpenDJ_ca_ES.jar</string>
			<string>$JAVAROOT/../../../../lib/OpenDJ_de.jar</string>
			<string>$JAVAROOT/../../../../lib/OpenDJ_es.jar</string>
			<string>$JAVAROOT/../../../../lib/OpenDJ_fr.jar</string>
			<string>$JAVAROOT/../../../../lib/OpenDJ_ja.jar</string>
			<string>$JAVAROOT/../../../../lib/OpenDJ_pl.jar</string>
			<string>$JAVAROOT/../../../../lib/OpenDJ_zh_CN.jar</string>
			<string>$JAVAROOT/../../../../lib/OpenDJ_zh_TW.jar</string>
			</array>
			<array>
			<string>$JAVAROOT/../../../../classes</string>
			</array>
			</dict>
			<key>NSHighResolutionCapable</key>
			<true/>