Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorEike Stepper2010-05-14 08:30:47 +0000
committerEike Stepper2010-05-14 08:30:47 +0000
commit2f7235c404620cce7307e55ca2d2203da59e5e33 (patch)
tree052b7bae76162736d9172580b94f62a743e03841 /plugins
parente2dc4aae287109d44c570c1483c82de21b66c149 (diff)
downloadcdo-2f7235c404620cce7307e55ca2d2203da59e5e33.tar.gz
cdo-2f7235c404620cce7307e55ca2d2203da59e5e33.tar.xz
cdo-2f7235c404620cce7307e55ca2d2203da59e5e33.zip
vserver
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/demo-server.product11
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/src-gen/templates/ConfigOverview.java43
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/DemoServer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/templates/configOverview.htmljet1
4 files changed, 33 insertions, 24 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 b0d8a3a5e9..ea2c6d6e32 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/demo-server.product
+++ b/plugins/org.eclipse.emf.cdo.examples.server/demo-server.product
@@ -3,7 +3,6 @@
<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>
@@ -22,7 +21,6 @@
<windowImages/>
-
<launcher name="cdo-server">
<solaris/>
<win useIco="false">
@@ -30,7 +28,6 @@
</win>
</launcher>
-
<vm>
</vm>
@@ -107,5 +104,13 @@
<plugin id="org.mortbay.jetty.util"/>
</plugins>
+ <configurations>
+ <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+ <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+ <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" />
+ <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
+ </configurations>
</product>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/src-gen/templates/ConfigOverview.java b/plugins/org.eclipse.emf.cdo.examples.server/src-gen/templates/ConfigOverview.java
index ad7f9190ea..f9db688a7c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/src-gen/templates/ConfigOverview.java
+++ b/plugins/org.eclipse.emf.cdo.examples.server/src-gen/templates/ConfigOverview.java
@@ -17,17 +17,18 @@ public class ConfigOverview
public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
protected final String TEXT_1 = "";
protected final String TEXT_2 = NL + NL + "<html>" + NL + " <header>" + NL + "\t <title>" + NL + "\t\t\tDemo Configuration ";
- protected final String TEXT_3 = NL + "\t </title>" + NL + "\t\t<link media=\"screen\" href=\"demo-server.css\" type=\"text/css\" rel=\"stylesheet\">" + NL + "\t<header>" + NL + "<body>" + NL + "" + NL + "<h1>Demo Configuration</h1>" + NL + "<hr>" + NL + "" + NL + "<table border=\"0\" width=\"400\">" + NL + "\t<tr><td>Server:</td><td><b>tcp://cdo.eclipse.org:";
- protected final String TEXT_4 = "</b></td></tr>" + NL + "\t<tr><td>Repository:</td><td><b>";
- protected final String TEXT_5 = "</b></td></tr>" + NL + "\t<tr><td>Mode:</td><td>";
- protected final String TEXT_6 = "</td></tr>" + NL + "\t<tr><td>User IDs:</td><td>" + NL + "\t";
- protected final String TEXT_7 = NL + "\t\t\t";
- protected final String TEXT_8 = ": ";
- protected final String TEXT_9 = "<br>";
- protected final String TEXT_10 = NL + "\t\t</td></tr>" + NL + "\t</td></tr>" + NL + "\t<tr><td>Idle Time:</td><td>";
- protected final String TEXT_11 = "</td></tr>" + NL + "\t<tr><td>&nbsp;</td><td><a href=\"?name=";
- protected final String TEXT_12 = "\">Refresh Page</a></td></tr>" + NL + "</table>" + NL + "" + NL + "</body>" + NL + "</html>";
- protected final String TEXT_13 = NL;
+ protected final String TEXT_3 = NL + "\t </title>" + NL + "\t\t<link media=\"screen\" href=\"demo-server.css\" type=\"text/css\" rel=\"stylesheet\">" + NL + "\t\t<meta http-equiv=\"refresh\" content=\"5; URL=?name=";
+ protected final String TEXT_4 = "\">" + NL + "\t<header>" + NL + "<body>" + NL + "" + NL + "<h1>Demo Configuration</h1>" + NL + "<hr>" + NL + "" + NL + "<table border=\"0\" width=\"400\">" + NL + "\t<tr><td>Server:</td><td><b>tcp://cdo.eclipse.org:";
+ protected final String TEXT_5 = "</b></td></tr>" + NL + "\t<tr><td>Repository:</td><td><b>";
+ protected final String TEXT_6 = "</b></td></tr>" + NL + "\t<tr><td>Mode:</td><td>";
+ protected final String TEXT_7 = "</td></tr>" + NL + "\t<tr><td>User IDs:</td><td>" + NL + "\t";
+ protected final String TEXT_8 = NL + "\t\t\t";
+ protected final String TEXT_9 = ": ";
+ protected final String TEXT_10 = "<br>";
+ protected final String TEXT_11 = NL + "\t\t</td></tr>" + NL + "\t</td></tr>" + NL + "\t<tr><td>Idle Time:</td><td>";
+ protected final String TEXT_12 = "</td></tr>" + NL + "\t<tr><td>&nbsp;</td><td><a href=\"?name=";
+ protected final String TEXT_13 = "\">Refresh Page</a></td></tr>" + NL + "</table>" + NL + "" + NL + "</body>" + NL + "</html>";
+ protected final String TEXT_14 = NL;
public String generate(Object argument)
{
@@ -38,30 +39,32 @@ public class ConfigOverview
stringBuffer.append(TEXT_2);
stringBuffer.append(name);
stringBuffer.append(TEXT_3);
- stringBuffer.append(DemoServer.PORT);
- stringBuffer.append(TEXT_4);
stringBuffer.append(name);
+ stringBuffer.append(TEXT_4);
+ stringBuffer.append(DemoServer.PORT);
stringBuffer.append(TEXT_5);
- stringBuffer.append(AbstractTemplateServlet.html(config.getMode().toString()));
+ stringBuffer.append(name);
stringBuffer.append(TEXT_6);
+ stringBuffer.append(AbstractTemplateServlet.html(config.getMode().toString()));
+ stringBuffer.append(TEXT_7);
Map<String, char[]> users = config.getUsers();
List<String> userIDs = new ArrayList<String>(users.keySet());
Collections.sort(userIDs);
for (String userID : userIDs)
{
- stringBuffer.append(TEXT_7);
- stringBuffer.append(userID);
stringBuffer.append(TEXT_8);
- stringBuffer.append(users.get(userID));
+ stringBuffer.append(userID);
stringBuffer.append(TEXT_9);
- }
+ stringBuffer.append(users.get(userID));
stringBuffer.append(TEXT_10);
- stringBuffer.append(AbstractTemplateServlet.html(config.formatIdleTime()));
+ }
stringBuffer.append(TEXT_11);
- stringBuffer.append(name);
+ stringBuffer.append(AbstractTemplateServlet.html(config.formatIdleTime()));
stringBuffer.append(TEXT_12);
+ stringBuffer.append(name);
stringBuffer.append(TEXT_13);
+ stringBuffer.append(TEXT_14);
return stringBuffer.toString();
}
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/DemoServer.java b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/DemoServer.java
index 74f4391623..774a52a771 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/DemoServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/DemoServer.java
@@ -33,7 +33,7 @@ public class DemoServer extends OSGiApplication
public static final int PORT = 3003;
- public static final long MAX_IDLE_TIME = 30 * 60 * 1000;
+ public static final long MAX_IDLE_TIME = 10 * 60 * 1000;
public static DemoServer INSTANCE;
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/templates/configOverview.htmljet b/plugins/org.eclipse.emf.cdo.examples.server/templates/configOverview.htmljet
index ee89f0a882..0acd5c1c5d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/templates/configOverview.htmljet
+++ b/plugins/org.eclipse.emf.cdo.examples.server/templates/configOverview.htmljet
@@ -12,6 +12,7 @@
Demo Configuration <%=name%>
</title>
<link media="screen" href="demo-server.css" type="text/css" rel="stylesheet">
+ <meta http-equiv="refresh" content="5; URL=?name=<%=name%>">
<header>
<body>

Back to the top