QPID-1500 : Add Mac OS X Management Console Build

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@722666 13f79535-47bb-0310-9956-ffa450edef68

19 files changed, 254 insertions, 5 deletions

diff --git a/java/build.deps b/java/build.deps
index 9c1f09ee5e..6d0dd1eeb4 100644
--- a/java/build.deps
+++ b/java/build.deps
@@ -67,10 +67,12 @@ ecl-help=lib/org.eclipse.help_3.2.0.jar
 ecl-osgi=lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar
 ecl-swt=lib/org.eclipse.swt_3.4.1.v3449c.jar
 ecl-swt-win32-win32-x86=lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar
+ecl-unix-shared=lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
 ecl-swt-linux-gtk-x86=lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar \
-  lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/ \
-  lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
-
+  lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/*
+ecl-swt-macosx=lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar \
+  lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/*
+  
 ecl-ui=lib/org.eclipse.ui_3.2.0.jar
 ecl-ui-forms=lib/org.eclipse.ui.forms_3.2.0.jar
 ecl-ui-workbench=lib/org.eclipse.ui.workbench_3.2.1.jar
@@ -83,9 +85,10 @@ management-eclipse-plugin.core-libs=${ibm-icu} ${ecl-core-jface} \
     ${ecl-swt} ${ecl-ui} ${ecl-ui-forms} ${ecl-ui-workbench}
     
 management-eclipse-plugin-win32-win32-x86.libs=${management-eclipse-plugin.core-libs} ${ecl-swt-win32-win32-x86}
-management-eclipse-plugin-linux-gtk-x86.libs=${management-eclipse-plugin.core-libs} ${ecl-swt-linux-gtk-x86}
+management-eclipse-plugin-linux-gtk-x86.libs=${management-eclipse-plugin.core-libs} ${ecl-unix-shared} ${ecl-swt-linux-gtk-x86}
+management-eclipse-plugin-macosx.libs=${management-eclipse-plugin.core-libs} ${ecl-unix-shared} ${ecl-swt-macosx} 
 
-management-eclipse-plugin.libs=${management-eclipse-plugin.core-libs} ${ecl-swt-win32-win32-x86} ${ecl-swt-linux-gtk-x86}
+management-eclipse-plugin.libs=${management-eclipse-plugin.core-libs} ${ecl-swt-win32-win32-x86} ${ecl-swt-linux-gtk-x86} ${ecl-swt-macosx}
     
 management-tools-qpid-cli.libs=${common.libs} ${jline}
 
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
new file mode 100644
index 0000000000..29e6f3e7a0
--- /dev/null
+++ b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
new file mode 100644
index 0000000000..1d2eece149
--- /dev/null
+++ b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
@@ -0,0 +1,17 @@
+Signature-Version: 1.0

+SHA1-Digest-Manifest: FheFhPCFIe9e17dtN19PvFpfHzs=

+Created-By: 1.5.0 (IBM Corporation)

+SHA1-Digest-Manifest-Main-Attributes: X4gDjCpbD8vwxPcCNeLjJjIHBoU=

+

+Name: about.html

+SHA1-Digest: xGcp/Hbq/ywyvVWkPzD/2vkIzdY=

+

+Name: eclipse_1115.so

+SHA1-Digest: ItFKEUKn9bCxLiWwFj8ubKbopDg=

+

+Name: META-INF/eclipse.inf

+SHA1-Digest: SAqY+5ITAL0mkdYeijlSRhyIaZk=

+

+Name: launcher.carbon.macosx.properties

+SHA1-Digest: iJiwtqN46CqxjQPiFqskiJDS2hk=

+

diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..f9ef43c43a
--- /dev/null
+++ b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0

+Bundle-SymbolicName: org.eclipse.equinox.launcher.carbon.macosx;single

+ ton:=true

+Bundle-ManifestVersion: 2

+Bundle-Localization: launcher.carbon.macosx

+Bundle-Name: %pluginName

+Eclipse-PlatformFilter: (& (osgi.ws=carbon) (osgi.os=macosx) (|(osgi.a

+ rch=x86)(osgi.arch=ppc)) )

+Bundle-Version: 1.0.101.R34x_v20080731

+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1

+ .0)"

+Bundle-Vendor: %providerName

+

+Name: eclipse_1115.so

+SHA1-Digest: RRLhb5Prci79GCZFsylKadyPBvM=

+

+Name: about.html

+SHA1-Digest: a9lDHrGuLPkvHBUhsqWU+V2mhPw=

+

+Name: META-INF/eclipse.inf

+SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=

+

+Name: launcher.carbon.macosx.properties

+SHA1-Digest: L4VSSU2M0KAWyhCp8QBLMsnC6Jk=

+

diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/eclipse.inf b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/eclipse.inf
new file mode 100644
index 0000000000..7864d3c4c3
--- /dev/null
+++ b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/eclipse.inf
@@ -0,0 +1,3 @@
+#Processed using Jarprocessor
+pack200.args = -E4
+pack200.conditioned = true
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/about.html b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/about.html
new file mode 100644
index 0000000000..395df3ba90
--- /dev/null
+++ b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  
+Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor&rsquo;s license 
+that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/eclipse_1115.so b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/eclipse_1115.so
new file mode 100644
index 0000000000..17e8230b19
--- /dev/null
+++ b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/eclipse_1115.so
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/launcher.carbon.macosx.properties b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/launcher.carbon.macosx.properties
new file mode 100644
index 0000000000..4373d35790
--- /dev/null
+++ b/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/launcher.carbon.macosx.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2007 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+pluginName = Equinox Launcher MacOSX Fragment
+providerName = Eclipse.org
diff --git a/java/lib/org.eclipse.jdt.launching.macosx_3.1.100.v20080422.jar b/java/lib/org.eclipse.jdt.launching.macosx_3.1.100.v20080422.jar
new file mode 100644
index 0000000000..26764dcfe7
--- /dev/null
+++ b/java/lib/org.eclipse.jdt.launching.macosx_3.1.100.v20080422.jar
diff --git a/java/lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar b/java/lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar
new file mode 100644
index 0000000000..d64249df6a
--- /dev/null
+++ b/java/lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar
diff --git a/java/management/eclipse-plugin/build-release-macosx.properties b/java/management/eclipse-plugin/build-release-macosx.properties
new file mode 100644
index 0000000000..05790e93c7
--- /dev/null
+++ b/java/management/eclipse-plugin/build-release-macosx.properties
@@ -0,0 +1,19 @@
+application.name=Qpid Management Console
+
+application.dir=${application.name}.app
+
+release.name=${module.namever}-macosx
+
+release.subdir=${module.release.base}/${release.name}
+
+release.zip=${module.release.base}/${release.name}.zip
+
+rcp.libs=${management-eclipse-plugin-macosx.libs}
+
+rcp.configuration.dir=src/main/resources/macosx/Configuration
+
+eclipse.ini=src/main/resources/macosx/eclipse.ini
+bin.includes=src/main/resources/macosx/eclipse
+
+eclipse.icns=src/main/resources/icons/Console.icns
+macosx.plist=src/main/resources/macosx/Info.plist
diff --git a/java/management/eclipse-plugin/build-release-macosx.xml b/java/management/eclipse-plugin/build-release-macosx.xml
new file mode 100644
index 0000000000..4a51ab5727
--- /dev/null
+++ b/java/management/eclipse-plugin/build-release-macosx.xml
@@ -0,0 +1,91 @@
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements.  See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership.  The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License.  You may obtain a copy of the License at
+ - 
+ -   http://www.apache.org/licenses/LICENSE-2.0
+ - 
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied.  See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+ -->
+<project name="Eclipse Plugin Binary Release" default="release-bin">
+
+   <import file="build-release.xml"/>
+
+   <property name="release.app" value="${release.subdir}/${application.dir}"/>
+
+   <target name="release-bin-mcplugin-jar">
+   	<jar destfile="${release.app}/plugins/${mcplugin.filename}.jar" basedir="${mcplugin.contents.dir}" manifest="${mcplugin.manifest}"/>
+   </target>
+
+   <target name="release-bin-jmxremote-plugin">
+       <!-- Copy the jmxremote.sasl plugin's manifest, creating its plugin directory -->
+       <copy todir="${release.app}/plugins/jmxremote.sasl_1.0.1/META-INF" flatten="true" failonerror="true">
+           <fileset file="${jmxremote.sasl.manifest}"/>
+       </copy>
+   </target>
+
+
+   <target name="release-bin-rcp-deps" description="copy eclipse-rcp dependencies into module release" 
+       depends="copy-executable">    	
+       
+       <!-- Copy remaining Eclipse binary and start-up files -->
+       <copy todir="${release.app}/Contents/MacOS" flatten="true" failonerror="true">
+           <fileset file="${eclipse.ini}"/>
+           <fileset file="${bin.includes}"/>
+       </copy>
+
+       <chmod dir="${release.app}/Contents/MacOS" perm="u+rx" includes="**/*"/>
+
+       <!-- Copy MacOS plist file -->
+       <copy todir="${release.app}/Contents" flatten="true" failonerror="true">
+           <fileset file="${macosx.plist}"/>
+       </copy>
+
+       <!-- Copy remaining Eclipse binary and start-up files -->
+       <copy todir="${release.app}/Contents/Resources" flatten="true" failonerror="true">
+           <fileset file="${eclipse.icns}"/>
+       </copy>
+
+       <!-- Copy License file -->
+       <copy todir="${release.app}" flatten="true" failonerror="true">
+           <fileset file="${license.eclipse.txt}"/>
+       </copy>
+
+       <!-- Copy the eclipse rcp module libs -->
+       <copy todir="${release.app}/plugins" failonerror="true">
+           <fileset dir="${project.root}" includes="${rcp.libs}"/>
+           <globmapper from="lib/*" to="*"/>
+       </copy>
+
+       <!-- Copy the relevant configuration dir -->
+       <copy todir="${release.app}/Configuration" failonerror="true">
+           <fileset dir="${rcp.configuration.dir}"/>
+       </copy>
+       <chmod dir="${release.app}/Configuration" perm="ugo+r" includes="**/*"/>
+   </target>
+
+    <target name="release-bin-zip" if="release.zip" description="build mc zip archive">
+
+        <zip destfile="${release.zip}">
+            <zipfileset dir="${release.subdir}" filemode="755">
+                <include name="${application.dir}/Contents/MacOS/**"/>
+            </zipfileset>
+
+            <zipfileset dir="${release.subdir}" filemode="644" dirmode="755">
+                <exclude name="${application.dir}/Contents/MacOS/**"/>
+            </zipfileset>
+        </zip>
+    </target>    		
+
+</project>
diff --git a/java/management/eclipse-plugin/build.xml b/java/management/eclipse-plugin/build.xml
index 5cfd13f2a5..2c36e79823 100644
--- a/java/management/eclipse-plugin/build.xml
+++ b/java/management/eclipse-plugin/build.xml
@@ -72,6 +72,12 @@
             <property file="build-release-linux-gtk-x86.properties"/>
             <property file="build-release-common.properties"/>
         </ant>
+        <!-- mac os x -->
+        <ant antfile="build-release-macosx.xml">
+            <property file="build-release-macosx.properties"/>
+            <property file="build-release-common.properties"/>
+        </ant>
+
         <!-- win32 win32 x86 -->
         <ant antfile="build-release.xml">
             <property file="build-release-win32-win32-x86.properties"/>
diff --git a/java/management/eclipse-plugin/src/main/resources/icons/Console.icns b/java/management/eclipse-plugin/src/main/resources/icons/Console.icns
new file mode 100644
index 0000000000..610976efab
--- /dev/null
+++ b/java/management/eclipse-plugin/src/main/resources/icons/Console.icns
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/.DS_Store b/java/management/eclipse-plugin/src/main/resources/macosx/.DS_Store
new file mode 100644
index 0000000000..e1bfe3a524
--- /dev/null
+++ b/java/management/eclipse-plugin/src/main/resources/macosx/.DS_Store
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/.DS_Store b/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/.DS_Store
new file mode 100644
index 0000000000..5008ddfcf5
--- /dev/null
+++ b/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/.DS_Store
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Info.plist b/java/management/eclipse-plugin/src/main/resources/macosx/Info.plist
new file mode 100644
index 0000000000..77f79a2944
--- /dev/null
+++ b/java/management/eclipse-plugin/src/main/resources/macosx/Info.plist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>eclipse</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Apache Qpid Management Console for Mac OS X</string>
+	<key>CFBundleIconFile</key>
+	<string>Console.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.apache.qpid.management.ui</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Qpid Management Console</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>3.4</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>3.4</string>
+	<key>Qpid Management Console</key>
+	<array>
+		<string>-consoleLog</string>
+		<string>-showlocation</string>
+	</array>
+</dict>
+</plist>
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/eclipse b/java/management/eclipse-plugin/src/main/resources/macosx/eclipse
new file mode 100755
index 0000000000..36247a08e4
--- /dev/null
+++ b/java/management/eclipse-plugin/src/main/resources/macosx/eclipse
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/eclipse.ini b/java/management/eclipse-plugin/src/main/resources/macosx/eclipse.ini
new file mode 100644
index 0000000000..d3c2505730
--- /dev/null
+++ b/java/management/eclipse-plugin/src/main/resources/macosx/eclipse.ini
@@ -0,0 +1,14 @@
+-showsplash
+org.eclipse.platform
+-startup
+../../plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
+--launcher.library
+../../plugins/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731
+-vmargs
+#-Xdock:icon=../Resources/Eclipse.icns
+-XstartOnFirstThread
+-Xms40m
+-Xmx512m
+-XX:MaxPermSize=256m
+-Dosgi.requiredJavaVersion=1.5
+-Dorg.eclipse.swt.internal.carbon.smallFonts