Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-05-14 07:35:34 +0000
committerEike Stepper2010-05-14 07:35:34 +0000
commit02d4228926087eb2f34bfe2cd542b9a15711ee00 (patch)
treed063b3945eeb382cdf85f07b8d3f24a9b13bf7e7 /plugins/org.eclipse.emf.cdo.examples.server
parent1d30a0cf5921b1274c46990d1328c46ee794caf2 (diff)
downloadcdo-02d4228926087eb2f34bfe2cd542b9a15711ee00.tar.gz
cdo-02d4228926087eb2f34bfe2cd542b9a15711ee00.tar.xz
cdo-02d4228926087eb2f34bfe2cd542b9a15711ee00.zip
servlet version problem
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.examples.server')
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/Demo Server.launch6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/demo-server.product26
3 files changed, 32 insertions, 10 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/Demo Server.launch b/plugins/org.eclipse.emf.cdo.examples.server/Demo Server.launch
index 381960a798..d42a211dc6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/Demo Server.launch
+++ b/plugins/org.eclipse.emf.cdo.examples.server/Demo Server.launch
@@ -22,9 +22,9 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.emf.cdo.examples.server.product"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.net4j.db.h2"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.common@2:true,org.eclipse.emf.common@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.http.jetty@default:true,org.eclipse.core.variables@default:default,org.eclipse.core.runtime@default:true,org.apache.commons.logging@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.http.registry@default:true,org.apache.jasper@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.resources@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.osgi.services@default:default,org.apache.commons.el@default:default,org.mortbay.jetty.server@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.app@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,javax.servlet@default:default,org.apache.ant@default:default,org.apache.commons.lang@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,javax.servlet.jsp@default:default,org.mortbay.jetty.util@default:default,org.h2@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.db@default:default,org.eclipse.emf.cdo.examples.server@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="selected_target_plugins" value="org.mortbay.jetty.util@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.emf.common@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.filesystem@default:default,org.apache.commons.lang@default:default,org.eclipse.core.variables@default:default,org.apache.commons.logging@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.http.registry@default:true,org.h2@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.common@2:true,javax.servlet@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.http.jetty@default:true,org.eclipse.core.contenttype@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecore.xmi@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.examples.server@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.net4j.jvm@default:default"/>
+<booleanAttribute key="show_selected_only" value="true"/>
<booleanAttribute key="tracing" value="true"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
index cd007456ba..51df6fe48d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
@@ -16,12 +16,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.apache.commons.logging;bundle-version="[1.0.0,2.0.0)",
org.eclipse.equinox.http.registry;bundle-version="[1.0.0,2.0.0)",
org.eclipse.equinox.http.servlet;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.equinox.http.jetty;bundle-version="[2.0.0,4.0.0)"
+ org.eclipse.equinox.http.jetty;bundle-version="[2.0.0,3.0.0)"
Export-Package: org.eclipse.emf.cdo.examples.server;version="3.0.0",
templates;version="3.0.0";x-internal:=true
-Import-Package: org.h2.jdbcx;version="[1.1.0,1.2.0)",
- javax.servlet;version="[2.5.0,2.6.0)",
- javax.servlet.http;version="[2.5.0,2.6.0)",
- org.apache.commons.lang;version="[2.3.0,3.0.0)"
+Import-Package: javax.servlet;version="[2.3.0,3.0.0)",
+ javax.servlet.http;version="[2.3.0,3.0.0)",
+ org.apache.commons.lang;version="[2.3.0,3.0.0)",
+ org.h2.jdbcx;version="[1.1.0,1.2.0)"
Bundle-Activator: org.eclipse.emf.cdo.examples.server.OM$Activator
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/demo-server.product b/plugins/org.eclipse.emf.cdo.examples.server/demo-server.product
index 7edddc4aa4..cb148334ac 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/demo-server.product
+++ b/plugins/org.eclipse.emf.cdo.examples.server/demo-server.product
@@ -3,12 +3,14 @@
<product name="Demo Server" id="org.eclipse.emf.cdo.examples.server.product" application="org.eclipse.emf.cdo.examples.server.app" useFeatures="false" includeLaunchers="true">
+
<configIni use="default">
</configIni>
<launcherArgs>
<programArgs>-console
3001
+--launcher.suppressErrors
--launcher.XXMaxPermSize
128M</programArgs>
<vmArgs>-server
@@ -18,6 +20,9 @@
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
</launcherArgs>
+ <windowImages/>
+
+
<launcher name="cdo-server">
<solaris/>
<win useIco="false">
@@ -25,6 +30,7 @@
</win>
</launcher>
+
<vm>
</vm>
@@ -36,11 +42,20 @@
<plugin id="org.eclipse.core.contenttype"/>
<plugin id="org.eclipse.core.expressions"/>
<plugin id="org.eclipse.core.filesystem"/>
+ <plugin id="org.eclipse.core.filesystem.linux.ppc" fragment="true"/>
+ <plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true"/>
<plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
+ <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
+ <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.net"/>
+ <plugin id="org.eclipse.core.net.linux.x86" fragment="true"/>
<plugin id="org.eclipse.core.net.linux.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.core.net.win32.x86" fragment="true"/>
+ <plugin id="org.eclipse.core.net.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.resources"/>
+ <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.core.runtime.compatibility.auth"/>
<plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
@@ -61,10 +76,18 @@
<plugin id="org.eclipse.equinox.http.registry"/>
<plugin id="org.eclipse.equinox.http.servlet"/>
<plugin id="org.eclipse.equinox.launcher"/>
+ <plugin id="org.eclipse.equinox.launcher.cocoa.macosx" fragment="true"/>
+ <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc" fragment="true"/>
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" fragment="true"/>
<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.equinox.launcher.win32.win32.x86" fragment="true"/>
+ <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.security"/>
+ <plugin id="org.eclipse.equinox.security.macosx" fragment="true"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/>
<plugin id="org.eclipse.net4j"/>
<plugin id="org.eclipse.net4j.db"/>
<plugin id="org.eclipse.net4j.db.h2"/>
@@ -78,14 +101,13 @@
<plugin id="org.eclipse.update.configurator"/>
<plugin id="org.eclipse.update.core"/>
<plugin id="org.eclipse.update.core.linux" fragment="true"/>
+ <plugin id="org.eclipse.update.core.win32" fragment="true"/>
<plugin id="org.h2"/>
<plugin id="org.mortbay.jetty.server"/>
<plugin id="org.mortbay.jetty.util"/>
</plugins>
<configurations>
- <plugin id="org.eclipse.equinox.http.jetty" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.http.servlet" autoStart="true" startLevel="0" />
</configurations>

Back to the top