[DS-297] Move PostgreSQL-specific SQL into etc/postgres for greater clarity

git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@4427 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2025-10-13 04:53:16 +00:00 · 2009-10-09 22:42:19 +00:00
parent dd499261d4
commit c49f1c8385
12 changed files with 167 additions and 166 deletions
--- a/dspace/CHANGES
+++ b/dspace/CHANGES
@@ -58,6 +58,7 @@
 - [DS-333] Adjust SWORD ingest crosswalk to store bibliographic citation
 (Larry Stone)
 - [DS-297] Move PostgreSQL-specific SQL into etc/postgres for greater clarity
 - [DS-338] Disable cache advice (Expires header) on Bitstream download that requires authorization (XMLUI)
 - [DS-285] Respond to If-Modified-Since request header in XMLUI, also provide Last-Modified response header for Bitstreams
 - [DS-288] Configurable option to hide metadata fields in public UIs and OAI-PMH
--- a/dspace/docs/docbook/directories.xml
+++ b/dspace/docs/docbook/directories.xml
@@ -92,8 +92,12 @@
                    <para><literal>docs/</literal>  - DSpace system documentation. The technical documentation for functionality, installation, configuration, etc.</para>
                  </listitem>
                  <listitem>
-                    <para><literal>etc/</literal>  - Miscelleanous configuration need to install DSpace that isn&apos;t really to do with system configuration - e.g. the PostgreSQL database schema, and a couple of configuration files that are used during the build process but not by the live system. Also contains the deployment descriptors (<literal>web.xml</literal> files) for the Web UI and OAI-PMH support <literal>.war</literal> files. </para>
+                    <para><literal>etc/</literal>  -
 This directory contains administrative files needed for the install process and by developers, mostly database initialization and upgrade scripts. Any <literal>.xml</literal> files in <literal>etc/</literal> are common to all supported database systems.</para>
                    <itemizedlist>
                      <listitem>
                        <para><literal>postgres/</literal>  - Versions of the database schema and updater SQL scripts for PostgreSQL.</para>
                      </listitem>
                      <listitem>
                        <para><literal>oracle/</literal>  - Versions of the database schema and updater SQL scripts for Oracle.</para>
                      </listitem>
@@ -417,5 +421,3 @@ Manakin)"/>Contents of XMLUI Web Application (aka Manakin)</title>
      </table>
    </section>
  </chapter>
--- a/dspace/docs/docbook/install.xml
+++ b/dspace/docs/docbook/install.xml
@@ -93,13 +93,13 @@ URIEncoding=&quot;UTF-8&quot;
 &lt;!-- Define a non-SSL HTTP/1.1 Connector on port 8080 --&gt;
 &lt;Connector port=&quot;8080&quot;
           maxThreads=&quot;150&quot; minSpareThreads=&quot;25&quot;
-	maxSpareThreads=&quot;75&quot;
+        maxSpareThreads=&quot;75&quot;
           enableLookups=&quot;false&quot; redirectPort=&quot;8443&quot;
-	acceptCount=&quot;100&quot;
+        acceptCount=&quot;100&quot;
           connectionTimeout=&quot;20000&quot;
-	disableUploadTimeout=&quot;true&quot;
+        disableUploadTimeout=&quot;true&quot;
           <emphasis role="bold"> URIEncoding=&quot;UTF-8&quot;</emphasis>
-	/&gt;
+        /&gt;
 </screen>
             <para> You may change the port from 8080 by editing it in the file above, and by setting the variable CONNECTOR_PORT in tomcat.conf</para>
          </listitem>
@@ -309,14 +309,6 @@ db.url    = jdbc:oracle:thin:@//host:port/dspace
 db.driver = oracle.jdbc.OracleDriver
 </screen>
              </listitem>
              <listitem>
                <para> Go to <literal>[dspace-source]/dspace/etc/oracle</literal> and copy the contents to their parent directory, overwriting the versions in the parent:</para>
                <screen>
 cd [dspace-source]/dspace/etc/oracle
 cp * ..
 </screen>
                <para>You now have Oracle-specific <literal>.sql</literal> files in your <literal>etc</literal> directory, and your dspace.cfg is modified to point to your Oracle database.</para>
              </listitem>
            </orderedlist>
            </listitem>
          <listitem>
@@ -363,7 +355,7 @@ mvn -Ddb.name=oracle package
            <para> As the <literal>dspace</literal> UNIX user, initialize the DSpace database and install DSpace to <literal>[dspace]</literal>:</para>
            <screen>
 cd <emphasis>
-	[dspace-source]</emphasis>/dspace/target/dspace-[version].dir/
+        [dspace-source]</emphasis>/dspace/target/dspace-[version].dir/
 ant fresh_install
 </screen>
            <para><emphasis role="bold">Note:</emphasis> to see a complete list of build targets, run</para>
@@ -377,20 +369,20 @@ ant help
            <screen>
 &lt;!-- DEFINE A CONTEXT PATH FOR DSpace JSP User Interface  --&gt;
 &lt;Context path=&quot;/jspui&quot; docBase=&quot;[dspace]\webapps\jspui&quot; debug=&quot;0&quot;
-	reloadable=&quot;true&quot; cachingAllowed=&quot;false&quot;
+        reloadable=&quot;true&quot; cachingAllowed=&quot;false&quot;
-	allowLinking=&quot;true&quot;/&gt;
+        allowLinking=&quot;true&quot;/&gt;
 &lt;!-- DEFINE A CONTEXT PATH FOR DSpace OAI User Interface  --&gt;
 &lt;Context path=&quot;/oai&quot; docBase=&quot;[dspace]\webapps\oai&quot; debug=&quot;0&quot;
-	reloadable=&quot;true&quot; cachingAllowed=&quot;false&quot;
+        reloadable=&quot;true&quot; cachingAllowed=&quot;false&quot;
-	allowLinking=&quot;true&quot;/&gt;
+        allowLinking=&quot;true&quot;/&gt;
 </screen>
            <para>Alternatively, you could copy only the DSpace Web application(s) you wish to use from <literal>[dspace]/webapps</literal> to the appropriate directory in your Tomcat/Jetty/Resin installation. For example:</para>
            <screen>
 cp -r <emphasis> [dspace]</emphasis>/webapps/jspui <emphasis>
-	[tomcat]</emphasis>/webapps
+        [tomcat]</emphasis>/webapps
 cp -r <emphasis> [dspace]</emphasis>/webapps/oai <emphasis>
-	[tomcat]</emphasis>/webapps
+        [tomcat]</emphasis>/webapps
 </screen>
          </listitem>
          <listitem>
@@ -438,7 +430,7 @@ crontab -e
 0 3 * * * <emphasis> [dspace]</emphasis>/bin/checker -lp
 # Mail the results to the sysadmin at 04:00
 0 4 * * * <emphasis> [dspace]</emphasis>/bin/dsrun org.dspace.checker.DailyReportEmailer
-	-c
+        -c
 </screen>
        <para>Naturally you should change the frequencies to suit your environment.</para>
        <para>PostgreSQL also benefits from regular &apos;vacuuming&apos;, which optimizes the indices and clears out any deleted data. Become the <literal>postgres</literal> UNIX user, run <literal>crontab -e</literal> and add (for example):</para>
@@ -481,24 +473,24 @@ crontab -e
                  <para> Create a Java keystore for your server with the password <literal>changeit</literal>, and install your server certificate under the alias <literal>&quot;tomcat&quot;</literal>. This assumes the certificate was put in the file <literal>server.pem</literal>:</para>
                  <screen>
 $JAVA_HOME/bin/keytool -import -noprompt -v -storepass changeit
-	-keystore $CATALINA_BASE/conf/keystore -alias tomcat -file
+        -keystore $CATALINA_BASE/conf/keystore -alias tomcat -file
-	myserver.pem
+        myserver.pem
 </screen>
                </listitem>
                <listitem>
                  <para> Install the CA (Certifying Authority) certificate for the CA that granted your server cert, if necessary. This assumes the server CA certificate is in <literal>ca.pem</literal>:</para>
                  <screen>
 $JAVA_HOME/bin/keytool -import -noprompt -storepass changeit
-	-trustcacerts -keystore $CATALINA_BASE/conf/keystore -alias ServerCA
+        -trustcacerts -keystore $CATALINA_BASE/conf/keystore -alias ServerCA
-	-file ca.pem
+        -file ca.pem
 </screen>
                </listitem>
                <listitem>
                  <para> Optional -- ONLY if you need to accept client certificates for the X.509 certificate stackable authentication module See the <link linkend="docbook-configure.html-authenticate">configuration section</link> for instructions on enabling the X.509 authentication method. Load the keystore with the CA (certifying authority) certificates for the authorities of any clients whose certificates you wish to accept. For example, assuming the client CA certificate is in <literal>client1.pem</literal>:</para>
                  <screen>
 $JAVA_HOME/bin/keytool -import -noprompt -storepass changeit
-	-trustcacerts -keystore $CATALINA_BASE/conf/keystore  -alias client1
+        -trustcacerts -keystore $CATALINA_BASE/conf/keystore  -alias client1
-	-file client1.pem
+        -file client1.pem
 </screen>
                </listitem>
                <listitem>
@@ -506,25 +498,25 @@ crontab -e
                  <screen>
    &lt;Connector port=&quot;8443&quot;
               maxThreads=&quot;150&quot; minSpareThreads=&quot;25&quot;
-	maxSpareThreads=&quot;75&quot;
+        maxSpareThreads=&quot;75&quot;
               enableLookups=&quot;false&quot;
-	disableUploadTimeout=&quot;true&quot;
+        disableUploadTimeout=&quot;true&quot;
                 acceptCount=&quot;100&quot; debug=&quot;0&quot;
                 <emphasis role="bold"> scheme=&quot;https&quot; secure=&quot;true&quot; sslProtocol=&quot;TLS&quot;
-	keystoreFile=&quot;conf/keystore&quot; keystorePass=&quot;changeit&quot; clientAuth=&quot;true&quot;</emphasis>
+        keystoreFile=&quot;conf/keystore&quot; keystorePass=&quot;changeit&quot; clientAuth=&quot;true&quot;</emphasis>
-	<emphasis> - ONLY if using client X.509 certs for authentication!</emphasis> <emphasis role="bold">
+        <emphasis> - ONLY if using client X.509 certs for authentication!</emphasis> <emphasis role="bold">
-	truststoreFile=&quot;conf/keystore&quot; trustedstorePass=&quot;changeit&quot;</emphasis>
+        truststoreFile=&quot;conf/keystore&quot; trustedstorePass=&quot;changeit&quot;</emphasis>
-	/&gt;
+        /&gt;
 </screen>
                  <para> Also, check that the default Connector is set up to redirect &quot;secure&quot; requests to the same port as your SSL connector, e.g.: </para>
                  <screen>
 &lt;Connector port=&quot;8080&quot;
                 maxThreads=&quot;150&quot; minSpareThreads=&quot;25&quot;
-	maxSpareThreads=&quot;75&quot;
+        maxSpareThreads=&quot;75&quot;
                 enableLookups=&quot;false&quot; <emphasis role="bold">
-	redirectPort=&quot;8443&quot;</emphasis>
+        redirectPort=&quot;8443&quot;</emphasis>
                 acceptCount=&quot;100&quot; debug=&quot;0&quot;
-	/&gt;
+        /&gt;
 </screen>
                </listitem>
              </orderedlist>
@@ -543,11 +535,11 @@ crontab -e
                      <para> Create a new key pair under the alias name <literal>&quot;tomcat&quot;</literal>. When generating your key, give the Distinguished Name fields the appropriate values for your server and institution. CN should be the fully-qualified domain name of your server host. Here is an example:</para>
                      <screen>
 $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize
-	1024 \
+        1024 \
  -keystore $CATALINA_BASE/conf/keystore -storepass changeit
-	-validity 365 \
+        -validity 365 \
  -dname &apos;CN=dspace.myuni.edu, OU=MIT Libraries, O=Massachusetts
-	Institute of Technology, L=Cambridge, S=MA, C=US&apos;
+        Institute of Technology, L=Cambridge, S=MA, C=US&apos;
 </screen>
                    </listitem>
@@ -555,7 +547,7 @@ $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize
                      <para> Then, create a <emphasis>CSR</emphasis> (Certificate Signing Request) and send it to your Certifying Authority. They will send you back a signed Server Certificate. This example command creates a CSR in the file <literal>tomcat.csr</literal></para>
                      <screen>
 $JAVA_HOME/bin/keytool -keystore $CATALINA_BASE/conf/keystore
-	-storepass changeit \
+        -storepass changeit \
   -certreq -alias tomcat -v -file tomcat.csr
 </screen>
                    </listitem>
@@ -563,7 +555,7 @@ $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize
                      <para> Before importing the signed certificate, you must have the CA&apos;s certificate in your keystore as a <emphasis>trusted certificate</emphasis>. Get their certificate, and import it with a command like this (for the example <literal>mitCA.pem</literal>):</para>
                      <screen>
 $JAVA_HOME/bin/keytool -keystore $CATALINA_BASE/conf/keystore
-	-storepass changeit \
+        -storepass changeit \
     -import -alias mitCA -trustcacerts -file mitCA.pem
 </screen>
                    </listitem>
@@ -571,7 +563,7 @@ $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize
                      <para> Finally, when you get the signed certificate from your CA, import it into the keystore with a command like the following example: (cert is in the file <literal>signed-cert.pem</literal>)</para>
                      <screen>
 $JAVA_HOME/bin/keytool -keystore $CATALINA_BASE/conf/keystore
-	-storepass changeit \
+        -storepass changeit \
     -import -alias tomcat -trustcacerts -file signed-cert.pem
 </screen>
                      <para> Since you now have a signed server certificate in your keystore, you can, obviously, skip the next steps of installing a signed server certificate and the server CA&apos;s certificate.</para>
@@ -582,7 +574,7 @@ $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize
                  <para> Create a Java keystore for your server with the password <literal>changeit</literal>, and install your server certificate under the alias <literal>&quot;tomcat&quot;</literal>. This assumes the certificate was put in the file <literal>server.pem</literal>:</para>
                  <screen>
 $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keystore
-	$CATALINA_BASE/conf/keystore -storepass changeit
+        $CATALINA_BASE/conf/keystore -storepass changeit
 </screen>
                  <para>When answering the questions to identify the certificate, be sure to respond to &quot;First and last name&quot; with the fully-qualified domain name of your server (e.g. <literal>test-dspace.myuni.edu</literal>). The other questions are not important.</para>
                </listitem>
@@ -590,8 +582,8 @@ $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize
                  <para> Optional -- ONLY if you need to accept client certificates for the X.509 certificate stackable authentication module See the <link linkend="docbook-configure.html-authenticate">configuration section</link> for instructions on enabling the X.509 authentication method. Load the keystore with the CA (certifying authority) certificates for the authorities of any clients whose certificates you wish to accept. For example, assuming the client CA certificate is in <literal>client1.pem</literal>:</para>
                  <screen>
 $JAVA_HOME/bin/keytool -import -noprompt -storepass changeit
-	-trustcacerts -keystore $CATALINA_BASE/conf/keystore  -alias client1
+        -trustcacerts -keystore $CATALINA_BASE/conf/keystore  -alias client1
-	-file client1.pem
+        -file client1.pem
 </screen>
                </listitem>
                <listitem>
@@ -610,11 +602,11 @@ $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize
 add these configuration options to the appropriate <emphasis>httpd</emphasis> configuration file, e.g. <literal>ssl.conf</literal>, and be sure they are in force for the virtual host and namespace locations dedicated to DSpace:</para>
          <screen>
        ##  SSLVerifyClient can be &quot;optional&quot; or
-	&quot;require&quot;
+        &quot;require&quot;
        SSLVerifyClient optional
        SSLVerifyDepth  10
        SSLCACertificateFile  <emphasis>
-	path-to-your-client-CA-certificate</emphasis>
+        path-to-your-client-CA-certificate</emphasis>
        SSLOptions StdEnvVars ExportCertData
 </screen>
@@ -648,7 +640,7 @@ java -cp /hs/bin/handle.jar net.handle.server.SimpleSetup /hs/svr_1
            <para> as directed in the <ulink url="http://hdl.handle.net/4263537/4093">Handle Server Administration Guide</ulink>, you should run </para>
            <screen>
 <emphasis> [dspace]</emphasis>/bin/dsrun net.handle.server.SimpleSetup <emphasis>
-	[dspace]</emphasis>/handle-server
+        [dspace]</emphasis>/handle-server
 </screen>
            <para> ensuring that <literal>[dspace]/handle-server</literal> matches whatever you have in <literal>dspace.cfg</literal> for the <literal>handle.dir</literal> property.</para>
          </listitem>
@@ -657,7 +649,7 @@ java -cp /hs/bin/handle.jar net.handle.server.SimpleSetup /hs/svr_1
            <screen>
 &quot;storage_type&quot; = &quot;CUSTOM&quot;
 &quot;storage_class&quot; =
-	&quot;org.dspace.handle.HandlePlugin&quot;
+        &quot;org.dspace.handle.HandlePlugin&quot;
 </screen>
            <para>This tells the Handle server to get information about individual Handles from the DSpace code.</para>
          </listitem>
@@ -815,13 +807,13 @@ ant help
                <screen>
 &lt;!-- DEFINE A CONTEXT PATH FOR DSpace JSP User Interface  --&gt;
 &lt;Context path=&quot;/jspui&quot; docBase=&quot;[dspace]\webapps\jspui&quot; debug=&quot;0&quot;
-	reloadable=&quot;true&quot; cachingAllowed=&quot;false&quot;
+        reloadable=&quot;true&quot; cachingAllowed=&quot;false&quot;
-	allowLinking=&quot;true&quot;/&gt;
+        allowLinking=&quot;true&quot;/&gt;
 &lt;!-- DEFINE A CONTEXT PATH FOR DSpace OAI User Interface  --&gt;
 &lt;Context path=&quot;/oai&quot; docBase=&quot;[dspace]\webapps\oai&quot; debug=&quot;0&quot;
-	reloadable=&quot;true&quot; cachingAllowed=&quot;false&quot;
+        reloadable=&quot;true&quot; cachingAllowed=&quot;false&quot;
-	allowLinking=&quot;true&quot;/&gt;
+        allowLinking=&quot;true&quot;/&gt;
 </screen>
              </listitem>
            </itemizedlist>
@@ -854,15 +846,15 @@ ant help
          <listitem>
            <para> There are two common errors that occur. If your error looks like this--</para>
            <screen>
-[java] 2004-03-25 15:17:07,730 INFO 
+[java] 2004-03-25 15:17:07,730 INFO
-	org.dspace.storage.rdbms.InitializeDatabase @ Initializing Database
+        org.dspace.storage.rdbms.InitializeDatabase @ Initializing Database
 [java] 2004-03-25 15:17:08,816 FATAL
-	org.dspace.storage.rdbms.InitializeDatabase @ Caught exception:
+        org.dspace.storage.rdbms.InitializeDatabase @ Caught exception:
 [java] org.postgresql.util.PSQLException: Connection refused. Check
-	that the hostname and port are correct and that the postmaster is
+        that the hostname and port are correct and that the postmaster is
-	accepting TCP/IP connections.
+        accepting TCP/IP connections.
 [java]     at
-	org.postgresql.jdbc1.AbstractJdbc1Connection.openConnection(AbstractJd
+        org.postgresql.jdbc1.AbstractJdbc1Connection.openConnection(AbstractJd
 bc1Connection.java:204)
 [java]     at org.postgresql.Driver.connect(Driver.java:139)
 </screen>
@@ -874,17 +866,17 @@ psql -U dspace -W -h localhost
            <para>Enter the <literal>dspace</literal><emphasis>database</emphasis> password, and you should be dropped into the psql tool with a <literal>dspace=&gt;</literal> prompt.</para>
            <para>Another common error looks like this:</para>
            <screen>
-[java] 2004-03-25 16:37:16,757 INFO 
+[java] 2004-03-25 16:37:16,757 INFO
-	org.dspace.storage.rdbms.InitializeDatabase @ Initializing Database
+        org.dspace.storage.rdbms.InitializeDatabase @ Initializing Database
-[java] 2004-03-25 16:37:17,139 WARN 
+[java] 2004-03-25 16:37:17,139 WARN
-	org.dspace.storage.rdbms.DatabaseManager @ Exception initializing DB
+        org.dspace.storage.rdbms.DatabaseManager @ Exception initializing DB
-	pool
+        pool
 [java] java.lang.ClassNotFoundException: org.postgresql.Driver
 [java]     at java.net.URLClassLoader$1.run(URLClassLoader.java:198)
 [java]     at java.security.AccessController.doPrivileged(Native
-	Method)
+        Method)
 [java]     at
-	java.net.URLClassLoader.findClass(URLClassLoader.java:186)
+        java.net.URLClassLoader.findClass(URLClassLoader.java:186)
 </screen>
            <para>This means that the PostgreSQL JDBC driver is not present in <literal>[dspace-source]/lib</literal>. <link linkend="docbook-install.html-pgdriver">See above.</link></para>
          </listitem>
@@ -909,12 +901,12 @@ ps -ef | grep postgres
            <para>You might see some processes like this</para>
            <screen>
 dspace 16325  1997  0  Feb 14  ?         0:00 postgres: dspace dspace
-	127.0.0.1 idle in transaction
+        127.0.0.1 idle in transaction
 </screen>
            <para>This is normal--DSpace maintains a &apos;pool&apos; of open database connections, which are re-used to avoid the overhead of constantly opening and closing connections. If they&apos;re &apos;idle&apos; it&apos;s OK; they&apos;re waiting to be used. However sometimes, if something went wrong, they might be stuck in the middle of a query, which seems to prevent other connections from operating, e.g.:</para>
            <screen>
 dspace 16325  1997  0  Feb 14  ?         0:00 postgres: dspace dspace
-	127.0.0.1 SELECT
+        127.0.0.1 SELECT
 </screen>
            <para>This means the connection is in the middle of a <literal>SELECT</literal> operation, and if you&apos;re not using DSpace right that instant, it&apos;s probably a &apos;zombie&apos; connection. If this is the case, try <literal>kill</literal>ing the process, and stopping and restarting Tomcat.</para>
          </listitem>
--- a/dspace/docs/docbook/storage.xml
+++ b/dspace/docs/docbook/storage.xml
@@ -13,8 +13,18 @@
      <para>Most of the functionality that DSpace uses can be offered by any standard SQL database that supports transactions. Presently, the browse indices use some features specific to <ulink url="http://www.postgresql.org/">PostgreSQL</ulink> and <ulink url="http://www.oracle.com/database/">Oracle</ulink>, so some modification to the code would be needed before DSpace would function fully with an alternative database back-end.</para>
      <para>The <literal>org.dspace.storage.rdbms</literal> package provides access to an SQL database in a somewhat simpler form than using JDBC directly. The main class is <literal>DatabaseManager</literal>, which executes SQL queries and returns <literal>TableRow</literal> or <literal>TableRowIterator</literal> objects. The <literal>InitializeDatabase</literal> class is used to load SQL into the database via JDBC, for example to set up the schema.</para>
      <para>All calls to the <literal>Database Manager</literal> require a <link linkend="docbook-business.html-core">DSpace <literal>Context</literal> object</link>. Example use of the database manager API is given in the <literal>org.dspace.storage.rdbms</literal> package Javadoc.</para>
-      <para>The database schema used by DSpace (for PostgreSQL) is stored in <literal>[dspace-source]/dspace/etc/database_schema.sql</literal> in the source distribution. It is stored in the form of SQL that can be fed straight into the DBMS to construct the database. The schema SQL file also directly creates two e-person groups in the database that are required for the system to function properly.</para>
+
-      <para>Also in <literal>[dspace-source]/dspace/etc</literal> are various SQL files called <literal>database_schema_1x_1y</literal>. These contain the necessary SQL commands to update a live DSpace database from version 1.<literal>x</literal> to 1.<literal>y</literal>. Note that this might not be the only part of an upgrade process: see <link linkend="docbook-update.html">Updating a DSpace Installation</link> for details.</para>
+      <para>The database schema used by DSpace is created by SQL statements stored in a directory specific to each supported RDBMS platform:
        <itemizedlist>
          <listitem>
            <para>PostgreSQL schemas are in <literal>[dspace-source]/dspace/etc/postgres/</literal></para>
          </listitem>
          <listitem>
            <para>Oracle schemas are in <literal>[dspace-source]/dspace/etc/oracle/</literal></para>
          </listitem>
        </itemizedlist>
      The SQL (DDL) statements to create the tables for the current release, starting with an empty database, aer in <literal>database_schema.sql</literal>. The schema SQL file also creates the two required e-person groups (<literal>Anonymous</literal> and <literal>Administrator</literal>) that are required for the system to function properly.</para>
      <para>Also in <literal>[dspace-source]/dspace/etc/[database]</literal> are various SQL files called <literal>database_schema_1x_1y</literal>. These contain the necessary SQL commands to update a live DSpace database from version 1.<literal>x</literal> to 1.<literal>y</literal>. Note that this might not be the only part of an upgrade process: see <link linkend="docbook-update.html">Updating a DSpace Installation</link> for details.</para>
      <para>The DSpace database code uses an SQL function <literal>getnextid</literal> to assign primary keys to newly created rows. This SQL function must be safe to use if several JVMs are accessing the database at once; for example, the Web UI might be creating new rows in the database at the same time as the batch item importer. The PostgreSQL-specific implementation of the method uses <literal>SEQUENCES</literal> for each table in order to create new IDs. If an alternative database backend were to be used, the implementation of <literal>getnextid</literal> could be updated to operate with that specific DBMS.</para>
      <para>The <literal>etc</literal> directory in the source distribution contains two further SQL files. <literal>clean-database.sql</literal> contains the SQL necessary to completely clean out the database, so use with caution! The Ant target <literal>clean_database</literal> can be used to execute this. <literal>update-sequences.sql</literal> contains SQL to reset the primary key generation sequences to appropriate values. You&apos;d need to do this if, for example, you&apos;re restoring a backup database dump which creates rows with specific primary keys already defined. In such a case, the sequences would allocate primary keys that were already used.</para>
      <para>Versions of the <literal>*.sql*</literal> files for Oracle are stored in <literal>[dspace-source]/dspace/etc/oracle</literal>. These need to be copied over their PostgreSQL counterparts in <literal>[dspace-source]/dspace/etc</literal> prior to installation.</para>
@@ -24,7 +34,7 @@
        <screen>
 # clean up the database nightly
 40 2 * * * /usr/local/pgsql/bin/vacuumdb --analyze dspace &gt; /dev/null
-	2&gt;&amp;1
+        2&gt;&amp;1
 </screen>
        <para>The DSpace database can be backed up and restored using usual methods, for example with <literal>pg_dump</literal> and <literal>psql</literal>. However when restoring a database, you will need to perform these additional steps:</para>
        <itemizedlist>
@@ -40,7 +50,7 @@ DELETE FROM epersongroup;
            <para> After restoring a backup, you will need to reset the primary key generation sequences so that they do not produce already-used primary keys. Do this by executing the SQL in <literal>[dspace-source]/dspace/etc/update-sequences.sql</literal>, for example with:</para>
            <screen>
 psql -U dspace -f <emphasis>
-	[dspace-source]</emphasis>/dspace/etc/update-sequences.sql
+        [dspace-source]</emphasis>/dspace/etc/update-sequences.sql
 </screen>
          </listitem>
        </itemizedlist>
@@ -251,5 +261,3 @@ srb.parentdir.1 = mysrbdspaceassetstore
      </section>
    </section>
  </chapter>
--- a/dspace/docs/docbook/update.xml
+++ b/dspace/docs/docbook/update.xml
@@ -4,7 +4,7 @@
    <para>This section describes how to update a DSpace installation from one version to the next. Details of the differences between the functionality of each version are given in the <link linkend="docbook-history.html">Version History</link> section.</para>
    <section remap="h2">
      <title><anchor id="docbook-update.html-15_152" xreflabel="Updating From 1.5 or 1.5.1 to 1.5.2"/>Updating From 1.5 or 1.5.1 to 1.5.2</title>
-      <para>This section needs review</para>    
+      <para>This section needs review</para>
      <para>The changes in DSpace 1.5.2 do not include any database schema upgrades, and the upgrade should be straightforward. </para>
      <para>In the notes below <literal>[dspace]</literal> refers to the install directory for your existing DSpace installation, and <literal>[dspace-source]</literal> to the source directory for DSpace 1.5. Whenever you see these path references, be sure to replace them with the actual path names on your local system.</para>
      <orderedlist>
@@ -55,12 +55,12 @@ ant -Dconfig=[dspace]/config/dspace.cfg update
 cd [dspace-source]/dspace/target/dspace-1.5-build.dir/
 ant -Dconfig=[dspace]/config/dspace.cfg update_configs
 </screen>
-		<para>You must then verify that you've merged and differenced in the <literal>[dspace]/config/**/*.new</literal> files into your configuration.</para>
+                <para>You must then verify that you've merged and differenced in the <literal>[dspace]/config/**/*.new</literal> files into your configuration.</para>
-		<para>Some of the new parameters you should look out for in dspace.cfg include: </para>
+                <para>Some of the new parameters you should look out for in dspace.cfg include: </para>
          <itemizedlist>
            <listitem>
-		<para>New option to restrict the expose of private items. The following needs to be added to dspace.cfg:</para>
+                <para>New option to restrict the expose of private items. The following needs to be added to dspace.cfg:</para>
-		<screen>
+                <screen>
 #### Restricted item visibility settings ###
 # By default RSS feeds, OAI-PMH and subscription emails will include ALL items
 # regardless of permissions set on them.
@@ -71,10 +71,10 @@ ant -Dconfig=[dspace]/config/dspace.cfg update_configs
 #harvest.includerestricted.oai = true
 #harvest.includerestricted.subscription = true
 </screen>
-			</listitem>
+                        </listitem>
            <listitem>
            <para>  Special groups for LDAP and password authentication. </para>
-			<screen>
+                        <screen>
 ##### Password users group #####
 # If required, a group name can be given here, and all users who log in
@@ -90,10 +90,10 @@ ant -Dconfig=[dspace]/config/dspace.cfg update_configs
 # if you want a group made up of all internal authenticated users.
 #ldap.login.specialgroup = group-name
 </screen>
-			</listitem>
+                        </listitem>
            <listitem>
            <para>new option for case insensitivity in browse tables. </para>
-			<screen>
+                        <screen>
 # By default, the display of metadata in the browse indexes is case sensitive
 # So, you will get separate entries for the terms
 #
@@ -112,7 +112,7 @@ ant -Dconfig=[dspace]/config/dspace.cfg update_configs
 #
 # webui.browse.metadata.case-insensitive = true
 </screen>
-			</listitem>
+                        </listitem>
            <listitem>
            <para>New usage event handler for collecting statistics:</para>
            <screen>
@@ -121,7 +121,7 @@ ant -Dconfig=[dspace]/config/dspace.cfg update_configs
 # plugin.single.org.dspace.app.statistics.AbstractUsageEvent = \
 #   org.dspace.app.statistics.PassiveUsageEvent
 </screen>
-			</listitem>
+                        </listitem>
            <listitem>
            <para>The location where sitemaps are stored is now configurable.</para>
            <screen>
@@ -129,13 +129,13 @@ ant -Dconfig=[dspace]/config/dspace.cfg update_configs
 # the directory where the generated sitemaps are stored
 sitemap.dir = ${dspace.dir}/sitemaps
 </screen>
-			</listitem>
+                        </listitem>
            <listitem>
            <para>MARC 21 ordering should now be used as default. Unless you have it set already, or you have it set to a different value, the following should be set:</para>
            <screen>
 plugin.named.org.dspace.sort.OrderFormatDelegate = org.dspace.sort.OrderFormatTitleMarc21=title
 </screen>
-			</listitem>
+                        </listitem>
            <listitem>
            <para>Hierarchical LDAP support.</para>
            <screen>
@@ -159,7 +159,7 @@ plugin.named.org.dspace.sort.OrderFormatDelegate = org.dspace.sort.OrderFormatTi
 # one level scope : 1
 # subtree scope : 2
 #ldap.search_scope = 2
-	 
+         
 # The full DN and password of a user allowed to connect to the LDAP server
 # and search for the DN of the user trying to log in.  If these are not specified,
 # the initial bind will be performed anonymously.
@@ -173,7 +173,7 @@ plugin.named.org.dspace.sort.OrderFormatDelegate = org.dspace.sort.OrderFormatTi
 # to be 'user@example.com
 #ldap.netid_email_domain = @example.com
 </screen>
-			</listitem>
+                        </listitem>
            <listitem>
            <para>Shibboleth authentication support.</para>
            <screen>
@@ -181,7 +181,7 @@ plugin.named.org.dspace.sort.OrderFormatDelegate = org.dspace.sort.OrderFormatTi
 # Check https://mams.melcoe.mq.edu.au/zope/mams/pubs/Installation/dspace15/view
 # for installation detail.
 #
-#	org.dspace.authenticate.ShibAuthentication
+#       org.dspace.authenticate.ShibAuthentication
 #
 # DSpace requires email as user's credential. There are 2 ways of providing
 # email to DSpace:
@@ -198,7 +198,7 @@ authentication.shib.email-header = MAIL
 # optional. Specify the header that carries user's first name
 # this is going to be used for creation of new-user
-authentication.shib.firstname-header = SHIB-EP-GIVENNAME 
+authentication.shib.firstname-header = SHIB-EP-GIVENNAME
 # optional. Specify the header that carries user's last name
 # this is used for creation of new user
@@ -242,7 +242,7 @@ authentication.shib.autoregister = true
 authentication.shib.role.Senior\ Researcher = Researcher, Staff
 authentication.shib.role.Librarian = Administrator
 </screen>
-			</listitem>
+                        </listitem>
            <listitem>
            <para>DOI and handle identifiers can now be rendered in the JSPUI.</para>
            <screen>
@@ -267,7 +267,7 @@ In configuration sections such as webui.itemdisplay.default, values can
 be changed from (e.g.) metadata.dc.identifier.doi to
 metadata.doi.dc.identifier.doi
 </para>
-			</listitem>
+                        </listitem>
            <listitem>
            <para>The whole of the SWORD configuration has changed. The SWORD section must be removed and replaced with</para>
            <screen>
@@ -470,7 +470,7 @@ plugin.named.org.dspace.sword.SWORDIngester = \
 http://purl.org/net/sword-types/METSDSpaceSIP \
  org.dspace.sword.SimpleFileIngester = SimpleFileIngester
 </screen>
-			</listitem>
+                        </listitem>
            </itemizedlist>
        </listitem>
        <listitem>
@@ -532,7 +532,7 @@ plugin.sequence.org.dspace.authenticate.AuthenticationMethod = \
 # Specify which strategy use for select the style for an item
 plugin.single.org.dspace.app.webui.util.StyleSelection = \
-	org.dspace.app.webui.util.CollectionStyleSelection
+        org.dspace.app.webui.util.CollectionStyleSelection
 ###### Browse Configuration ######
@@ -551,7 +551,7 @@ webui.browse.index.4 = subject:metadata:dc.subject.*:text
 webui.itemlist.sort-option.1 = title:dc.title:title
 webui.itemlist.sort-option.2 = dateissued:dc.date.issued:date
 webui.itemlist.sort-option.3 =
-	dateaccessioned:dc.date.accessioned:date
+        dateaccessioned:dc.date.accessioned:date
 # Recent submissions
 recent.submissions.count = 5
@@ -575,20 +575,20 @@ webui.content_disposition_threshold = 8388608
 #### Event System Configuration ####
 #
 # default synchronous dispatcher (same behavior as traditional
-	DSpace)
+        DSpace)
 event.dispatcher.default.class = org.dspace.event.BasicDispatcher
 event.dispatcher.default.consumers = search, browse, eperson
 # consumer to maintain the search index
 event.consumer.search.class = org.dspace.search.SearchConsumer
 event.consumer.search.filters =
-	Item|Collection|Community|Bundle+Create|Modify|Modify_Metadata|Delete:
+        Item|Collection|Community|Bundle+Create|Modify|Modify_Metadata|Delete:
 Bundle+Add|Remove
 # consumer to maintain the browse index
 event.consumer.browse.class = org.dspace.browse.BrowseConsumer
 event.consumer.browse.filters =
-	Item+Create|Modify|Modify_Metadata:Collection+Add|Remove
+        Item+Create|Modify|Modify_Metadata:Collection+Add|Remove
 # consumer related to EPerson changes
 event.consumer.eperson.class = org.dspace.eperson.EPersonConsumer
@@ -599,46 +599,46 @@ event.consumer.eperson.filters = EPerson+Create
          <para><emphasis role="bold">Add <literal>xmlui.xconf</literal> Manakin configuration</emphasis> The new Manakin user interface available with DSpace 1.5 requires an extra configuration file that you will need to manually copy it over to your configuration directory.</para>
          <screen>
 cp [dspace-source]/dspace/config/xmlui.xconf
-	[dspace]/config/xmlui.xconf
+        [dspace]/config/xmlui.xconf
 </screen>
        </listitem>
        <listitem>
          <para><emphasis role="bold">Add <literal>item-submission.xml</literal> and <literal>item-submission.dtd</literal> configurable submission configuration</emphasis> The new configurable submission system that enables an administrator to re-arrange, or add/remove item submission steps requires this configuration file. You need to manually copy it over to your configuration directory.</para>
          <screen>
 cp [dspace-source]/dspace/config/item-submission.xml
-	[dspace]/config/item-submission.xml
+        [dspace]/config/item-submission.xml
 cp [dspace-source]/dspace/config/item-submission.dtd
-	[dspace]/config/item-submission.dtd
+        [dspace]/config/item-submission.dtd
 </screen>
        </listitem>
        <listitem>
          <para><emphasis role="bold">Add new <literal>input-forms.xml</literal> and <literal>input-forms.dtd</literal> configurable submission configuration</emphasis> The input-forms.xml now has an included dtd reference to support validation. You&apos;ll need to merge in your changes to both file/and or copy them into place.</para>
          <screen>
 cp [dspace-source]/dspace/config/input-forms.xml
-	[dspace]/config/input-forms.xml
+        [dspace]/config/input-forms.xml
 cp [dspace-source]/dspace/config/input-forms.dtd
-	[dspace]/config/inputforms.dtd
+        [dspace]/config/inputforms.dtd
 </screen>
        </listitem>
        <listitem>
          <para><emphasis role="bold">Add <literal>sword-swap-ingest.xsl</literal> and <literal>xhtml-head-item.properties</literal> crosswalk files</emphasis> New crosswalk files are required to support SWORD and the inclusion of metadata into the head of items.</para>
          <screen>
 cp [dspace-source]/dspace/config/crosswalks/sword-swap-ingest.xsl
-	[dspace]/config/crosswalks/sword-swap-ingest.xsl
+        [dspace]/config/crosswalks/sword-swap-ingest.xsl
 cp
-	[dspace-source]/dspace/config/crosswalks/xhtml-head-item.properties
+        [dspace-source]/dspace/config/crosswalks/xhtml-head-item.properties
-	[dspace]/config/crosswalks/xhtml-head-item.properties
+        [dspace]/config/crosswalks/xhtml-head-item.properties
 </screen>
        </listitem>
        <listitem>
          <para><emphasis role="bold">Add <literal>registration_notify</literal> email files</emphasis> A new configuration option (<literal>registration.notify = you@your-email.com</literal>) can be set to send a notification email whenever a new user registers to use your DSpace. The email template for this email needs to be copied.</para>
          <screen>
 cp [dspace-source]/dspace/config/emails/registration_notify
-	[dspace]/config/emails/registration_notify
+        [dspace]/config/emails/registration_notify
 </screen>
        </listitem>
@@ -648,7 +648,7 @@ cp [dspace-source]/dspace/config/emails/registration_notify
            <listitem>
              <para> For PostgreSQL </para>
              <para>
-                <literal>psql -U [dspace-user] -f [dspace-source]/dspace/etc/database_schema_14-15.sql [database-name]</literal>
+                <literal>psql -U [dspace-user] -f [dspace-source]/dspace/etc/postgres/database_schema_14-15.sql [database-name]</literal>
              </para>
            </listitem>
            <listitem>
@@ -671,10 +671,10 @@ ant -Dconfig=[dspace]/config/dspace.cfg update
          <para><emphasis role="bold">Update the Metadata Registry</emphasis> New Metadata Registry updates are required to support SWORD.</para>
          <screen>
 cp [dspace-source]/dspace/config/registries/sword-metadata.xml
-	[dspace]/config/registries/sword-metadata.xml;
+        [dspace]/config/registries/sword-metadata.xml;
 [dspace]/bin/dsrun org.dspace.administer.MetadataImporter -f
-	[dspace]/config/registries/sword-metadata.xml
+        [dspace]/config/registries/sword-metadata.xml
 </screen>
        </listitem>
        <listitem>
@@ -750,19 +750,19 @@ cp postgresql.jar <emphasis> [dspace-1.4.x-source]</emphasis>/lib
 #### Multi-file HTML document/site settings #####
 #
 # When serving up composite HTML items, how deep can the request be
-	for us to
+        for us to
 # serve up a file with the same name?
 #
 # e.g. if we receive a request for &quot;foo/bar/index.html&quot;
 # and we have a bitstream called just &quot;index.html&quot;
 # we will serve up that bitstream for the request if
-	webui.html.max-depth-guess
+        webui.html.max-depth-guess
 # is 2 or greater.  If webui.html.max-depth-guess is 1 or less, we
-	would not
+        would not
 # serve that bitstream, as the depth of the file is greater.
 #
 # If webui.html.max-depth-guess is zero, the request filename and
-	path must
+        path must
 # always exactly match the bitstream name.  Default value is 3.
 #
 webui.html.max-depth-guess = 3
@@ -782,7 +782,7 @@ ant -Dconfig=<emphasis> [dspace]</emphasis>/config/dspace.cfg update
          <para> Copy the <literal>.war</literal> Web application files in <literal>[dspace-1.4.x-source]/build</literal> to the <literal>webapps</literal> sub-directory of your servlet container (e.g. Tomcat). e.g.:</para>
          <screen>
 cp <emphasis> [dspace-1.4.x-source]</emphasis>/build/*.war <emphasis>
-	[tomcat]</emphasis>/webapps
+        [tomcat]</emphasis>/webapps
 </screen>
          <para>If you&apos;re using Tomcat, you need to delete the directories corresponding to the old <literal>.war</literal> files. For example, if <literal>dspace.war</literal> is installed in <literal>[tomcat]/webapps/dspace.war</literal>, you should delete the <literal>[tomcat]/webapps/dspace</literal> directory. Otherwise, Tomcat will continue to use the old code in that directory.</para>
        </listitem>
@@ -854,22 +854,22 @@ plugin.sequence.org.dspace.eperson.AuthenticationMethod = \
 plugin.sequence.org.dspace.app.mediafilter.MediaFilter = \
    org.dspace.app.mediafilter.PDFFilter,
-	org.dspace.app.mediafilter.HTMLFilter, \
+        org.dspace.app.mediafilter.HTMLFilter, \
    org.dspace.app.mediafilter.WordFilter,
-	org.dspace.app.mediafilter.JPEGFilter
+        org.dspace.app.mediafilter.JPEGFilter
 # to enable branded preview: remove last line above, and uncomment 2
-	lines below
+        lines below
 #   org.dspace.app.mediafilter.WordFilter,
-	org.dspace.app.mediafilter.JPEGFilter, \
+        org.dspace.app.mediafilter.JPEGFilter, \
 #   org.dspace.app.mediafilter.BrandedPreviewJPEGFilter
 filter.org.dspace.app.mediafilter.PDFFilter.inputFormats = Adobe PDF
 filter.org.dspace.app.mediafilter.HTMLFilter.inputFormats = HTML,
-	Text
+        Text
 filter.org.dspace.app.mediafilter.WordFilter.inputFormats = Microsoft
-	Word
+        Word
 filter.org.dspace.app.mediafilter.JPEGFilter.inputFormats = GIF,
-	JPEG, image/png
+        JPEG, image/png
 filter.org.dspace.app.mediafilter.BrandedPreviewJPEGFilter.inputFormat
 s = GIF, JPEG, image/png
@@ -897,7 +897,7 @@ webui.preview.brand.fontpoint = 12
 plugin.single.org.dspace.checker.BitstreamDispatcher=org.dspace.checke
 r.SimpleDispatcher
 # Standard interface implementations. You shouldn&apos;t need to tinker
-	with these.
+        with these.
 plugin.single.org.dspace.checker.ReporterDAO=org.dspace.checker.Report
 erDAOImpl
@@ -966,7 +966,7 @@ ant -Dconfig=<emphasis> [dspace]</emphasis>/config/dspace.cfg update
          <para> Copy the <literal>.war</literal> Web application files in <literal>[dspace-1.4-source]/build</literal> to the <literal>webapps</literal> sub-directory of your servlet container (e.g. Tomcat). e.g.:</para>
          <screen>
 cp <emphasis> [dspace-1.4-source]</emphasis>/build/*.war <emphasis>
-	[tomcat]</emphasis>/webapps
+        [tomcat]</emphasis>/webapps
 </screen>
          <para>If you&apos;re using Tomcat, you need to delete the directories corresponding to the old <literal>.war</literal> files. For example, if <literal>dspace.war</literal> is installed in <literal>[tomcat]/webapps/dspace.war</literal>, you should delete the <literal>[tomcat]/webapps/dspace</literal> directory. Otherwise, Tomcat will continue to use the old code in that directory.</para>
        </listitem>
@@ -1006,7 +1006,7 @@ ant -Dconfig=<emphasis> [dspace]</emphasis>/config/dspace.cfg update
          <para> Copy the <literal>.war</literal> Web application files in <literal>[dspace-1.3.2-source]/build</literal> to the <literal>webapps</literal> sub-directory of your servlet container (e.g. Tomcat). e.g.:</para>
          <screen>
 cp <emphasis> [dspace-1.3.2-source]</emphasis>/build/*.war <emphasis>
-	[tomcat]</emphasis>/webapps
+        [tomcat]</emphasis>/webapps
 </screen>
          <para>If you&apos;re using Tomcat, you need to delete the directories corresponding to the old <literal>.war</literal> files. For example, if <literal>dspace.war</literal> is installed in <literal>[tomcat]/webapps/dspace.war</literal>, you should delete the <literal>[tomcat]/webapps/dspace</literal> directory. Otherwise, Tomcat will continue to use the old code in that directory.</para>
        </listitem>
@@ -1052,9 +1052,9 @@ cp <emphasis> [dspace-1.3.2-source]</emphasis>/build/*.war <emphasis>
 ###### Statistical Report Configuration Settings ######
 # should the stats be publicly available?  should be set to false if
-	you only
+        you only
 # want administrators to access the stats, or you do not intend to
-	generate
+        generate
 # any
 report.public = false
@@ -1154,7 +1154,7 @@ ant -Dconfig=<emphasis> [dspace]</emphasis>/config/dspace.cfg update
          <para> Copy the <literal>.war</literal> Web application files in <literal>[dspace-1.2.2-source]/build</literal> to the <literal>webapps</literal> sub-directory of your servlet container (e.g. Tomcat). e.g.:</para>
          <screen>
 cp <emphasis> [dspace-1.2.2-source]</emphasis>/build/*.war <emphasis>
-	[tomcat]</emphasis>/webapps
+        [tomcat]</emphasis>/webapps
 </screen>
          <para>If you&apos;re using Tomcat, you need to delete the directories corresponding to the old <literal>.war</literal> files. For example, if <literal>dspace.war</literal> is installed in <literal>[tomcat]/webapps/dspace.war</literal>, you should delete the <literal>[tomcat]/webapps/dspace</literal> directory. Otherwise, Tomcat will continue to use the old code in that directory.</para>
        </listitem>
@@ -1191,13 +1191,13 @@ cp postgresql.jar <emphasis> [dspace-1.2.1-source]</emphasis>/lib
          <para> You need to add a few new parameters to your <literal>[dspace]/dspace.cfg</literal> for browse/search and item thumbnails display, and for configurable DC metadata fields to be indexed.</para>
          <screen>
 # whether to display thumbnails on browse and search results pages
-	(1.2+)
+        (1.2+)
 webui.browse.thumbnail.show = false
 # max dimensions of the browse/search thumbs. Must be &lt;=
-	thumbnail.maxwidth
+        thumbnail.maxwidth
 # and thumbnail.maxheight. Only need to be set if required to be
-	smaller than
+        smaller than
 # dimension of thumbnails generated by mediafilter (1.2+)
 #webui.browse.thumbnail.maxheight = 80
 #webui.browse.thumbnail.maxwidth = 80
@@ -1206,9 +1206,9 @@ webui.browse.thumbnail.show = false
 webui.item.thumbnail.show = true
 # where should clicking on a thumbnail from browse/search take the
-	user
+        user
 # Only values currently supported are &quot;item&quot; and
-	&quot;bitstream&quot;
+        &quot;bitstream&quot;
 #webui.browse.thumbnail.linkbehaviour = item
@@ -1244,7 +1244,7 @@ ant -Dconfig=<emphasis> [dspace]</emphasis>/config/dspace.cfg update
          <para> Copy the <literal>.war</literal> Web application files in <literal>[dspace-1.2.1-source]/build</literal> to the <literal>webapps</literal> sub-directory of your servlet container (e.g. Tomcat). e.g.:</para>
          <screen>
 cp <emphasis> [dspace-1.2.1-source]</emphasis>/build/*.war <emphasis>
-	[tomcat]</emphasis>/webapps
+        [tomcat]</emphasis>/webapps
 </screen>
          <para>If you&apos;re using Tomcat, you need to delete the directories corresponding to the old <literal>.war</literal> files. For example, if <literal>dspace.war</literal> is installed in <literal>[tomcat]/webapps/dspace.war</literal>, you should delete the <literal>[tomcat]/webapps/dspace</literal> directory. Otherwise, Tomcat will continue to use the old code in that directory.</para>
        </listitem>
@@ -1270,7 +1270,7 @@ cp <emphasis> [dspace-1.2.1-source]</emphasis>/build/*.war <emphasis>
          <screen>
 cd <emphasis> [dspace]</emphasis>/lib
 cp activation.jar servlet.jar mail.jar <emphasis>
-	[dspace-1.2-source]</emphasis>/lib
+        [dspace-1.2-source]</emphasis>/lib
 </screen>
        </listitem>
        <listitem>
@@ -1305,7 +1305,7 @@ thumbnail.maxheight 80
          <para>Also, to avoid future confusion, you might like to <emphasis role="bold">remove</emphasis> the following property, which is no longer required:</para>
          <screen>
 config.template.oai-web.xml = <emphasis>
-	[dspace]</emphasis>/oai/WEB-INF/web.xml
+        [dspace]</emphasis>/oai/WEB-INF/web.xml
 </screen>
        </listitem>
        <listitem>
@@ -1314,9 +1314,9 @@ config.template.oai-web.xml = <emphasis>
          <para>Also, if you&apos;re using the same version of Tomcat as before, you need to <emphasis role="bold">remove the lines from Tomcat&apos;s conf/server.xml file that enable symbolic links for DSpace.</emphasis> These are the <literal>&lt;Context&gt;</literal> elements you added to get DSpace 1.1.1 working, looking something like this:</para>
          <screen>
 &lt;Context path=&quot;/dspace&quot; docBase=&quot;dspace&quot; debug=&quot;0&quot; reloadable=&quot;true&quot;
-	crossContext=&quot;true&quot;&gt;
+        crossContext=&quot;true&quot;&gt;
  &lt;Resources className=&quot;org.apache.naming.resources.FileDirContext&quot;
-	allowLinking=&quot;true&quot; /&gt;
+        allowLinking=&quot;true&quot; /&gt;
 &lt;/Context&gt;
 </screen>
          <para>Be sure to remove the &lt;Context&gt; elements for both the Web UI and the OAI Web applications.</para>
@@ -1331,9 +1331,9 @@ ant -Dconfig=<emphasis> [dspace]</emphasis>/config/dspace.cfg update
          <para> Copy the new config files in <literal>config</literal> to your installation, e.g.:</para>
          <screen>
 cp <emphasis> [dspace-1.2-source]</emphasis>/config/news-* <emphasis>
-	[dspace-1.2-source]</emphasis>/config/mediafilter.cfg <emphasis>
+        [dspace-1.2-source]</emphasis>/config/mediafilter.cfg <emphasis>
-	[dspace-1.2-source]</emphasis>/config/dc2mods.cfg <emphasis>
+        [dspace-1.2-source]</emphasis>/config/dc2mods.cfg <emphasis>
-	[dspace]</emphasis>/config
+        [dspace]</emphasis>/config
 </screen>
        </listitem>
        <listitem>
@@ -1341,14 +1341,14 @@ cp <emphasis> [dspace-1.2-source]</emphasis>/config/news-* <emphasis>
          <para>To apply the changes, go to the source directory, and run:</para>
          <screen>
 psql -f etc/database_schema_11-12.sql [DSpace database name] -h
-	localhost
+        localhost
 </screen>
        </listitem>
        <listitem>
          <para> A tool supplied with the DSpace 1.2 codebase will then update the actual data in the relational database. Run it using:</para>
          <screen>
 <emphasis> [dspace]</emphasis>/bin/dsrun
-	org.dspace.administer.Upgrade11To12
+        org.dspace.administer.Upgrade11To12
 </screen>
        </listitem>
        <listitem>
@@ -1362,7 +1362,7 @@ psql -f etc/database_schema_11-12.sql [DSpace database name] -h
          <para>Copy the <literal>.war</literal> Web application files in <literal>[dspace-1.2-source]/build</literal> to the <literal>webapps</literal> sub-directory of your servlet container (e.g. Tomcat). e.g.:</para>
          <screen>
 cp <emphasis> [dspace-1.2-source]</emphasis>/build/*.war <emphasis>
-	[tomcat]</emphasis>/webapps
+        [tomcat]</emphasis>/webapps
 </screen>
        </listitem>
        <listitem>
@@ -1472,14 +1472,14 @@ CREATE INDEX last_modified_idx ON Item(last_modified);
 CREATE INDEX eperson_email_idx ON EPerson(email);
 CREATE INDEX item2bundle_item_idx on Item2Bundle(item_id);
 REATE INDEX bundle2bitstream_bundle_idx ON
-	Bundle2Bitstream(bundle_id);
+        Bundle2Bitstream(bundle_id);
 CREATE INDEX dcvalue_item_idx on DCValue(item_id);
 CREATE INDEX collection2item_collection_idx ON
-	Collection2Item(collection_id);
+        Collection2Item(collection_id);
 CREATE INDEX resourcepolicy_type_id_idx ON ResourcePolicy
-	(resource_type_id,resource_id);
+        (resource_type_id,resource_id);
 CREATE INDEX epersongroup2eperson_group_idx on
-	EPersonGroup2EPerson(eperson_group_id);
+        EPersonGroup2EPerson(eperson_group_id);
 CREATE INDEX handle_handle_idx ON Handle(handle);
 CREATE INDEX sort_author_idx on ItemsByAuthor(sort_author);
 CREATE INDEX sort_title_idx on ItemsByTitle(sort_title);
@@ -1489,23 +1489,23 @@ DROP VIEW CollectionItemsByDateAccessioned;
 DROP VIEW CommunityItemsByDateAccessioned;
 CREATE VIEW CommunityItemsByDateAccession as SELECT
-	Community2Item.community_id, ItemsByDateAccessioned.*  FROM
+        Community2Item.community_id, ItemsByDateAccessioned.*  FROM
-	ItemsByDateAccessioned, Community2Item WHERE
+        ItemsByDateAccessioned, Community2Item WHERE
-	ItemsByDateAccessioned.item_id = Community2Item.item_id;
+        ItemsByDateAccessioned.item_id = Community2Item.item_id;
 CREATE VIEW CollectionItemsByDateAccession AS SELECT
-	collection2item.collection_id,
+        collection2item.collection_id,
-	itemsbydateaccessioned.items_by_date_accessioned_id,
+        itemsbydateaccessioned.items_by_date_accessioned_id,
-	itemsbydateaccessioned.item_id,
+        itemsbydateaccessioned.item_id,
-	itemsbydateaccessioned.date_accessioned FROM itemsbydateaccessioned,
+        itemsbydateaccessioned.date_accessioned FROM itemsbydateaccessioned,
-	collection2item WHERE (itemsbydateaccessioned.item_id =
+        collection2item WHERE (itemsbydateaccessioned.item_id =
-	collection2item.item_id);
+        collection2item.item_id);
 </screen>
        </listitem>
        <listitem>
          <para> Fix your JSPs for Unicode. If you&apos;ve modified the site &apos;skin&apos; (<literal>jsp/local/layout/header-default.jsp</literal>) you&apos;ll need to add the Unicode header, i.e.:</para>
          <screen>
 &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html;
-	charset=UTF-8&quot;&gt;
+        charset=UTF-8&quot;&gt;
 </screen>
          <para>to the &lt;HEAD&gt; element. If you have any locally-edited JSPs, you need to add this page directive to the top of all of them:</para>
          <screen>
@@ -1518,7 +1518,7 @@ CREATE VIEW CollectionItemsByDateAccession AS SELECT
          <screen>
 cd <emphasis> [dspace]</emphasis>/lib
 cp *.policy activation.jar servlet.jar mail.jar <emphasis>
-	[dspace-1.1-source]</emphasis>/lib
+        [dspace-1.1-source]</emphasis>/lib
 </screen>
        </listitem>
        <listitem>
@@ -1534,14 +1534,14 @@ ant -Dconfig=<emphasis> [dspace]</emphasis>/config/dspace.cfg update
          <para> Update the database tables using the upgrader tool, which sets up the new &gt;<literal>last_modified</literal> date in the item table:</para>
          <screen>
 Run <emphasis> [dspace]</emphasis>/bin/dsrun
-	org.dspace.administer.Upgrade101To11
+        org.dspace.administer.Upgrade101To11
 </screen>
        </listitem>
        <listitem>
          <para> Run the collection default authorisation policy tool:</para>
          <screen>
 <emphasis> [dspace]</emphasis>/bin/dsrun
-	org.dspace.authorize.FixDefaultPolicies
+        org.dspace.authorize.FixDefaultPolicies
 </screen>
        </listitem>
        <listitem>
@@ -1570,5 +1570,3 @@ JAVA_OPTS=&quot;-Xmx512M -Xms64M -Dfile.encoding=UTF-8&quot;
      </orderedlist>
    </section>
  </chapter>
--- a/dspace/etc/postgres/database_schema.sql
+++ b/dspace/etc/postgres/database_schema.sql
--- a/dspace/etc/postgres/database_schema_11-12.sql
+++ b/dspace/etc/postgres/database_schema_11-12.sql
--- a/dspace/etc/postgres/database_schema_12-13.sql
+++ b/dspace/etc/postgres/database_schema_12-13.sql
--- a/dspace/etc/postgres/database_schema_13-14.sql
+++ b/dspace/etc/postgres/database_schema_13-14.sql
--- a/dspace/etc/postgres/database_schema_14-15.sql
+++ b/dspace/etc/postgres/database_schema_14-15.sql
--- a/dspace/etc/postgres/database_schema_15-16.sql
+++ b/dspace/etc/postgres/database_schema_15-16.sql
--- a/dspace/etc/postgres/update-sequences.sql
+++ b/dspace/etc/postgres/update-sequences.sql