From 4f7c39b4ffccb12e9ae9f8a70db359216f8115c8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 10 Apr 2013 07:19:59 +0000
Subject: [PATCH] OPENDJ-844 (CR-1527) Patches don't affect ControlPanel.app
---
opends/build.xml | 34 +++++++++++++++--
opends/resource/mac/Uninstall.app/Contents/Info.plist | 18 +-------
opends/resource/mac/ControlPanel.app/Contents/Info.plist | 19 +--------
opends/resource/mac/QuickSetup.app/Contents/Info.plist | 19 +--------
4 files changed, 39 insertions(+), 51 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 155e092..8234aca 100644
--- a/opends/build.xml
+++ b/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="</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. -->
diff --git a/opends/resource/mac/ControlPanel.app/Contents/Info.plist b/opends/resource/mac/ControlPanel.app/Contents/Info.plist
index e92e52d..3e47a2e 100644
--- a/opends/resource/mac/ControlPanel.app/Contents/Info.plist
+++ b/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/>
diff --git a/opends/resource/mac/QuickSetup.app/Contents/Info.plist b/opends/resource/mac/QuickSetup.app/Contents/Info.plist
index e9c39d1..d7882f6 100644
--- a/opends/resource/mac/QuickSetup.app/Contents/Info.plist
+++ b/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/>
diff --git a/opends/resource/mac/Uninstall.app/Contents/Info.plist b/opends/resource/mac/Uninstall.app/Contents/Info.plist
index cf9512f..8486a01 100644
--- a/opends/resource/mac/Uninstall.app/Contents/Info.plist
+++ b/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/>
--
Gitblit v1.10.0