You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/01/21 18:41:47 UTC
svn commit: r736349 - in /qpid/trunk/qpid/java/management/eclipse-plugin: ./
bin/ src/main/resources/ src/main/resources/linux-gtk-x86/
src/main/resources/linux-gtk-x86/Configuration/
src/main/resources/macosx/Configuration/ src/main/resources/macosx/C...
Author: ritchiem
Date: Wed Jan 21 09:41:46 2009
New Revision: 736349
URL: http://svn.apache.org/viewvc?rev=736349&view=rev
Log:
QPID-1592 : Patch provided by Robert Gemmell to standardise launchers for management console.
Added:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so (with props)
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc (with props)
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed)
- copied unchanged from r736327, qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe (with props)
Removed:
qpid/trunk/qpid/java/management/eclipse-plugin/bin/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/startup.jar
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.exe
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.ini
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.properties
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.xml
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml
qpid/trunk/qpid/java/management/eclipse-plugin/build.xml
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties Wed Jan 21 09:41:46 2009
@@ -19,20 +19,14 @@
#
#
-artifactId=org.apache.qpid.management.ui
-mcplugin.version=0.1.0-${project.version}
-mcplugin.filename=${artifactId}_${mcplugin.version}
+artifact.id=org.apache.qpid.management.ui
+mcplugin.version=0.2.0-${project.version}
+mcplugin.filename=${artifact.id}_${mcplugin.version}
mcplugin.contents.dir=${module.classes}
mcplugin.manifest=${module.manifest}
-bin.dir=bin
-
-startup.jar=src/main/resources/startup.jar
-
-license.eclipse.txt=src/main/resources/license.eclipse.txt
-
jmxremote.sasl.manifest=src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF
qpidmanagementcommon.manifest=src/main/resources/qpid-management-common-plugin/MANIFEST.MF
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties Wed Jan 21 09:41:46 2009
@@ -25,10 +25,12 @@
release.tar.gz=${module.release.base}/${release.name}.tar.gz
-eclipse.ini=src/main/resources/linux-gtk-x86/eclipse.ini
+qpidmc.ini=src/main/resources/linux-gtk-x86/qpidmc.ini
-rcp.libs=${management-eclipse-plugin-linux-gtk-x86.libs}
+qpidmc.executable=src/main/resources/linux-gtk-x86/qpidmc
+qpidmc.companion.library=src/main/resources/linux-gtk-x86/libcairo-swt.so
+
+rcp.libs=${management-eclipse-plugin-linux-gtk-x86.libs}
+
rcp.configuration.dir=src/main/resources/linux-gtk-x86/Configuration
-
-bin.includes=qpidmc.sh qpidmc_gtk.sh
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.properties?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.properties (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.properties Wed Jan 21 09:41:46 2009
@@ -33,8 +33,8 @@
rcp.configuration.dir=src/main/resources/macosx/Configuration
-eclipse.ini=src/main/resources/macosx/Contents/MacOS/eclipse.ini
-bin.includes=src/main/resources/macosx/Contents/MacOS/eclipse
-
+qpidmc.ini=src/main/resources/macosx/Contents/MacOS/qpidmc.ini
+qpidmc.executable=src/main/resources/macosx/Contents/MacOS/qpidmc
+
eclipse.icns=src/main/resources/macosx/Contents/Resources/Console.icns
macosx.plist=src/main/resources/macosx/Contents/Info.plist
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.xml?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.xml (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.xml Wed Jan 21 09:41:46 2009
@@ -18,14 +18,17 @@
- under the License.
-
-->
-<project name="Eclipse Plugin Binary Release" default="release-bin">
+<project name="Eclipse Plugin MacOSX 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 name="release-bin-qpid-mc-plugin">
+ <!-- Copy the qpid management-eclipse-plugin module jar -->
+ <copy tofile="${release.app}/plugins/${mcplugin.filename}.jar" flatten="true" failonerror="true">
+ <fileset file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar"/>
+ </copy>
</target>
<target name="release-bin-jmxremote-plugin">
@@ -35,14 +38,24 @@
</copy>
</target>
+ <target name="release-bin-qpidmanagementcommon-plugin">
+ <!-- Copy the management common plugin's manifest, creating its plugin directory -->
+ <copy todir="${release.app}/plugins/qpid-management-common_1.0.0/META-INF" flatten="true" failonerror="true">
+ <fileset file="${qpidmanagementcommon.manifest}"/>
+ </copy>
+ <!-- Copy the qpid management-common module jar -->
+ <copy tofile="${release.app}/plugins/qpid-management-common_1.0.0/qpid-management-common.jar" flatten="true" failonerror="true">
+ <fileset file="${build.lib}/qpid-management-common-${project.version}.jar"/>
+ </copy>
+ </target>
+
- <target name="release-bin-rcp-deps" description="copy eclipse-rcp dependencies into module release"
- depends="copy-executable">
+ <target name="release-bin-rcp-deps" description="copy eclipse-rcp dependencies into module release">
- <!-- Copy remaining Eclipse binary and start-up files -->
+ <!-- Copy Eclipse binary and start-up files -->
<copy todir="${release.app}/Contents/MacOS" flatten="true" failonerror="true">
- <fileset file="${eclipse.ini}"/>
- <fileset file="${bin.includes}"/>
+ <fileset file="${qpidmc.ini}"/>
+ <fileset file="${qpidmc.executable}"/>
</copy>
<chmod dir="${release.app}/Contents/MacOS" perm="u+rx" includes="**/*"/>
@@ -52,16 +65,11 @@
<fileset file="${macosx.plist}"/>
</copy>
- <!-- Copy remaining Eclipse binary and start-up files -->
+ <!-- Copy Icns icon file -->
<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}"/>
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties Wed Jan 21 09:41:46 2009
@@ -25,12 +25,10 @@
release.zip=${module.release.base}/${release.name}.zip
-eclipse.executable=src/main/resources/win32-win32-x86/eclipse.exe
-
-eclipse.ini=src/main/resources/win32-win32-x86/eclipse.ini
+qpidmc.executable=src/main/resources/win32-win32-x86/qpidmc.exe
+
+qpidmc.ini=src/main/resources/win32-win32-x86/qpidmc.ini
rcp.libs=${management-eclipse-plugin-win32-win32-x86.libs}
-
+
rcp.configuration.dir=src/main/resources/win32-win32-x86/Configuration
-
-bin.includes=qpidmc.bat
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml Wed Jan 21 09:41:46 2009
@@ -25,17 +25,12 @@
<condition property="properties.set">
<and>
<!-- common properties -->
- <isset property ="mcplugin.contents.dir"/>
- <isset property ="mcplugin.manifest"/>
<isset property ="mcplugin.filename"/>
- <isset property ="bin.dir"/>
- <isset property ="startup.jar"/>
- <isset property ="license.eclipse.txt"/>
<isset property ="jmxremote.sasl.manifest"/>
<isset property ="qpidmanagementcommon.manifest"/>
<!-- platform specific properties -->
- <isset property ="eclipse.ini"/>
- <isset property ="bin.includes"/>
+ <isset property ="qpidmc.ini"/>
+ <isset property ="qpidmc.executable"/>
<isset property ="release.name"/>
<isset property ="release.subdir"/>
<isset property ="rcp.libs"/>
@@ -45,75 +40,73 @@
<isset property ="release.tar.gz"/>
</or>
</and>
- <!-- Optional Properties -->
- <!-- eclipse.executable.companion.library -->
+ <!-- Optional Properties:
+
+ For linux libcairo-swt.so file:
+ qpidmc.companion.library
+
+ -->
</condition>
- <fail unless="properties.set" message="required properties not set"/>
+ <fail unless="properties.set" message="some required properties were not set"/>
</target>
<target name="release-bin-prepare">
<mkdir dir="${release.subdir}"/>
</target>
- <target name="release-bin-mcplugin-jar">
- <jar destfile="${release.subdir}/eclipse/plugins/${mcplugin.filename}.jar" basedir="${mcplugin.contents.dir}" manifest="${mcplugin.manifest}"/>
+ <target name="release-bin-qpid-mc-plugin">
+ <!-- Copy the qpid management-eclipse-plugin module jar -->
+ <copy tofile="${release.subdir}/plugins/${mcplugin.filename}.jar" flatten="true" failonerror="true">
+ <fileset file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar"/>
+ </copy>
</target>
<target name="release-bin-jmxremote-plugin">
<!-- Copy the jmxremote.sasl plugin's manifest, creating its plugin directory -->
- <copy todir="${release.subdir}/eclipse/plugins/jmxremote.sasl_1.0.1/META-INF" flatten="true" failonerror="true">
+ <copy todir="${release.subdir}/plugins/jmxremote.sasl_1.0.1/META-INF" flatten="true" failonerror="true">
<fileset file="${jmxremote.sasl.manifest}"/>
</copy>
</target>
<target name="release-bin-qpidmanagementcommon-plugin">
<!-- Copy the management common plugin's manifest, creating its plugin directory -->
- <copy todir="${release.subdir}/eclipse/plugins/qpid-management-common_1.0.0/META-INF" flatten="true" failonerror="true">
+ <copy todir="${release.subdir}/plugins/qpid-management-common_1.0.0/META-INF" flatten="true" failonerror="true">
<fileset file="${qpidmanagementcommon.manifest}"/>
</copy>
- <copy todir="${release.subdir}/eclipse/plugins/qpid-management-common_1.0.0/" flatten="true" failonerror="true">
+ <!-- Copy the qpid management-common module jar -->
+ <copy tofile="${release.subdir}/plugins/qpid-management-common_1.0.0/qpid-management-common.jar" flatten="true" failonerror="true">
<fileset file="${build.lib}/qpid-management-common-${project.version}.jar"/>
</copy>
</target>
-
- <target name="copy-executable" description="Copy eclipse-rcp execuitable" if="eclipse.executable">
-
- <!-- Copy the eclipse rcp executable files -->
- <copy todir="${release.subdir}/eclipse" flatten="true" failonerror="true">
- <fileset file="${eclipse.executable}"/>
+
+ <target name="release-bin-executable-companion-library" if="qpidmc.companion.library">
+ <!-- Copy the rcp executable companion library file -->
+ <copy todir="${release.subdir}" flatten="true" failonerror="true">
+ <fileset file="${qpidmc.companion.library}"/>
</copy>
- <chmod dir="${release.subdir}/eclipse" perm="u+rx" includes="**/*"/>
-
-
</target>
-
- <target name="release-bin-rcp-deps" description="copy eclipse-rcp dependencies into module release"
- depends="copy-executable">
+
+ <target name="release-bin-rcp-deps" description="copy eclipse-rcp dependencies into module release"
+ depends="release-bin-executable-companion-library">
+
+ <!-- Copy the rcp executable file -->
+ <copy todir="${release.subdir}" flatten="true" failonerror="true">
+ <fileset file="${qpidmc.executable}"/>
+ </copy>
+ <chmod dir="${release.subdir}" perm="u+rx" includes="**/*"/>
<!-- Copy remaining startup & license files -->
- <copy todir="${release.subdir}/eclipse" flatten="true" failonerror="true">
- <fileset file="${startup.jar}"/>
- <fileset file="${eclipse.ini}"/>
- <fileset file="${license.eclipse.txt}"/>
+ <copy todir="${release.subdir}" flatten="true" failonerror="true">
+ <fileset file="${qpidmc.ini}"/>
</copy>
- <echo message="${ecl-swt-linux-gtk-x86}"/>
- <echo message="${management-eclipse-plugin-linux-gtk-x86.libs}"/>
- <echo message="${rcp.libs}"/>
- <!-- Copy the eclipse rcp module libs -->
- <copy todir="${release.subdir}/eclipse/plugins" failonerror="true">
-
+ <!-- Copy the rcp module libs -->
+ <copy todir="${release.subdir}/plugins" failonerror="true">
<fileset dir="${project.root}" includes="${rcp.libs}"/>
<globmapper from="lib/*" to="*"/>
</copy>
- <!-- Copy the relevant bin dir files-->
- <copy todir="${release.subdir}/bin" failonerror="true">
- <fileset dir="${bin.dir}" includes="${bin.includes}"/>
- </copy>
- <chmod dir="${release.subdir}/bin" perm="u+rx" includes="**/*"/>
-
<!-- Copy the relevant configuration dir -->
<copy todir="${release.subdir}/configuration" failonerror="true">
<fileset dir="${rcp.configuration.dir}"/>
@@ -124,16 +117,16 @@
<target name="release-bin-zip" if="release.zip" description="build mc zip archive">
<zip destfile="${release.zip}">
<zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
- <include name="bin/*"/>
+ <include name="qpidmc*"/>
+ <exclude name="qpidmc.ini"/>
</zipfileset>
-
- <zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
- <include name="eclipse/eclipse*"/>
+
+ <zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="644">
+ <include name="qpidmc.ini"/>
</zipfileset>
<zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="644" dirmode="755">
- <exclude name="bin/**"/>
- <exclude name="eclipse/eclipse*"/>
+ <exclude name="qpidmc*"/>
</zipfileset>
</zip>
</target>
@@ -141,23 +134,22 @@
<target name="release-bin-gzip" if="release.tar.gz" description="build mc tar.gz archive">
<tar destfile="${release.tar.gz}" longfile="gnu">
<tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
- <include name="bin/*"/>
+ <include name="qpidmc*"/>
+ <exclude name="qpidmc.ini"/>
</tarfileset>
- <tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
- <include name="eclipse/eclipse*"/>
+ <tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="644">
+ <include name="qpidmc.ini"/>
</tarfileset>
<tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="644" dirmode="755">
- <exclude name="bin/**"/>
- <exclude name="eclipse/eclipse*"/>
+ <exclude name="qpidmc*"/>
</tarfileset>
</tar>
</target>
-
<target name="release-bin" depends="check,release-bin-prepare,release-bin-rcp-deps,
- release-bin-mcplugin-jar,release-bin-qpidmanagementcommon-plugin,release-bin-jmxremote-plugin,release-bin-zip,release-bin-gzip"/>
+ release-bin-qpid-mc-plugin,release-bin-qpidmanagementcommon-plugin,release-bin-jmxremote-plugin,release-bin-zip,release-bin-gzip"/>
</project>
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build.xml?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build.xml (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build.xml Wed Jan 21 09:41:46 2009
@@ -61,9 +61,7 @@
</target>
-
- <!-- Override imported module.xml build target, create module jar containing plugin files -->
- <target name="build" depends="prepare, compile, copy-plugin-files, create-version, jar, jar-tests"/>
+ <target name="precompile" depends="copy-plugin-files, create-version" />
<!-- Override imported module.xml release-bin target -->
<target name="release-bin" depends="build">
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini Wed Jan 21 09:41:46 2009
@@ -17,11 +17,32 @@
# under the License.
###############################################################################
-#Product Runtime Configuration File
-
-osgi.splashPath=platform:/base/plugins/org.apache.qpid.management.ui
-eclipse.product=org.apache.qpid.management.ui.product
-eclipse.application=org.apache.qpid.management.ui.application
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.core.runtime@start,com.ibm.icu,org.apache.qpid.management.ui,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.swt,org.eclipse.swt.gtk.linux.x86,org.eclipse.ui,org.eclipse.ui.forms,org.eclipse.ui.workbench,jmxremote.sasl,qpid-management-common
-osgi.bundles.defaultStartLevel=4
-eof=eof
+#Product Runtime Configuration File
+
+osgi.splashPath=platform:/base/plugins/org.apache.qpid.management.ui
+eclipse.product=org.apache.qpid.management.ui.product
+osgi.bundles.defaultStartLevel=4
+osgi.bundles=jmxremote.sasl, \
+qpid-management-common, \
+org.apache.qpid.management.ui, \
+com.ibm.icu, \
+org.eclipse.core.commands, \
+org.eclipse.core.contenttype, \
+org.eclipse.core.databinding, \
+org.eclipse.core.expressions, \
+org.eclipse.core.jobs, \
+org.eclipse.core.runtime@start, \
+org.eclipse.core.runtime.compatibility.registry, \
+org.eclipse.equinox.app,org.eclipse.equinox.common, \
+org.eclipse.equinox.preferences, \
+org.eclipse.equinox.registry, \
+org.eclipse.help, \
+org.eclipse.jface, \
+org.eclipse.jface.databinding, \
+org.eclipse.swt, \
+org.eclipse.swt.gtk.linux.x86, \
+org.eclipse.ui, \
+org.eclipse.ui.forms, \
+org.eclipse.ui.workbench, \
+org.eclipse.equinox.launcher, \
+org.eclipse.equinox.launcher.gtk.linux.x86
Added: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so?rev=736349&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc?rev=736349&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini Wed Jan 21 09:41:46 2009
@@ -1,11 +1,25 @@
--startup
-plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
---launcher.library
-plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805
-#-showsplash
-#org.eclipse.platform
---launcher.XXMaxPermSize
-256m
+###############################################################################
+# 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.
+###############################################################################
+
-vmargs
-Xms40m
-Xmx256m
+-XX:MaxPermSize=256m
+-Dosgi.requiredJavaVersion=1.5
+-Declipse.consoleLog=true
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini Wed Jan 21 09:41:46 2009
@@ -1,30 +1,48 @@
-###############################################################################
-# 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.
-###############################################################################
-
+###############################################################################
+# 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.
+###############################################################################
+
#Product Runtime Configuration File
-org.eclipse.update.reconcile=false
-osgi.splashPath=platform\:/base/plugins/org.eclipse.platform
+osgi.splashPath=platform:/base/plugins/org.apache.qpid.management.ui
eclipse.product=org.apache.qpid.management.ui.product
-eclipse.application=org.apache.qpid.management.ui.application
-
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.core.runtime@start,com.ibm.icu,org.apache.qpid.management.ui,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.swt,org.eclipse.swt.carbon.macosx,org.eclipse.ui,org.eclipse.ui.forms,org.eclipse.ui.workbench,org.eclipse.equinox.app,org.eclipse.core.databinding,org.eclipse.jface.databinding,jmxremote.sasl,qpid-management-common
-
osgi.bundles.defaultStartLevel=4
-eof=eof
+osgi.bundles=jmxremote.sasl, \
+qpid-management-common, \
+org.apache.qpid.management.ui, \
+com.ibm.icu, \
+org.eclipse.core.commands, \
+org.eclipse.core.contenttype, \
+org.eclipse.core.databinding, \
+org.eclipse.core.expressions, \
+org.eclipse.core.jobs, \
+org.eclipse.core.runtime@start, \
+org.eclipse.core.runtime.compatibility.registry, \
+org.eclipse.equinox.app,org.eclipse.equinox.common, \
+org.eclipse.equinox.preferences, \
+org.eclipse.equinox.registry, \
+org.eclipse.help, \
+org.eclipse.jface, \
+org.eclipse.jface.databinding, \
+org.eclipse.swt, \
+org.eclipse.swt.carbon.macosx, \
+org.eclipse.ui, \
+org.eclipse.ui.forms, \
+org.eclipse.ui.workbench, \
+org.eclipse.equinox.launcher, \
+org.eclipse.equinox.launcher.carbon.macosx
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist Wed Jan 21 09:41:46 2009
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
- <string>eclipse</string>
+ <string>qpidmc</string>
<key>CFBundleGetInfoString</key>
<string>Apache Qpid Management Console for Mac OS X</string>
<key>CFBundleIconFile</key>
@@ -26,6 +26,10 @@
<array>
<string>-consoleLog</string>
<string>-showlocation</string>
+ <!-- WARNING:
+ If you try to add a single VM argument (-vmargs) here,
+ *all* vmargs specified in qpidmc.ini will be ignored.
+ We recommend to add all arguments in MacOS/qpidmc.ini -->
</array>
</dict>
</plist>
Propchange: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
svn:executable = *
Propchange: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini Wed Jan 21 09:41:46 2009
@@ -1,14 +1,31 @@
--showsplash
-org.eclipse.platform
+###############################################################################
+# 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.
+###############################################################################
+
-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
+-Declipse.consoleLog=true
-Dorg.eclipse.swt.internal.carbon.smallFonts
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF Wed Jan 21 09:41:46 2009
@@ -3,7 +3,7 @@
Bundle-Name: Qpid management commonPlug-in
Bundle-SymbolicName: qpid-management-common
Bundle-Version: 1.0.0
-Bundle-ClassPath: qpid-management-common-M4.jar
+Bundle-ClassPath: qpid-management-common.jar
Export-Package: org.apache.qpid.management.common,
org.apache.qpid.management.common.sasl
Bundle-Vendor:
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini Wed Jan 21 09:41:46 2009
@@ -21,6 +21,28 @@
osgi.splashPath=platform:/base/plugins/org.apache.qpid.management.ui
eclipse.product=org.apache.qpid.management.ui.product
-eclipse.application=org.apache.qpid.management.ui.application
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.core.runtime@start,com.ibm.icu,org.apache.qpid.management.ui,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.forms,jmxremote.sasl,org.eclipse.ui.workbench,qpid-management-common
osgi.bundles.defaultStartLevel=4
+osgi.bundles=jmxremote.sasl, \
+qpid-management-common, \
+org.apache.qpid.management.ui, \
+com.ibm.icu, \
+org.eclipse.core.commands, \
+org.eclipse.core.contenttype, \
+org.eclipse.core.databinding, \
+org.eclipse.core.expressions, \
+org.eclipse.core.jobs, \
+org.eclipse.core.runtime@start, \
+org.eclipse.core.runtime.compatibility.registry, \
+org.eclipse.equinox.app,org.eclipse.equinox.common, \
+org.eclipse.equinox.preferences, \
+org.eclipse.equinox.registry, \
+org.eclipse.help, \
+org.eclipse.jface, \
+org.eclipse.jface.databinding, \
+org.eclipse.swt, \
+org.eclipse.swt.win32.win32.x86, \
+org.eclipse.ui, \
+org.eclipse.ui.forms, \
+org.eclipse.ui.workbench, \
+org.eclipse.equinox.launcher, \
+org.eclipse.equinox.launcher.win32.win32.x86
Added: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe?rev=736349&view=auto
==============================================================================
Binary file - no diff available.
Propchange: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini Wed Jan 21 09:41:46 2009
@@ -1,23 +1,25 @@
-###############################################################################
-# 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.
-###############################################################################
-
+###############################################################################
+# 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.
+###############################################################################
+
-vmargs
-Xms40m
-Xmx256m
+-XX:MaxPermSize=256m
+-Dosgi.requiredJavaVersion=1.5
-Declipse.consoleLog=true
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org
RE: svn commit: r736349 - in /qpid/trunk/qpid/java/management/eclipse-plugin: ./ bin/ src/main/resources/ src/main/resources/linux-gtk-x86/ src/main/resources/linux-gtk-x86/Configuration/ src/main/resources/macosx/Configuration/ src/main/resources/macosx/
Posted by Robbie Gemmell <ge...@dcs.gla.ac.uk>.
The qpid/java/build.deps file should also have been updated but wasn’t
-----Original Message-----
From: ritchiem@apache.org [mailto:ritchiem@apache.org]
Sent: 21 January 2009 17:42
To: commits@qpid.apache.org
Subject: svn commit: r736349 - in /qpid/trunk/qpid/java/management/eclipse-plugin: ./ bin/ src/main/resources/ src/main/resources/linux-gtk-x86/ src/main/resources/linux-gtk-x86/Configuration/ src/main/resources/macosx/Configuration/ src/main/resources/macosx/C...
Author: ritchiem
Date: Wed Jan 21 09:41:46 2009
New Revision: 736349
URL: http://svn.apache.org/viewvc?rev=736349&view=rev
Log:
QPID-1592 : Patch provided by Robert Gemmell to standardise launchers for management console.
Added:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so (with props)
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc (with props)
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed)
- copied unchanged from r736327, qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe (with props)
Removed:
qpid/trunk/qpid/java/management/eclipse-plugin/bin/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/startup.jar
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.exe
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.ini
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.properties
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.xml
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml
qpid/trunk/qpid/java/management/eclipse-plugin/build.xml
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties?rev=736349&r1=736348&r2=736349&view=diff
==============================================================================
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org