Author: aidan
Date: Fri Jan 16 06:17:23 2009
New Revision: 735023
URL: http://svn.apache.org/viewvc?rev=735023&view=rev
Log:
QPID-1565: Move each platforms config + executables into a more appropriately
named folder, and where suitable with the structure they should take within the
console builds. Additionally, the component plugin's manifest folders are moved
to indicate their usage better. There is also a patch to update the build
process with the new locations.
Patch from Robbie Gemmell gemme...@dcs.gla.ac.uk
Added:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/
- copied from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/sasl/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/
- copied from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/eclipse.ini
- copied unchanged from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
- copied unchanged from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
- copied unchanged from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Info.plist
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse
- copied unchanged from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse.ini
- copied unchanged from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
- copied unchanged from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Resources/
- copied from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/icons/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/
- copied from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpidmanagementcommon/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/
- copied from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.exe
- copied unchanged from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.exe
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.ini
- copied unchanged from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
- copied unchanged from r735021,
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.ini
Removed:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.exe
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/icons/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Info.plist
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpidmanagementcommon/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/sasl/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/
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-win32-win32-x86.properties
qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml
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=735023&r1=735022&r2=735023&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
Fri Jan 16 06:17:23 2009
@@ -31,10 +31,8 @@
startup.jar=src/main/resources/startup.jar
-eclipse.ini=src/main/resources/eclipse.ini
-
license.eclipse.txt=src/main/resources/license.eclipse.txt
-jmxremote.sasl.manifest=src/main/resources/sasl/MANIFEST.MF
+jmxremote.sasl.manifest=src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF
-qpidmanagementcommon.manifest=src/main/resources/qpidmanagementcommon/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=735023&r1=735022&r2=735023&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
Fri Jan 16 06:17:23 2009
@@ -25,10 +25,10 @@
release.tar.gz=${module.release.base}/${release.name}.tar.gz
-eclipse.ini=src/main/resources/unix/eclipse.ini
+eclipse.ini=src/main/resources/linux-gtk-x86/eclipse.ini
rcp.libs=${management-eclipse-plugin-linux-gtk-x86.libs}
-rcp.configuration.dir=src/main/resources/unix/configuration
+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=735023&r1=735022&r2=735023&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
Fri Jan 16 06:17:23 2009
@@ -33,8 +33,8 @@
rcp.configuration.dir=src/main/resources/macosx/Configuration
-eclipse.ini=src/main/resources/macosx/eclipse.ini
-bin.includes=src/main/resources/macosx/eclipse
+eclipse.ini=src/main/resources/macosx/Contents/MacOS/eclipse.ini
+bin.includes=src/main/resources/macosx/Contents/MacOS/eclipse
-eclipse.icns=src/main/resources/icons/Console.icns
-macosx.plist=src/main/resources/macosx/Info.plist
+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-win32-win32-x86.properties
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties?rev=735023&r1=735022&r2=735023&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
Fri Jan 16 06:17:23 2009
@@ -25,10 +25,12 @@
release.zip=${module.release.base}/${release.name}.zip
-eclipse.executable=src/main/resources/eclipse.exe
+eclipse.executable=src/main/resources/win32-win32-x86/eclipse.exe
+
+eclipse.ini=src/main/resources/win32-win32-x86/eclipse.ini
rcp.libs=${management-eclipse-plugin-win32-win32-x86.libs}
-rcp.configuration.dir=src/main/resources/win32/configuration
+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=735023&r1=735022&r2=735023&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml Fri Jan 16
06:17:23 2009
@@ -30,11 +30,11 @@
<isset property ="mcplugin.filename"/>
<isset property ="bin.dir"/>
<isset property ="startup.jar"/>
- <isset property ="eclipse.ini"/>
<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 ="release.name"/>
<isset property ="release.subdir"/>
