diff --git a/dspace/docs/configure.html b/dspace/docs/configure.html index 19fe02a813..1e871bfc0b 100644 --- a/dspace/docs/configure.html +++ b/dspace/docs/configure.html @@ -1236,7 +1236,13 @@ The following vocabularies are currently available by default:

Thus, if possible, it is recommeded you limit your changes to the 'layout' JSPs and the stylesheet.

-

The JSPs are stored in [dspace-source]/jsp. Place your edited version of a JSP in the [dspace-source]/modules/dspace-jspui/src/main/webapp/ directory (this is the replacement for the pre-1.5 /jsp/local directory), with the same path as the original. If they exist, these will be used in preference to the distributed versions in [dspace-source]/jsp. For example:

+

The JSPs are available in one of two places: +

+

+

If you wish to modify a particular JSP, place your edited version in the [dspace-source]/dspace/modules/dspace-jspui/src/main/webapp/ directory (this is the replacement for the pre-1.5 /jsp/local directory), with the same path as the original. If they exist, these will be used in preference to the default JSPs. For example:

@@ -1247,34 +1253,34 @@ The following vocabularies are currently available by default: - + - + - + - +
[dspace-source]/jsp/community-list.jsp[jsp.dir]/community-list.jsp[dspace-source]/modules/dspace-jspui/src/main/webapp/community-list.jsp[dspace-source]/dspace/modules/dspace-jspui/src/main/webapp/community-list.jsp
[dspace-source]/jsp/mydspace/main.jsp[jsp.dir]/mydspace/main.jsp[dspace-source]/modules/dspace-jspui/src/main/webapp/mydspace/main.jsp[dspace-source]/dspace/modules/dspace-jspui/src/main/webapp/mydspace/main.jsp
-

Heavy use is made of a style sheet, in [dspace-source]/jsp/styles.css.jsp. If you make edits, call the local version [dspace-source]/modules/dspace-jspui/src/main/webapp/styles.css.jsp, and it will be used automatically in preference to the default, as described above.

+

Heavy use is made of a style sheet, styles.css.jsp. If you make edits, copy the local version to [dspace-source]/dspace/modules/dspace-jspui/src/main/webapp/styles.css.jsp, and it will be used automatically in preference to the default, as described above.

Fonts and colors can be easily changed using the stylesheet. The stylesheet is a JSP so that the user's browser version can be detected and the stylesheet tweaked accordingly.

-

The 'layout' of each page, that is, the top and bottom banners and the navigation bar, are determined by the JSPs [dspace-source]/jsp/layout/header-*.jsp and [dspace-source]/jsp/layout/footer-*.jsp. You can provide modified versions of these (in [dspace-source]/jsp/local/layout, or define more styles and apply them to pages by using the "style" attribute of the dspace:layout tag.

+

The 'layout' of each page, that is, the top and bottom banners and the navigation bar, are determined by the JSPs /layout/header-*.jsp and /layout/footer-*.jsp. You can provide modified versions of these (in [dspace-source]/dspace/modules/dspace-jspui/src/main/webapp/layout), or define more styles and apply them to pages by using the "style" attribute of the dspace:layout tag.

After you've customized your JSPs, you must rebuild the DSpace Web application. If you haven't already built and installed it, follow the install directions. Otherwise, follow the steps below:

  1. -

    Rebuild the DSpace installation package by running the following command from your [dspace-source] directory:

    +

    Rebuild the DSpace installation package by running the following command from your [dspace-source]/dspace/ directory:

    mvn package
  2. -

    Re-install the DSpace WAR(s) to [dspace]/webapps by running the following command from your [dspace-source]/target/dspace-[version].dir directory:

    +

    Re-install the DSpace WAR(s) to [dspace]/webapps by running the following command from your [dspace-source]/dspace/target/dspace-[version].dir directory:

     ant -Dconfig=[dspace]/config/dspace.cfg update
    diff --git a/dspace/docs/directories.html b/dspace/docs/directories.html index e6b1d29240..e742c0f512 100644 --- a/dspace/docs/directories.html +++ b/dspace/docs/directories.html @@ -30,64 +30,69 @@
    3. diff --git a/dspace/docs/install.html b/dspace/docs/install.html index 0a69e69e22..1d1d3af9bc 100644 --- a/dspace/docs/install.html +++ b/dspace/docs/install.html @@ -134,7 +134,7 @@ or user interfaces, using basic pre-built interface "overlays". However, it will not allow you to customize or change the underlying DSpace Java API, as all Java code comes pre-compiled.
  3. This method is highly recommended for those who are new to DSpace, - may not have available technical staff for DSpace at their institutions, + may not have as much technical staff for DSpace at their institutions, or do not wish to make changes to the underlying DSpace Java API.
    4. @@ -201,13 +201,16 @@ of them in order to install DSpace, you do need to know they exist and also know 
    useradd -m dspace
  4. -

    Download the latest DSpace source code and unpack it - into a temporary location. It is not necessary to keep this directory around after you install DSpace.

    +

    Download the latest DSpace release and unpack it. + Although there are two available releases (dspace-1.x.tar.gz and dspace-1.x-src.tar.gz), + you only need to choose one. If you want a copy of all underlying Java source code, you should download + the dspace-1.x-src.tar.gz release. + 

    gunzip -c dspace-1.x.tar.gz | tar -xf -

    For ease of reference, we will refer to the location of this unzipped version - of the DSpace installation package as [dspace-source] in the + of the DSpace release as [dspace-source] in the remainder of these instructions.

    @@ -220,7 +223,7 @@ of them in order to install DSpace, you do need to know they exist and also know

    1. Copy the PostgreSQL JDBC driver (.jar file) into -[dspace-source]/lib. If you compiled PostgreSQL yourself, it'll be in postgresql-7.x.x/src/interfaces/jdbc/jars/postgresql.jar. Alternatively you can download it directly from the PostgreSQL JDBC site. Make sure you get the recommended driver for the version of PostgreSQL you're running.

      2. +[dspace-source]/dspace/lib. If you compiled PostgreSQL yourself, it'll be in postgresql-7.x.x/src/interfaces/jdbc/jars/postgresql.jar. Alternatively you can download it directly from the PostgreSQL JDBC site. Make sure you get the recommended driver for the version of PostgreSQL you're running.

    2. Create a dspace database, owned by the dspace PostgreSQL user:

      @@ -233,21 +236,21 @@ createdb -U dspace -E UNICODE dspace

      Oracle:

      1. -

        Copy the Oracle JDBC driver into [dspace-source]/lib.

        +

        Copy the Oracle JDBC driver into [dspace-source]/dspace/lib.

      2. Create a database for DSpace. Make sure that the character set is one of the Unicode character sets. DSpace uses UTF-8 natively, and it is suggested that the Oracle database use the same character set. Create a user account for DSpace (e.g. dspace,) and ensure that it has permissions to add and remove tables in the database.

      3. -

        Edit the config/dspace.cfg file in your source directory for the following settings:

        +

        Edit the [dspace-source]/dspace/config/dspace.cfg database settings:

        db.name   = oracle
 db.url    = jdbc.oracle.thin:@//host:port/dspace
 db.driver = oracle.jdbc.OracleDriver
      4. -

        Go to [dspace-source]/etc/oracle and copy the contents to their parent directory, overwriting the versions in the parent: +

        Go to [dspace-source]/dspace/etc/oracle and copy the contents to their parent directory, overwriting the versions in the parent: -

        cd [dspace-source]/etc/oracle
+
        cd [dspace-source]/dspace/etc/oracle
 cp * ..
        
             
        You now have Oracle-specific .sql files in your etc directory, and your dspace.cfg is modified to point to your Oracle database.
        5. @@ -255,7 +258,7 @@ cp * ..
      5. -

        Edit [dspace-source]/config/dspace.cfg, in particular you'll need to set these properties: +

        Edit [dspace-source]/dspace/config/dspace.cfg, in particular you'll need to set these properties:
        dspace.dir -- must be set to the [dspace] (installation) directory. @@ -298,8 +301,8 @@ chown dspace [dspace]

      6. -

        As the dspace UNIX user, generate the DSpace installation package in the [dspace-source]/target/dspace-[version].dir/ directory:

        - 
        cd [dspace-source]
+	  	
        As the dspace UNIX user, generate the DSpace installation package in the [dspace-source]/dspace/target/dspace-[version].dir/ directory:
        
+	  	
        cd [dspace-source]/dspace/
 mvn package
        
 
 		
        Note: without any extra arguments, the DSpace installation package is initialized for PostgreSQL.  If you want to use Oracle instead,
@@ -310,7 +313,7 @@ mvn package

      7. As the dspace UNIX user, initialize the DSpace database and install DSpace to [dspace]:

        - 
        cd [dspace-source]/target/dspace-[version].dir/
+        
        cd [dspace-source]/dspace/target/dspace-[version].dir/
 ant fresh_install
        
 
 		
        Note: to see a complete list of build targets, run
        
@@ -378,36 +381,36 @@ cp -r [dspace]/webapps/dspace-oai [tomcat]/webapps
        useradd -m dspace
      8. -

        Create the parent directory for the DSpace modules to reside (i.e. [dspace-parent]). As root (or a user with appropriate permissions), run:

        +

        Create the source directory for the DSpace modules to reside (i.e. [dspace-source]). As root (or a user with appropriate permissions), run:

        - 
        mkdir [dspace-parent]
-chown dspace [dspace-parent]
        + 
        mkdir [dspace-source]
+chown dspace [dspace-source]

        (Assuming the dspace UNIX username.)

      9. -

        Checkout the DSpace Source code from SourceForge SVN into [dspace-parent]. For example:

        +

        Checkout the DSpace Source code from SourceForge SVN into [dspace-source]. For example:

        - 
        svn co https://dspace.svn.sourceforge.net/svnroot/dspace/tags/dspace-1_5 [dspace-parent]
        + 
        svn co https://dspace.svn.sourceforge.net/svnroot/dspace/tags/dspace-1_5 [dspace-source]

        If you wish, you can choose to only checkout the source code for the specific DSpace "modules" which you want to install. However, you must always checkout the 'dspace' module, as it is the module which builds DSpace. For example, if you only want to install the XML-UI and the OAI-PMH interface you can perform the following checkouts:

        - 
        svn co https://dspace.svn.sourceforge.net/svnroot/dspace/tags/dspace-1_5/dspace [dspace-parent]
-svn co https://dspace.svn.sourceforge.net/svnroot/dspace/tags/dspace-1_5/dspace-xmlui [dspace-parent]
-svn co https://dspace.svn.sourceforge.net/svnroot/dspace/tags/dspace-1_5/dspace-oai [dspace-parent]	  	
+	  	
        svn co https://dspace.svn.sourceforge.net/svnroot/dspace/tags/dspace-1_5/dspace [dspace-source]
+svn co https://dspace.svn.sourceforge.net/svnroot/dspace/tags/dspace-1_5/dspace-xmlui [dspace-source]
+svn co https://dspace.svn.sourceforge.net/svnroot/dspace/tags/dspace-1_5/dspace-oai [dspace-source]	  	
 	  	
        
 		
 		
        In order, you are checking out the 'dspace' module (builds DSpace), 
 		'dspace-xmlui' module (provides XML-UI), and 'dspace-oai' module (provides OAI-PMH).
        
 	  
-	  	
        In the end, you should have a folder structure similar to the following in [dspace-parent]:
+	  	
        In the end, you should have a folder structure similar to the following in [dspace-source]:
 	  	
          
-	  		
        • [dspace-parent]
+	  		
        • [dspace-source]
 	  		  
            
-	  	 		
          • dspace/ - DSpace 'build' and configuration module (this is what is normally referred to as [dspace-source])
            • 
+	  	 		
          • dspace/ - DSpace 'build' and configuration module
            • 
 	  	 		
          • dspace-api/ - DSpace Java API module
            • 
 	  	 		
          • dspace-jspui/ - DSpace JSP-UI module
            • 
 	  	 		
          • dspace-oai/ - DSpace OAI-PMH interface module
            • 
@@ -417,33 +420,18 @@ svn co https://dspace.svn.sourceforge.net/svnroot/dspace/tags/dspace-1_5/dspace-
 	  	
          
 	  
          • 
 	  
        • 
-	     
          Build your custom DSpace installation package (from within the 'dspace' module)
          
-	    
-	     
          cd [dspace-parent]/dspace/
-mvn package
          
-	     
-	     
          Note: without any extra arguments, DSpace is built for PostgreSQL.  If you want to use Oracle instead,
-	     you should build DSpace as follows:
          
-	     
-	     
          mvn -Ddb.name=oracle package
          
-	  
          • 
-	  
        • 
-	  	 
          Building DSpace may take awhile.  But, once it is complete, you should have your
-	  	 custom DSpace installation package ready in your 
-	  	 [dspace-parent]/dspace/target/dspace-[version].dir/ directory.
          
-	  	 
          Note: Although we won't go into this in detail, you can also create your own
-	  	 completely custom Maven-based modules in your [dspace-parent] directory.
+	     
          Note: Although we won't go into this in detail, you can also create your own
+	  	 completely custom Maven-based modules in your [dspace-source] directory.
 	  	 To build your custom modules into DSpace, you would need to modify the 'dspace'
 	  	 module's pom.xml (Project Object Model) to look for those custom modules, and
 	  	 then re-build your DSpace installation package.  Look
 	  	 at the Maven Documentation or 
 	  	 DSpace Wiki for more hints and tricks.
          
 	  
          • 
-	  
        • Once your DSpace installation package has been built, you can follow the steps in the
-	  Quick Installation Method above to finish installing and configure DSpace.  
-	  Just remember that you can skip downloading the DSpace Source Code from
-	  SourceForge.  In addition, remember that your [dspace-parent]/dspace module is
-	  the same as what is referred to as [dspace-source]
          
+	  
        • Once you've downloaded the appropriate DSpace modules into [dspace-source], you can follow the steps in the
+	  Quick Installation Method above to finish installing and configuring DSpace.  
+	  Just remember that you can skip downloading the Latest DSpace Release from
+	  SourceForge, as you've already downloaded it via Maven.
          
 	  
          •

      @@ -726,7 +714,7 @@ $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize 1024 \

      A Handle server runs as a separate process that receives TCP requests from other Handle servers, and issues resolution requests to a global server or servers if a Handle entered locally does not correspond to some local content. The Handle protocol is based on TCP, so it will need to be installed on a server that can broadcast and receive TCP on port 2641.

      The Handle server code is included with the DSpace code in -[dspace-source]/lib/handle.jar. Note: The latest version of the handle.jar file is not included in the release due to licensing conditions changing between the provided version and later versions. It is recommended you read the new license conditions and decide whether you wish to update your installation's handle.jar. If you decide to update, you should replace the existing handle.jar in [dspace-source]/lib with the new version and rebuild your war files.

      +[dspace]/lib/handle.jar. Note: The latest version of the handle.jar file is not included in the release due to licensing conditions changing between the provided version and later versions. It is recommended you read the new license conditions and decide whether you wish to update your installation's handle.jar. If you decide to update, you should replace the existing handle.jar in [dspace]/lib with the new version and rebuild your war files.

      A script exists to create a simple Handle configuration - simply run [dspace]/bin/make-handle-config after you've set the appropriate parameters in dspace.cfg. You can also create a Handle configuration directly by following the installation instructions on handle.net, but with these changes:

        @@ -805,13 +793,13 @@ $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize 1024 \

        1. Download the DSpace source from SourceForge and untar it (WinZip will do this)

          2. -

        2. Copy the PostgreSQL JDBC driver across to the DSpace source tree. The drivers will be in C:\Program Files\PostgreSQL\8.x\jdbc\. The postgresql-8.x-yyy.jdbc2.jar is the jar file you need. Copy it to [dspace-source]/lib.

          3. +

        3. Copy the PostgreSQL JDBC driver across to the DSpace source tree. The drivers will be in C:\Program Files\PostgreSQL\8.x\jdbc\. The postgresql-8.x-yyy.jdbc2.jar is the jar file you need. Copy it to [dspace]/lib.

        4. Ensure the PostgreSQL service is running, and then run pgAdmin III (Start -> PostgreSQL 8.0 -> pgAdmin III). Connect to the local database as the postgres user and:

          • Create a 'Login Role' (user) called dspace with the password dspace
          • Create a database called dspace owned by the user dspace, with UTF-8 encoding

          5. -

        5. Update paths in [dspace-source]\config\dspace.cfg. Note: Use forward slashes / for path separators, though you can still use drive letters, e.g.: +

        6. Update paths in [dspace-source]\dspace\config\dspace.cfg. Note: Use forward slashes / for path separators, though you can still use drive letters, e.g.:

          dspace.dir = C:/DSpace

          Make sure you change all of the parameters with file paths to suit, specifically: 

          @@ -830,7 +818,20 @@ $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize 1024 \
 	
        7. Run:
          ant fresh_install
          8. 
 	
        8. Create an administrator account, e.g. assuming C:\dspace is where your DSpace installation is:
          C:\dspace\bin\dsrun org.dspace.administer.CreateAdministrator
          
 	
          and enter the required information
          9. 
-	
        9. Copy the .war Web application files from [dspace-source]\build to Tomcat's webapps dir, which should be somewhere like C:\Program Files\Apache Software Foundation\Tomcat 5.5\webapps
          10. 
+	
        10. Copy the Web application directories from [dspace]\webapps\ to Tomcat's webapps dir, which should be somewhere like C:\Program Files\Apache Software Foundation\Tomcat 5.5\webapps
          
+		
            
+		
          • Alternatively, Tell your Tomcat installation where to find your DSpace web application(s).  
+        As an example, in the <Host> section of your [tomcat]/conf/server.xml you could add lines similar to the following
+        (but replace [dspace] with your installation location):
            
+        
+        
            <!-- DEFINE A CONTEXT PATH FOR DSpace JSP User Interface  -->
+<Context path="/dspace-jspui" docBase="[dspace]\webapps\dspace-jspui" debug="0" reloadable="true" cachingAllowed="false" allowLinking="true"/>
+	
+<!-- DEFINE A CONTEXT PATH FOR DSpace OAI User Interface  -->
+<Context path="/dspace-oai" docBase="[dspace]\webapps\dspace-oai" debug="0" reloadable="true" cachingAllowed="false" allowLinking="true"/>
            
+		
            • 
+		
          
+	
          11. 
 	
        11. Start the Tomcat service
          12. 
 	
        12. Browse http://localhost:8080/dspace. You should see the DSpace home page
          13.

        diff --git a/dspace/docs/storage.html b/dspace/docs/storage.html index b01343369c..7f3d87068c 100644 --- a/dspace/docs/storage.html +++ b/dspace/docs/storage.html @@ -24,15 +24,15 @@

        All calls to the Database Manager require a DSpace Context object. Example use of the database manager API is given in the org.dspace.storage.rdbms package Javadoc.

        -

        The database schema used by DSpace (for PostgreSQL) is stored in [dspace-source]/etc/database_schema.sql 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.

        +

        The database schema used by DSpace (for PostgreSQL) is stored in [dspace-source]/dspace/etc/database_schema.sql 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.

        -

        Also in [dspace-source]/etc are various SQL files called database_schema_1x_1y. These contain the necessary SQL commands to update a live DSpace database from version 1.x to 1.y. Note that this might not be the only part of an upgrade process: see Updating a DSpace Installation for details.

        +

        Also in [dspace-source]/dspace/etc are various SQL files called database_schema_1x_1y. These contain the necessary SQL commands to update a live DSpace database from version 1.x to 1.y. Note that this might not be the only part of an upgrade process: see Updating a DSpace Installation for details.

        The DSpace database code uses an SQL function getnextid 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 SEQUENCES for each table in order to create new IDs. If an alternative database backend were to be used, the implementation of getnextid could be updated to operate with that specific DBMS.

        The etc directory in the source distribution contains two further SQL files. clean-database.sql contains the SQL necessary to completely clean out the database, so use with caution! The Ant target clean_database can be used to execute this. update-sequences.sql contains SQL to reset the primary key generation sequences to appropriate values. You'd need to do this if, for example, you'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.

        -

        Versions of the *.sql* files for Oracle are stored in [dspace-source]/etc/oracle. These need to be copied over their PostgreSQL counterparts in [dspace-source]/etc prior to installation.

        +

        Versions of the *.sql* files for Oracle are stored in [dspace-source]/dspace/etc/oracle. These need to be copied over their PostgreSQL counterparts in [dspace-source]/dspace/etc prior to installation.

        Maintenance and Backup

        @@ -55,9 +55,9 @@ DELETE FROM epersongroup;
      • -

        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 [dspace-source]/etc/update-sequences.sql, for example with:

        +

        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 [dspace-source]/dspace/etc/update-sequences.sql, for example with:

        -psql -U dspace -f [dspace-source]/etc/update-sequences.sql
+psql -U dspace -f [dspace-source]/dspace/etc/update-sequences.sql
      diff --git a/dspace/docs/submission.html b/dspace/docs/submission.html index 2dad51b49a..778dc1851c 100644 --- a/dspace/docs/submission.html +++ b/dspace/docs/submission.html @@ -31,8 +31,8 @@

      Understanding the Submission Configuration File

      -

      The [dspace]/config/item-submission.xml contains the submission configurations for both the DSpace JSP user interface (JSP-UI) or the DSpace XML user interface - (XML-UI or Manakin). This configuration file contains detailed documentation within the file itself, +

      The [dspace]/config/item-submission.xml contains the submission configurations for both the DSpace JSP user interface (JSPUI) or the DSpace XML user interface + (XMLUI or Manakin). This configuration file contains detailed documentation within the file itself, which should help you better understand how to best utilize it.

      @@ -159,8 +159,8 @@

      Structure of the <step> Definition

      -

      The same <step> definition is used by both the DSpace JSP user interface (JSP-UI) an the DSpace XML user interface - (XML-UI or Manakin). Therefore, you will notice each <step> definition contains information +

      The same <step> definition is used by both the DSpace JSP user interface (JSPUI) an the DSpace XML user interface + (XMLUI or Manakin). Therefore, you will notice each <step> definition contains information specific to each of these two interfaces.

      The structure of the <step> Definition is as follows: @@ -180,13 +180,13 @@

      heading
      -
      Partial I18N key (defined in Messages.properties for JSP-UI or messages.xml for XML-UI) which corresponds to +
      Partial I18N key (defined in Messages.properties for JSPUI or messages.xml for XMLUI) which corresponds to the text that should be displayed in the submission Progress Bar for this step. This partial I18N key is prefixed within either the Messages.properties or messages.xml file, depending on the interface you are using. Therefore, to find the actual key, you will need to search for the partial key with the following prefix:
        -
      • XML-UI: prefix is xmlui.Submission. (e.g. "xmlui.Submission.submit.progressbar.describe" for 'Describe' step)
        • -
      • JSP-UI: prefix is jsp. (e.g. "jsp.submit.progressbar.describe" for 'Describe' step)
        • +
      • XMLUI: prefix is xmlui.Submission. (e.g. "xmlui.Submission.submit.progressbar.describe" for 'Describe' step)
        • +
      • JSPUI: prefix is jsp. (e.g. "jsp.submit.progressbar.describe" for 'Describe' step)
      The 'heading' need not be defined if the step should not appear in the progress bar (e.g. steps which perform automated processing, i.e. non-interactive, should not appear @@ -196,26 +196,26 @@
      processing-class (Required)
      Full Java path to the Processing Class for this Step. This Processing Class - must perform the primary processing of any information gathered in this step, for both the XML-UI and JSP-UI. + must perform the primary processing of any information gathered in this step, for both the XMLUI and JSPUI. All valid step processing classes must extend the abstract `org.dspace.submit.AbstractProcessingStep` class (or alternatively, extend one of the pre-existing step processing classes in org.dspace.submit.step.*)
      jspui-binding
      -
      Full Java path of the JSP-UI "binding" class for this Step. This "binding" class +
      Full Java path of the JSPUI "binding" class for this Step. This "binding" class should initialize and call the appropriate JSPs to display the step's user interface. A valid - JSP-UI "binding" class must extend the abstract `org.dspace.app.webui.submit.JSPStep` class. - This property need not be defined if you are using the XML-UI interface, or for steps which + JSPUI "binding" class must extend the abstract `org.dspace.app.webui.submit.JSPStep` class. + This property need not be defined if you are using the XMLUI interface, or for steps which only perform automated processing, i.e. non-interactive steps.
      xmlui-binding
      -
      Full Java path of the XML-UI "binding" class for this Step. This "binding" class +
      Full Java path of the XMLUI "binding" class for this Step. This "binding" class should generate the Manakin XML (DRI document) necessary to generate the step's user interface. A valid - XML-UI "binding" class must extend the abstract `org.dspace.app.xmlui.submission.AbstractSubmissionStep` class. - This property need not be defined if you are using the JSP-UI interface, or for steps which + XMLUI "binding" class must extend the abstract `org.dspace.app.xmlui.submission.AbstractSubmissionStep` class. + This property need not be defined if you are using the JSPUI interface, or for steps which only perform automated processing, i.e. non-interactive steps.
      @@ -616,7 +616,7 @@

      The Upload step in the DSpace submission process has two configuration options which can be set with your [dspace]/config/dspace.cfg configuration file. They are as follows:

        -
      • upload.max - The maximum size of a file (in bytes) that can be uploaded from the JSP-UI (not applicable for the XML-UI). It defaults to 536870912 bytes (512MB). You may set this to -1 to disable any file size limitation. +
      • upload.max - The maximum size of a file (in bytes) that can be uploaded from the JSPUI (not applicable for the XMLUI). It defaults to 536870912 bytes (512MB). You may set this to -1 to disable any file size limitation.
        • Note: Increasing this value or setting to -1 does not guarantee that DSpace will be able to successfully upload larger files via the web, as large uploads depend on many other factors including bandwidth, web server settings, internet connection speed, etc.
      • webui.submit.upload.required - Whether or not all users are required to upload a file when they submit an item to DSpace. It defaults to 'true'. When set to 'false' users will see an option to skip the upload step when they submit a new item.
        • @@ -638,14 +638,14 @@ org.dspace.submit.AbstractProcessingStep class and implement all methods defined by that abstract class.
      • This class should be built in such a way that it can process the - input gathered from either the XML-UI or JSP-UI interface.
        • + input gathered from either the XMLUI or JSPUI interface.
      3. -
    3. (For steps using JSP-UI) Create the JSPs to display - the user interface. Create a new JSP-UI "binding" class to initialize +
    4. (For steps using JSPUI) Create the JSPs to display + the user interface. Create a new JSPUI "binding" class to initialize and call these JSPs.
        5. -
      • Your JSP-UI "binding" class must extend the abstract class org.dspace.app.webui.submit.JSPStep +
      • Your JSPUI "binding" class must extend the abstract class org.dspace.app.webui.submit.JSPStep and implement all methods defined there. It's recommended to use one of the classes in org.dspace.app.webui.submit.step.* as a reference.
      • Any JSPs created should be loaded by calling the showJSP() method of @@ -654,11 +654,11 @@ also create a Review JSP which will display a read-only view of all data gathered during this step. The path to this JSP must be returned by your getReviewJSP() method. You will find examples - of Review JSPs (named similar to review-[step].jsp) in the - [dspace-source]/jsp/submit directory.
        • + of Review JSPs (named similar to review-[step].jsp) in the JSP + submit/ directory.
      -
    5. (For steps using XML-UI) Create an XML-UI "binding" Step Transformer +
    6. (For steps using XMLUI) Create an XMLUI "binding" Step Transformer which will generate the DRI XML which Manakin requires.
      • The Step Transformer must extend and implement @@ -670,10 +670,8 @@
      • (Required) Add a valid Step Definition to the item-submission.xml configuration file.
          -
        • This may also require that you add an I18N key for this - step's heading to - the [dspace-source]/config/language-packs/Messages.properties (for JSP UI) or - [manakin-source]/config/i18n/messages.xml (for Manakin XML UI) properties files.
          • +
        • This may also require that you add an I18N (Internationalization) key for this + step's heading. See the sections on Configuring Multilingual Support for JSPUI or Configuring Multilingual Support for XMLUI for more details.
        • For more information on <step> definitions within the item-submission.xml, see the section above on Defining Steps (<step>) within the item-submission.xml. diff --git a/dspace/docs/update.html b/dspace/docs/update.html index 106827efb1..4991826b8f 100644 --- a/dspace/docs/update.html +++ b/dspace/docs/update.html @@ -41,10 +41,10 @@
        • Build DSpace

          The build process has radically changed for DSpace 1.5. With this new release the build system has moved to a maven-based system enabling the various projects (JSPUI, XMLUI, OAI, and Core API) into separate projects. See the Installation section for more information on building DSpace using the new maven-based build system. Run the following commands to compile DSpace.

            
-  cd [dspace-source];
+  cd [dspace-source]/dspace/;
   mvn package
          -

          You will find the result in [dspace-source]/target/dspace-1.5-build.dir/; inside this directory is the compiled binary distribution of DSpace.

          +

          You will find the result in [dspace-source]/dspace/target/dspace-1.5-build.dir/; inside this directory is the compiled binary distribution of DSpace.

          • @@ -133,7 +133,7 @@ event.consumer.eperson.filters = EPerson+Create
        • Add xmlui.xconf Manakin configuration

          The new Manakin user interface available with DSpace 1.5 requires an extra configuration file that you will need to manually copy over to your configuration directory. 

          -cp [dspace-source]/config/xmlui.xconf [dspace]/config/xmlui.xconf
+cp [dspace-source]/dspace/config/xmlui.xconf [dspace]/config/xmlui.xconf
          • @@ -143,10 +143,10 @@ cp [dspace-source]/config/xmlui.xconf [dspace]/config/xmlui.xconf

          The database schema needs updating. SQL files contain the relevant updates are provided, note if you have made any local customizations to the database schema you should consult these updates and make sure they will work for you.

          • For PostgreSQL -

            psql -U [dspace-user] -f [dspace-source]/etc/database_schema_14-15.sql [database-name]

            +

            psql -U [dspace-user] -f [dspace-source]/dspace/etc/database_schema_14-15.sql [database-name]

          • For Oracle -

            [dspace-source]/etc/oracle/database_schema_142-15.sql contains the +

            [dspace-source]/dspace/etc/oracle/database_schema_142-15.sql contains the commands necessary to upgrade your database schema on oracle.

          @@ -154,7 +154,7 @@ commands necessary to upgrade your database schema on oracle.

        • Apply any customizations

          If you have made any local customizations to your DSpace installation they will need to be migrated over to the new DSpace. Commonly these modifications are made to "JSP" pages located inside the [dspace 1.4.2]/jsp/local directory. These should be moved -[dspace-source]/modules/dspace-jspui/src/main/webapp/ in the new build structure. See Customizing the JSP Pages for more information. +[dspace-source]/dspace/modules/dspace-jspui/src/main/webapp/ in the new build structure. See Customizing the JSP Pages for more information.

          • @@ -162,9 +162,9 @@ commands necessary to upgrade your database schema on oracle.

        • Update DSpace -

          Update the DSpace installed directory with new code and libraries. Inside the [dspace-source]/target/dspace-1.5-build.dir/ directory run:

          +

          Update the DSpace installed directory with new code and libraries. Inside the [dspace-source]/dspace/target/dspace-1.5-build.dir/ directory run:

          -cd [dspace-source]/target/dspace-1.5-build.dir/;	
+cd [dspace-source]/dspace/target/dspace-1.5-build.dir/;	
 ant -Dconfig=[dspace]/config/dspace.cfg update