From 5e5acc733bf20faa22d4e9be582f555bbda0867b Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@gmail.com>
Date: Thu, 29 Oct 2015 09:10:13 +0000
Subject: [PATCH] First set of changes to fix OPENDJ-2197. Replace the JavaApplicationStub binary with universalJavaApplicationStub (script), and adjust the PList accordingly. Updated 3rd party license file.
---
opendj-server-legacy/build.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/build.xml b/opendj-server-legacy/build.xml
index 995f0df..e6ef3d7 100644
--- a/opendj-server-legacy/build.xml
+++ b/opendj-server-legacy/build.xml
@@ -1288,7 +1288,7 @@
value="${REVISION_NUMBER}"/>
<chmod perm="755">
<fileset dir="${pdir}">
- <include name="QuickSetup.app/Contents/MacOS/JavaApplicationStub" />
+ <include name="QuickSetup.app/Contents/MacOS/universalJavaApplicationStub" />
</fileset>
</chmod>
<copy todir="${pdir}/Uninstall.app">
@@ -1302,7 +1302,7 @@
value="${REVISION_NUMBER}"/>
<chmod perm="755">
<fileset dir="${pdir}">
- <include name="Uninstall.app/Contents/MacOS/JavaApplicationStub" />
+ <include name="Uninstall.app/Contents/MacOS/universalJavaApplicationStub" />
</fileset>
</chmod>
<copy todir="${pdir}/bin/ControlPanel.app">
@@ -1316,7 +1316,7 @@
value="${REVISION_NUMBER}"/>
<chmod perm="755">
<fileset dir="${pdir}/bin">
- <include name="ControlPanel.app/Contents/MacOS/JavaApplicationStub" />
+ <include name="ControlPanel.app/Contents/MacOS/universalJavaApplicationStub" />
</fileset>
</chmod>
@@ -1339,14 +1339,14 @@
description="Package the Directory Server for distribution.">
<zip destfile="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}.zip">
<zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="**/*"
- excludes="bin/*,template/**/*,lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh,setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/JavaApplicationStub,Uninstall.app/Contents/MacOS/JavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub"
+ excludes="bin/*,template/**/*,lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh,setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/universalJavaApplicationStub,Uninstall.app/Contents/MacOS/universalJavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/universalJavaApplicationStub"
filemode="644" dirmode="755" prefix="opendj" />
<zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}"
includes="lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh"
filemode="755" dirmode="755" prefix="opendj" />
<zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="bin/*"
filemode="755" dirmode="755" prefix="opendj" />
- <zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/JavaApplicationStub,Uninstall.app/Contents/MacOS/JavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub"
+ <zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/universalJavaApplicationStub,Uninstall.app/Contents/MacOS/universalJavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/universalJavaApplicationStub"
filemode="755" dirmode="755" prefix="opendj" />
<zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="template/**/*"
filemode="444" dirmode="744" prefix="opendj" />
--
Gitblit v1.10.0