diff options
| author | Shawn O. Pearce <sop@google.com> | 2009-10-01 19:02:32 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <sop@google.com> | 2009-10-01 19:02:32 -0700 |
| commit | 3131241b2420969122b65085b5f58beb05bbd499 (patch) | |
| tree | eb1eb36d9dda751778f3d39807dc83fd9e80392c | |
| parent | 3e59563c136e4b5a6ba25b4449c2b756e0505080 (diff) | |
Move Jetty 6.x resources into a jetty6 directory
Jetty 7.x, with its move to the Eclipse Foundation, requires a very
different set of configuration files and supporting scripts. Move
the older 6.x style into a directory denoted for 6.x, before we add
new resources for 7.x support.
Change-Id: I8d9f88b911c1fdf00fc97ed30fbae39e9fe6a18f
Signed-off-by: Shawn O. Pearce <sop@google.com>
| -rw-r--r-- | Documentation/install.txt | 4 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml (renamed from src/main/webapp/WEB-INF/extra/jetty_gerrit.xml) | 0 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/extra/jetty6/jetty_sslproxy.xml (renamed from src/main/webapp/WEB-INF/extra/jetty_sslproxy.xml) | 0 | ||||
| -rwxr-xr-x | to_jetty.sh | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/install.txt b/Documentation/install.txt index 8ce0ab80eb..f5c7376b55 100644 --- a/Documentation/install.txt +++ b/Documentation/install.txt @@ -244,7 +244,7 @@ and they may support additional encryption algorithms: Copy Gerrit into the deployment: ==== - java -jar gerrit.war --cat extra/jetty_gerrit.xml >$JETTY_HOME/contexts/gerrit.xml + java -jar gerrit.war --cat extra/jetty6/gerrit.xml >$JETTY_HOME/contexts/gerrit.xml cp gerrit.war $JETTY_HOME/webapps/gerrit.war rm -f $JETTY_HOME/contexts/test.xml @@ -304,7 +304,7 @@ Port 443 (HTTPS / SSL) To deploy on port 443 with SSL enabled, unpack the SSL proxy handling rule into `'$JETTY_HOME'/etc`: ==== - java -jar gerrit.war --cat extra/jetty_sslproxy.xml >$JETTY_HOME/etc/jetty_sslproxy.xml + java -jar gerrit.war --cat extra/jetty6/jetty_sslproxy.xml >$JETTY_HOME/etc/jetty_sslproxy.xml ==== Create a start script like the one above, configuring Jetty to diff --git a/src/main/webapp/WEB-INF/extra/jetty_gerrit.xml b/src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml index e83c9bb431..e83c9bb431 100644 --- a/src/main/webapp/WEB-INF/extra/jetty_gerrit.xml +++ b/src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml diff --git a/src/main/webapp/WEB-INF/extra/jetty_sslproxy.xml b/src/main/webapp/WEB-INF/extra/jetty6/jetty_sslproxy.xml index 2bf77b8383..2bf77b8383 100644 --- a/src/main/webapp/WEB-INF/extra/jetty_sslproxy.xml +++ b/src/main/webapp/WEB-INF/extra/jetty6/jetty_sslproxy.xml diff --git a/to_jetty.sh b/to_jetty.sh index 0f976e47ba..5e5c61c02d 100755 --- a/to_jetty.sh +++ b/to_jetty.sh @@ -25,7 +25,7 @@ then touch "$ctx" else rm -f "$jetty/contexts/test.xml" && - java -jar $war --cat extra/jetty_gerrit.xml >"$ctx" && + java -jar $war --cat extra/jetty6/gerrit.xml >"$ctx" && echo >&2 echo >&2 "You need to copy JDBC drivers to $jetty/lib/plus" |