Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-05-13 15:33:35 +0000
committerEike Stepper2010-05-13 15:33:35 +0000
commit6421f3251b7178560f658e3a03c844688216caa5 (patch)
tree8e31a1b88e85c989861beddf5c67878ac0c4c5a9
parent94635de2df59ed7f7b14aee8d7cffd0241fcee24 (diff)
downloadcdo-6421f3251b7178560f658e3a03c844688216caa5.tar.gz
cdo-6421f3251b7178560f658e3a03c844688216caa5.tar.xz
cdo-6421f3251b7178560f658e3a03c844688216caa5.zip
vserver
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/demo-server.product11
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/plugin.xml4
-rw-r--r--vserver/www/htdocs/index.html12
3 files changed, 24 insertions, 3 deletions
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 4e256dcc5c..7edddc4aa4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/demo-server.product
+++ b/plugins/org.eclipse.emf.cdo.examples.server/demo-server.product
@@ -30,6 +30,8 @@
<plugins>
<plugin id="javax.servlet"/>
+ <plugin id="org.apache.commons.lang"/>
+ <plugin id="org.apache.commons.logging"/>
<plugin id="org.eclipse.ant.core"/>
<plugin id="org.eclipse.core.contenttype"/>
<plugin id="org.eclipse.core.expressions"/>
@@ -55,7 +57,9 @@
<plugin id="org.eclipse.emf.ecore.xmi"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
+ <plugin id="org.eclipse.equinox.http.jetty"/>
<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.gtk.linux.x86_64" fragment="true"/>
<plugin id="org.eclipse.equinox.preferences"/>
@@ -75,7 +79,14 @@
<plugin id="org.eclipse.update.core"/>
<plugin id="org.eclipse.update.core.linux" 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>
</product>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml b/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml
index 9569f0ef63..363d994389 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml
@@ -20,8 +20,8 @@ Eike Stepper - initial API and implementation
</extension>
<extension id="product" point="org.eclipse.core.runtime.products">
- <product name="%product.name" description="%product.description" application="org.eclipse.emf.cdo.server.app">
- <property name="appName" value="CDO Server"/>
+ <product name="Demo Server" description="%product.description" application="org.eclipse.emf.cdo.examples.server.app">
+ <property name="appName" value="Demo Server"/>
</product>
</extension>
diff --git a/vserver/www/htdocs/index.html b/vserver/www/htdocs/index.html
index e0673b2b05..3c99519ac6 100644
--- a/vserver/www/htdocs/index.html
+++ b/vserver/www/htdocs/index.html
@@ -1 +1,11 @@
-<html><head></head><body>Hello World!</body></html>
+<html>
+<head>
+ <title>CDO VServer</title>
+</head>
+<body>
+
+ <h1>CDO VServer</h1>
+ <a href="http://cdo.eclipse.org:3002/requestForm.html">Demo Request Form</a>
+
+</body>
+</html>

Back to the top