From fc05ead2464e5708e39d3cb3c5d5b7fc73ac947f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 23 May 2013 13:16:11 +0000
Subject: [PATCH] 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
---
opends/build.xml | 27 ---------------------------
opends/resource/mac/Uninstall.app/Contents/Info.plist | 3 ++-
opends/resource/mac/ControlPanel.app/Contents/Info.plist | 3 ++-
opends/resource/mac/QuickSetup.app/Contents/Info.plist | 3 ++-
4 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index d862db4..9c9d090 100644
--- a/opends/build.xml
+++ b/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="</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. -->
<target name="package" depends="prepackage"
description="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 3e47a2e..f7e18f3 100644
--- a/opends/resource/mac/ControlPanel.app/Contents/Info.plist
+++ b/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>
diff --git a/opends/resource/mac/QuickSetup.app/Contents/Info.plist b/opends/resource/mac/QuickSetup.app/Contents/Info.plist
index d7882f6..3261fb5 100644
--- a/opends/resource/mac/QuickSetup.app/Contents/Info.plist
+++ b/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>
diff --git a/opends/resource/mac/Uninstall.app/Contents/Info.plist b/opends/resource/mac/Uninstall.app/Contents/Info.plist
index 8486a01..97c2b6b 100644
--- a/opends/resource/mac/Uninstall.app/Contents/Info.plist
+++ b/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>
--
Gitblit v1.10.0