Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-09-02 17:12:11 +0000
committerEike Stepper2008-09-02 17:12:11 +0000
commitd85eddea754c6ec0cb65ebea3ad225d4087eb5d5 (patch)
tree986a5499882d181500ed0e699ec908d5ffb19a20 /features
parenta431945c5c865afa9d4480966074e0662670c891 (diff)
downloadcdo-d85eddea754c6ec0cb65ebea3ad225d4087eb5d5.tar.gz
cdo-d85eddea754c6ec0cb65ebea3ad225d4087eb5d5.tar.xz
cdo-d85eddea754c6ec0cb65ebea3ad225d4087eb5d5.zip
[245966] CDOServer.product doesn't work out of box on OS-X
https://bugs.eclipse.org/bugs/show_bug.cgi?id=245966
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product19
1 files changed, 13 insertions, 6 deletions
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product b/features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product
index ee185e24c8..91fc228329 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product
+++ b/features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product
@@ -1,9 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.1"?>
+<?pde version="3.4"?>
<product name="CDO Server" id="org.eclipse.emf.cdo.server.product" application="org.eclipse.emf.cdo.server.app" useFeatures="true">
- <configIni use="custom" path="/org.eclipse.emf.cdo.server.product/config.ini"/>
+ <configIni>
+ <linux>/org.eclipse.emf.cdo.server.product/config.ini</linux>
+ <macosx>/org.eclipse.emf.cdo.server.product/config.ini</macosx>
+ <solaris>/org.eclipse.emf.cdo.server.product/config.ini</solaris>
+ <win32>/org.eclipse.emf.cdo.server.product/config.ini</win32>
+ </configIni>
<launcherArgs>
<programArgs>-clean
@@ -13,9 +18,11 @@
128M</programArgs>
<vmArgs>-Xms64M
-Xmx512M
--Ddebug=true
--Dnet4j.config=configuration</vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+-Ddebug=true</vmArgs>
+ <vmArgsLin>-Dnet4j.config=configuration</vmArgsLin>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Dnet4j.config=configuration</vmArgsMac>
+ <vmArgsSol>-Dnet4j.config=configuration</vmArgsSol>
+ <vmArgsWin>-Dnet4j.config=../../../configuration</vmArgsWin>
</launcherArgs>
<launcher name="cdo-server.exe">
@@ -43,7 +50,7 @@
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.net4j"/>
<plugin id="org.eclipse.net4j.db"/>
- <plugin id="org.eclipse.net4j.db.derby" fragment="true"/>
+ <plugin id="org.eclipse.net4j.db.derby"/>
<plugin id="org.eclipse.net4j.tcp"/>
<plugin id="org.eclipse.net4j.util"/>
<plugin id="org.eclipse.osgi"/>

Back to the top