- added empty root folders for the JREs

 - adapted ini file and build.properties
 - #4717

diff --git a/eu.etaxonomy.taxeditor.feature/build.properties b/eu.etaxonomy.taxeditor.feature/build.properties
index 30f68d152ce802dcfa0eb2399ee01c1a11018049..2b7556cae4ef06e215057bd2a3a2de63b5d440d1 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/build.properties
+++ b/eu.etaxonomy.taxeditor.feature/build.properties
@@ -3,3 +3,8 @@ bin.includes = feature.xml
 category.id.eu.etaxonomy=EDIT
 category.description.eu.etaxonomy=EDIT Taxonomic Editor
 category.members.eu.etaxonomy=eu.etaxonomy.taxeditor.feature
+root.win32.win32.x86_64 = win-64-jre
+root.win32.win32.x86 = win-32-jre
+root.linux.gtk.x86=linux-32-jre
+root.linux.gtk.x86_64=linux-64-jre
+root.macosx.cocoa.x86_64=mac-64-jre
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index ce9f26a8d0e79de99c3a4d453c1962b1182c3b7c..1a4a4cc970a9fc1455595969ff9fb5717f8df490 100644 (file)
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -14,7 +14,8 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080</programArgs>
+      <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080
+-vm jre/bin</programArgs>
       <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow</vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
    </launcherArgs>
@@ -33,6 +34,7 @@
       </win>
    </launcher>
 
+
    <vm>
    </vm>