Merge pull request #130 from clickr/modify-root-url-instructions

Modify root url instructions

Author: adamretter

data/deployment.xml

@@ -123,9 +123,10 @@
             <para>The standard distribution does by default launch eXist-db as a web application
                 deployed in a servlet container (if you start eXist via <filename>bin/startup.sh</filename> or <filename>bin\startup.bat</filename>). The
                 container used is <ulink url="http://jetty.mortbay.org/">Jetty</ulink>.</para>
-            <para>The Jetty configuration can be found in <filename>tools/jetty/etc/jetty.xml</filename>.
-                It defines a single web application context <command>/exist</command>, mapped to the
-                    <filename>webapp</filename> directory.</para>
+            <para>The Jetty configuration can be found in <filename>tools/jetty/webapps/exist-webapp-context.xml</filename>.
+                It defines a single web application context value <command>&lt;Set name="contextPath"&gt;/exist&lt;/Set&gt;</command>, mapped to the
+                    <filename>webapp</filename> directory. This value can be set to either <command>/exist</command> or 
+		    <command>/</command>.</para>
             <para>We think that Jetty is small, efficient and stable, so there's no need to switch
                 to a different servlet engine unless your server setup requires this. However, it is
                 not difficult to deploy eXist in a different servlet container, e.g. Apache's
@@ -667,4 +668,4 @@ public class TestDB {
 			java -Dexist.initdb=true -Dexist.home=. TestDB</synopsis>
         </section>
     </chapter>
-</book>
+</book>

data/troubleshooting.xml

@@ -123,18 +123,49 @@ Logging already initialized. Skipping...
                 your system is using port 8080 or 8443, the default ports that eXist's embedded web server, Jetty, uses. To see whether this is the case, enter <ulink url="http://localhost:8080/">http://localhost:8080/</ulink> in your browser. If
                 another service occupies this port, you cannot start up eXist-db unless you shut
                 down the service in question or make eXist-db use another port. To make eXist-db use
-                another port, open the file <filename moreinfo="none">/tools/jetty/etc/jetty.xml</filename> inside your eXist-db installation in a
+                another port, open the file <filename moreinfo="none">/tools/jetty/etc/jetty-http.xml</filename> inside your eXist-db installation in a
                 text or XML editor and change the value "8080" in</para>
-            <synopsis format="linespecific">&lt;Set name="port"&gt;&lt;SystemProperty name="jetty.port" default="8080"/&gt;&lt;/Set&gt;</synopsis>
+            <synopsis format="linespecific">
+                &lt;Set name="port"&gt;
+                    &lt;Property name="jetty.http.port" deprecated="jetty.port"&gt;
+                        &lt;Default&gt;
+                            &lt;SystemProperty name="jetty.port" default="8080"/&gt;
+                        &lt;/Default&gt;
+                    &lt;/Property&gt;
+                &lt;/Set&gt;
+            </synopsis>
             <para>to a port that is not used, e.g. "8899":</para>
-            <synopsis format="linespecific">&lt;Set name="port"&gt;&lt;SystemProperty name="jetty.port" default="8899"/&gt;&lt;/Set&gt;</synopsis>
+            <synopsis format="linespecific">
+                &lt;Set name="port"&gt;
+                    &lt;Property name="jetty.http.port" deprecated="jetty.port"&gt;
+                        &lt;Default&gt;
+                            &lt;SystemProperty name="jetty.port" default="8899"/&gt;
+                        &lt;/Default&gt;
+                    &lt;/Property&gt;
+                &lt;/Set&gt;
+            </synopsis>
             <para>eXist-db uses port 8443 for confidential communication. Another service may also
-                be using this port. To make eXist-db use another port, open the file <filename moreinfo="none">/tools/jetty/etc/jetty.xml</filename> and change the value
+                be using this port. To make eXist-db use another port, open the file <filename moreinfo="none">/tools/jetty/etc/jetty-ssl.xml</filename> and change the value
                 "8443" in</para>
-            <synopsis format="linespecific">&lt;Set name="confidentialPort"&gt;8443&lt;/Set&gt;</synopsis>
-            <para>and</para>
-            <synopsis format="linespecific">&lt;Set name="Port"&gt;8443&lt;/Set&gt;</synopsis>
+            <synopsis format="linespecific">
+                &lt;Set name="port"&gt;
+                    &lt;Property name="jetty.ssl.port" deprecated="ssl.port"&gt;
+                        &lt;Default&gt;
+                            &lt;SystemProperty name="jetty.ssl.port" deprecated="ssl.port" default="8443"/&gt;
+                        &lt;/Default&gt;
+                    &lt;/Property&gt;
+                &lt;/Set&gt;
+            </synopsis>         
             <para>to a port that is not used, e.g. "8444".</para>
+            <synopsis format="linespecific">
+                 &lt;Set name="port"&gt;
+                    &lt;Property name="jetty.ssl.port" deprecated="ssl.port"&gt;
+                        &lt;Default&gt;
+                            &lt;SystemProperty name="jetty.ssl.port" deprecated="ssl.port" default="8444"/&gt;
+                        &lt;/Default&gt;
+                    &lt;/Property&gt;
+                &lt;/Set&gt;
+            </synopsis>
             <para>If these scripts do not launch eXist-db, you can launch it by changing to the
                 directory where you installed eXist-db and entering the following into the
                 console:</para>