summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2009-05-14 14:07:06 -0700
committerShawn O. Pearce <sop@google.com>2009-05-14 14:07:06 -0700
commite24fa7d812e21f873dd01683dc28f9b34c82429f (patch)
tree31c78b98e468227cad3ba58ff1fcab07c6520171
parente261bddc95ce97fb4133db40076db68b5c008e50 (diff)
Describe MySQL and H2 setup in jetty_gerrit.xml template
This makes it easier to configure Gerrit for MySQL or H2 database backends, if one of those is preferred by the end user. Signed-off-by: Shawn O. Pearce <sop@google.com>
-rw-r--r--src/main/webapp/WEB-INF/extra/jetty_gerrit.xml18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/main/webapp/WEB-INF/extra/jetty_gerrit.xml b/src/main/webapp/WEB-INF/extra/jetty_gerrit.xml
index 9b1f943367..a3af9df4f3 100644
--- a/src/main/webapp/WEB-INF/extra/jetty_gerrit.xml
+++ b/src/main/webapp/WEB-INF/extra/jetty_gerrit.xml
@@ -3,15 +3,15 @@
<!--
Jetty configuration to place "gerrit.war" into the root context,
- so it answers to old-style URLs like "/$changeid" and "/mine".
+ so it answers to simple URLs like "/$changeid" and "/mine".
* Copy this file to $JETTY_HOME/contexts/gerrit.xml
* Edit user, password, jdbcUrl as necessary below for database.
* Edit mail.smtp.host, user, password as necessary for outgoing SMTP.
- * Copy jdbc/c3p0-0.9.1.2.jar to $JETTY_HOME/lib/plus/
- * Copy jdbc/postgresql-*.jdbc*.jar to $JETTY_HOME/lib/plus/
- * Copy www/gerrit-*.war to $JETTY_HOME/webapps/gerrit.war
+ * Copy c3p0-0.9.1.2.jar to $JETTY_HOME/lib/plus/
+ * Copy JDBC driver to $JETTY_HOME/lib/plus/
+ * Copy www/gerrit-*.war to $JETTY_HOME/webapps/gerrit.war
* Make sure you remove $JETTY_HOME/context/test.xml
@@ -38,10 +38,20 @@
<Arg>jdbc/ReviewDb</Arg>
<Arg>
<New class="com.mchange.v2.c3p0.ComboPooledDataSource">
+<!-- PostgreSQL
<Set name="driverClass">org.postgresql.Driver</Set>
<Set name="jdbcUrl">jdbc:postgresql:reviewdb</Set>
<Set name="user">gerrit2</Set>
<Set name="password">secretkey</Set>
+-->
+<!-- MySQL
+ <Set name="driverClass">com.mysql.jdbc.Driver</Set>
+ <Set name="jdbcUrl">jdbc:mysql://localhost/reviewdb?user=gerrit2&password=secretkey</Set>
+-->
+<!-- H2
+ <Set name="driverClass">org.h2.Driver</Set>
+ <Set name="jdbcUrl">jdbc:h2:file:ReviewDb</Set>
+-->
</New>
</Arg>
</New>