adapt master to develop

[taxeditor.git] / eu.etaxonomy.taxeditor / eu.etaxonomy.taxeditor.product

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index 7427ece520e5066440ea6cbdc8e9db0d7e46284c..5ca7deb0bbc45766e89a84e8ee5535a186762273 100644 (file)
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="5.12.0.qualifier">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" autoIncludeRequirements="true" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="5.42.0">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
@@ -10,7 +10,10 @@
   <launcherArgs>
     <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080
       </programArgs>
-    <vmArgs>-Xmx512M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow
+    <programArgsLin>--launcher.GTK_version
+2
+      </programArgsLin>
+    <vmArgs>-Xmx512M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow -Dremoting.httpinvoker.measureDuration=true
       </vmArgs>
     <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
@@ -18,7 +21,6 @@
   <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
   <splash location="eu.etaxonomy.taxeditor.application" startupForegroundColor="000000" startupMessageRect="7,432,360,20" startupProgressRect="5,447,366,15"/>
   <launcher name="TaxonomicEditor">
-    <solaris/>
     <win useIco="false">
       <bmp/>
     </win>
@@ -35,5 +37,6 @@
     <plugin autoStart="true" id="org.eclipse.equinox.ds" startLevel="2"/>
     <plugin autoStart="true" id="org.eclipse.equinox.p2.transport.ecf" startLevel="4"/>
     <plugin autoStart="true" id="org.eclipse.equinox.simpleconfigurator" startLevel="1"/>
+    <property name="osgi.nl" value="en"/>
   </configurations>
 </product>