DSpace

Revision: 2355
          http://dspace.svn.sourceforge.net/dspace/?rev=2355&view=rev
Author:   grahamtriggs
Date:     2007-11-22 02:22:56 -0800 (Thu, 22 Nov 2007)

Log Message:
-----------
Add ability to customise the item list display for different browse indexes and sort options

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-11-21 12:39:54 UTC (rev 2354)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-11-22 10:22:56 UTC (rev 2355)
@@ -398,6 +398,29 @@
 #
 # webui.itemlist.columns = dc.date.issued(date), dc.title, dc.contributor.*
 
+# Additionally, you can override the DC fields used on the listing page for
+# a given browse index and/or sort option. As a sort option or index may be defined
+# on a field that isn't normally included in the list, this allows you to display
+# the fields that have been indexed / sorted on.
+#
+# There are a number of forms the configuration can take, and the order in which
+# they are listed below is the priority in which they will be used (so a combination
+# of an index name and sort name will take precedence over just the browse name).
+#
+# webui.itemlist.browse.<index name>.sort.<sort name>.columns
+# webui.itemlist.sort.<sort name>.columns
+# webui.itemlist.browse.<browse name>.columns
+# webui.itemlist.<sort or index name>.columns
+#
+# In the last case, a sort option name will always take precedence over a browse
+# index name. Note also, that for any additional columns you list, you will need to
+# ensure there is an itemlist.<field name> entry in the messages file.
+#
+# The following example would display the date of accession in place of the issue date
+# whenever the dateaccessioned browse index or sort option is selected.
+#
+# webui.itemlist.dateaccessioned.columns = dc.date.accessioned(date), dc.title, dc.contributor.*
+
 ###### Browse Configuration ######
 #
 # Use this to configure the browse indices. Each entry will receive a link in the 

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java	2007-11-21 12:39:54 UTC (rev 2354)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java	2007-11-22 10:22:56 UTC (rev 2355)
@@ -40,48 +40,31 @@
 package org.dspace.app.webui.jsptag;
 
 import org.apache.log4j.Logger;
-import org.dspace.app.webui.util.Authenticate;
 import org.dspace.app.webui.util.UIUtil;
-
-import org.dspace.authorize.AuthorizeManager;
-
+import org.dspace.browse.*;
 import org.dspace.content.Bitstream;
-import org.dspace.content.Bundle;
 import org.dspace.content.DCDate;
 import org.dspace.content.DCValue;
 import org.dspace.content.Item;
-
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.Utils;
-
 import org.dspace.storage.bitstore.BitstreamStorageManager;
 
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.jstl.fmt.LocaleSupport;
+import javax.servlet.jsp.tagext.TagSupport;
 import java.awt.image.BufferedImage;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-
 import java.sql.SQLException;
 import java.util.StringTokenizer;
 
-import javax.imageio.ImageIO;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.jstl.fmt.LocaleSupport;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.dspace.browse.BrowseItem;
-import org.dspace.browse.Thumbnail;
-import org.dspace.browse.CrossLinks;
-import org.dspace.browse.BrowseIndex;
-import org.dspace.browse.BrowseException;
-import org.dspace.browse.BrowseInfo;
-
 /**
  * Tag for display a list of items
  * 
@@ -157,11 +140,54 @@
         */
         
         // get the elements to display
-        String configLine = ConfigurationManager.getProperty("webui.itemlist.columns");
-        if (configLine != null)
+        String browseListLine = null;
+
+        // As different indexes / sort options may require different columns to be displayed
+        // try to obtain a custom configuration based for the browse that has been performed
+        if (browseInfo != null)
         {
-            listFields = configLine;
+            SortOption so = browseInfo.getSortOption();
+            BrowseIndex bix = browseInfo.getBrowseIndex();
+
+            // We have obtained the index that was used for this browse
+            if (bix != null)
+            {
+                // First, try to get a configuration for this browse and sort option combined
+                if (so != null && browseListLine == null)
+                    browseListLine = ConfigurationManager.getProperty("webui.itemlist.browse." + bix.getName() + ".sort." + so.getName() + ".columns");
+
+                // We haven't got a sort option defined, so get one for the index
+                // - it may be required later
+                if (so == null)
+                    so = bix.getSortOption();
+            }
+
+            // If no config found, attempt to get one for this sort option
+            if (so != null && browseListLine == null)
+                browseListLine = ConfigurationManager.getProperty("webui.itemlist.sort." + so.getName() + ".columns");
+
+            // If no config found, attempt to get one for this browse index
+            if (bix != null && browseListLine == null)
+                browseListLine = ConfigurationManager.getProperty("webui.itemlist.browse." + bix.getName() + ".columns");
+
+            // If no config found, attempt to get a general one, using the sort name
+            if (so != null && browseListLine == null)
+                browseListLine = ConfigurationManager.getProperty("webui.itemlist." + so.getName() + ".columns");
+
+            // If no config found, attempt to get a general one, using the index name
+            if (bix != null && browseListLine == null)
+                browseListLine = ConfigurationManager.getProperty("webui.itemlist." + bix.getName() + ".columns");
         }
+
+        if (browseListLine == null)
+        {
+            browseListLine = ConfigurationManager.getProperty("webui.itemlist.columns");
+        }
+
+        if (browseListLine != null)
+        {
+            listFields = browseListLine;
+        }
         
         // get the date and title fields
         String dateLine = ConfigurationManager.getProperty("webui.browse.index.date");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2357
          http://dspace.svn.sourceforge.net/dspace/?rev=2357&view=rev
Author:   grahamtriggs
Date:     2007-11-24 15:08:54 -0800 (Sat, 24 Nov 2007)

Log Message:
-----------
Removed authorlinks and subjectlinks configuration, as they were no longer used following Andrea's update

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/configure.html

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-11-23 14:14:12 UTC (rev 2356)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-11-24 23:08:54 UTC (rev 2357)
@@ -852,15 +852,6 @@
 # webui.suggest.loggedinusers.only = true
 
 
-#### Author and subject links ####
-# link author names back to browse-by-author (if not set, defaults to true)
-webui.authorlinks.enable = true
-webui.authorlinks.browse = author
-# link subjects back to browse-by-subject (if not set, defaults to false)
-webui.subjectlinks.enable = false
-webui.subjectlinks.browse = subject
-
-
 #### Controlled Vocabulary Settings #####
 # Enable or disable the controlled vocabulary add-on
 # Warning: this feature is not compatible with WAI (it requires javascript to function)

Modified: branches/dspace-1_5_x/dspace/docs/configure.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/configure.html	2007-11-23 14:14:12 UTC (rev 2356)
+++ branches/dspace-1_5_x/dspace/docs/configure.html	2007-11-24 23:08:54 UTC (rev 2357)
@@ -535,12 +535,6 @@
 		<li><code>dc.date.issued(date)</code> refers to DC 'date.issued' and render as a date</li>
 	 </ul>
 	 
-  <p>Links can be made from author and subject values to their applicable browse pages. By default
-  this is enabled for author names (links to browse-author) and disabled for subjects (links to browse-subject). They can be
-  changed by editing <code>webui.authorlinks.enable</code> and <code>webui.subjectlinks.enable</code>.
-  The metadata that constitutes authors and subjects is controlled by <code>webui.browse.index.author</code>
-  and <code>webui.browse.index.subject</code>.</p>
-  
   <h3>Customizing the Simple Item Display Metadata for Individual Collections</h3>
 
   <p>Create <code>dspace.cfg</code> entries for each of the "styles" of item display in the same way the default layout is configured. For example,</p>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2358
          http://dspace.svn.sourceforge.net/dspace/?rev=2358&view=rev
Author:   grahamtriggs
Date:     2007-11-25 05:29:44 -0800 (Sun, 25 Nov 2007)

Log Message:
-----------
Renamed recent.submissions.index to recent.submissions.sort-option
This is to avoid confusion with index names and sort options - also updated configuration documentation to correctly refer to sort-option and not index

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/configure.html
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/components/RecentSubmissionsManager.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceFeedGenerator.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-11-24 23:08:54 UTC (rev 2357)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-11-25 13:29:44 UTC (rev 2358)
@@ -584,7 +584,7 @@
 # is used by the Recent Submissions system and any other time based
 # browse query such as FeedServlet)
 #
-recent.submissions.index = dateaccessioned
+recent.submissions.sort-option = dateaccessioned
 
 # how many recent submissions should be displayed at any one time 
 #

Modified: branches/dspace-1_5_x/dspace/docs/configure.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/configure.html	2007-11-24 23:08:54 UTC (rev 2357)
+++ branches/dspace-1_5_x/dspace/docs/configure.html	2007-11-25 13:29:44 UTC (rev 2358)
@@ -736,11 +736,11 @@
 automatically load the relevant plugin for the Community and Collection home
 pages.  Values given in examples are the defaults supplied in <code>dspace.cfg</code></p>
 
-<p>First define the index name (from <code>webui.browse.index</code>) to use for
+<p>First define the sort name (from <code>webui.browse.sort-option</code>) to use for
 # displaying recent submissions.  For example:</p>
 
 <pre>
-recent.submissions.index = dateaccessioned
+recent.submissions.sort-option = dateaccessioned
 </pre>
 
 <p>Define how many recent submissions should be displayed at any one time,

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/components/RecentSubmissionsManager.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/components/RecentSubmissionsManager.java	2007-11-24 23:08:54 UTC (rev 2357)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/components/RecentSubmissionsManager.java	2007-11-25 13:29:44 UTC (rev 2358)
@@ -93,7 +93,7 @@
 		try
 		{
 			// get our configuration
-			String source = ConfigurationManager.getProperty("recent.submissions.index");
+			String source = ConfigurationManager.getProperty("recent.submissions.sort-option");
 			String count = ConfigurationManager.getProperty("recent.submissions.count");
 			
 			// prep our engine and scope

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java	2007-11-24 23:08:54 UTC (rev 2357)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java	2007-11-25 13:29:44 UTC (rev 2358)
@@ -311,10 +311,10 @@
     		// BrowseScope scope = new BrowseScope(context);
     		
     		// new method of doing the browse:
-    		String idx = ConfigurationManager.getProperty("recent.submissions.index");
+    		String idx = ConfigurationManager.getProperty("recent.submissions.sort-option");
     		if (idx == null)
     		{
-    			throw new IOException("There is no configuration supplied for: recent.submissions.index");
+    			throw new IOException("There is no configuration supplied for: recent.submissions.sort-option");
     		}
     		BrowseIndex bix = BrowseIndex.getItemBrowseIndex();
     		if (bix == null)

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java	2007-11-24 23:08:54 UTC (rev 2357)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java	2007-11-25 13:29:44 UTC (rev 2358)
@@ -306,7 +306,7 @@
         if (recentSubmissionItems != null)
             return recentSubmissionItems;
         
-        String source = ConfigurationManager.getProperty("recent.submissions.index");
+        String source = ConfigurationManager.getProperty("recent.submissions.sort-option");
         BrowserScope scope = new BrowserScope(context);
         scope.setCollection(collection);
         scope.setResultsPerPage(RECENT_SUBMISISONS);

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java	2007-11-24 23:08:54 UTC (rev 2357)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java	2007-11-25 13:29:44 UTC (rev 2358)
@@ -357,7 +357,7 @@
         if (recentSubmittedItems != null)
             return recentSubmittedItems;
 
-        String source = ConfigurationManager.getProperty("recent.submissions.index");
+        String source = ConfigurationManager.getProperty("recent.submissions.sort-option");
         BrowserScope scope = new BrowserScope(context);
         scope.setCommunity(community);
         scope.setResultsPerPage(RECENT_SUBMISISONS);

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceFeedGenerator.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceFeedGenerator.java	2007-11-24 23:08:54 UTC (rev 2357)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceFeedGenerator.java	2007-11-25 13:29:44 UTC (rev 2358)
@@ -542,7 +542,7 @@
     	if (recentSubmissionItems != null)
     		return recentSubmissionItems;
 
-        String source = ConfigurationManager.getProperty("recent.submissions.index");
+        String source = ConfigurationManager.getProperty("recent.submissions.sort-option");
     	BrowserScope scope = new BrowserScope(context);
     	if (dso instanceof Collection)
     		scope.setCollection((Collection) dso);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2364
          http://dspace.svn.sourceforge.net/dspace/?rev=2364&view=rev
Author:   grahamtriggs
Date:     2007-11-26 02:21:46 -0800 (Mon, 26 Nov 2007)

Log Message:
-----------
Changed 'number' column to 'count' as number is a reserved word in Oracle

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/etc/database_schema.sql
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOOracle.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOPostgres.java

Modified: branches/dspace-1_5_x/dspace/etc/database_schema.sql
===================================================================
--- branches/dspace-1_5_x/dspace/etc/database_schema.sql	2007-11-26 09:51:43 UTC (rev 2363)
+++ branches/dspace-1_5_x/dspace/etc/database_schema.sql	2007-11-26 10:21:46 UTC (rev 2364)
@@ -742,12 +742,12 @@
 
 CREATE TABLE collection_item_count (
 	collection_id INTEGER REFERENCES collection(collection_id),
-	number INTEGER
+	count INTEGER
 );
 
 CREATE TABLE community_item_count (
 	community_id INTEGER REFERENCES community(community_id),
-	number INTEGER
+	count INTEGER
 );
 
 -------------------------------------------------------

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOOracle.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOOracle.java	2007-11-26 09:51:43 UTC (rev 2363)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOOracle.java	2007-11-26 10:21:46 UTC (rev 2364)
@@ -66,10 +66,10 @@
 	private String collectionSelect = "SELECT * FROM collection_item_count WHERE collection_id = ?";
 	
 	/** SQL to insert a new collection record */
-	private String collectionInsert = "INSERT INTO collection_item_count (collection_id, number) VALUES (?, ?)";
+	private String collectionInsert = "INSERT INTO collection_item_count (collection_id, count) VALUES (?, ?)";
 	
 	/** SQL to update an existing collection record */
-	private String collectionUpdate = "UPDATE collection_item_count SET number = ? WHERE collection_id = ?";
+	private String collectionUpdate = "UPDATE collection_item_count SET count = ? WHERE collection_id = ?";
 	
 	/** SQL to remove a collection record */
 	private String collectionRemove = "DELETE FROM collection_item_count WHERE collection_id = ?";
@@ -78,10 +78,10 @@
 	private String communitySelect = "SELECT * FROM community_item_count WHERE community_id = ?";
 	
 	/** SQL to insert a new community record */
-	private String communityInsert = "INSERT INTO community_item_count (community_id, number) VALUES (?, ?)";
+	private String communityInsert = "INSERT INTO community_item_count (community_id, count) VALUES (?, ?)";
 	
 	/** SQL to update an existing community record */
-	private String communityUpdate = "UPDATE community_item_count SET number = ? WHERE community_id = ?";
+	private String communityUpdate = "UPDATE community_item_count SET count = ? WHERE community_id = ?";
 	
 	/** SQL to remove a community record */
 	private String communityRemove = "DELETE FROM community_item_count WHERE community_id = ?";
@@ -287,7 +287,7 @@
 			
 			tri.close();
 			
-			return tr.getIntColumn("number");
+			return tr.getIntColumn("count");
 		}
 		catch (SQLException e)
 		{
@@ -325,7 +325,7 @@
 			
 			tri.close();
 			
-			return tr.getIntColumn("number");
+			return tr.getIntColumn("count");
 		}
 		catch (SQLException e)
 		{

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOPostgres.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOPostgres.java	2007-11-26 09:51:43 UTC (rev 2363)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOPostgres.java	2007-11-26 10:21:46 UTC (rev 2364)
@@ -66,10 +66,10 @@
 	private String collectionSelect = "SELECT * FROM collection_item_count WHERE collection_id = ?";
 	
 	/** SQL to insert a new collection record */
-	private String collectionInsert = "INSERT INTO collection_item_count (collection_id, number) VALUES (?, ?)";
+	private String collectionInsert = "INSERT INTO collection_item_count (collection_id, count) VALUES (?, ?)";
 	
 	/** SQL to update an existing collection record */
-	private String collectionUpdate = "UPDATE collection_item_count SET number = ? WHERE collection_id = ?";
+	private String collectionUpdate = "UPDATE collection_item_count SET count = ? WHERE collection_id = ?";
 	
 	/** SQL to remove a collection record */
 	private String collectionRemove = "DELETE FROM collection_item_count WHERE collection_id = ?";
@@ -78,10 +78,10 @@
 	private String communitySelect = "SELECT * FROM community_item_count WHERE community_id = ?";
 	
 	/** SQL to insert a new community record */
-	private String communityInsert = "INSERT INTO community_item_count (community_id, number) VALUES (?, ?)";
+	private String communityInsert = "INSERT INTO community_item_count (community_id, count) VALUES (?, ?)";
 	
 	/** SQL to update an existing community record */
-	private String communityUpdate = "UPDATE community_item_count SET number = ? WHERE community_id = ?";
+	private String communityUpdate = "UPDATE community_item_count SET count = ? WHERE community_id = ?";
 	
 	/** SQL to remove a community record */
 	private String communityRemove = "DELETE FROM community_item_count WHERE community_id = ?";
@@ -287,7 +287,7 @@
 			
 			tri.close();
 			
-			return tr.getIntColumn("number");
+			return tr.getIntColumn("count");
 		}
 		catch (SQLException e)
 		{
@@ -325,7 +325,7 @@
 			
 			tri.close();
 			
-			return tr.getIntColumn("number");
+			return tr.getIntColumn("count");
 		}
 		catch (SQLException e)
 		{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2393
          http://dspace.svn.sourceforge.net/dspace/?rev=2393&view=rev
Author:   tdonohue
Date:     2007-11-27 14:03:24 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
Applying SF patch #1589429 - "Self-Named" Media Filters (i.e. MediaFilter Plugins!)
[This original patch was modified slightly to leave the existing MediaFilter abstract class intact, 
and instead create a new FormatFilter interface which MediaFilter now implements]

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/CHANGES
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/application.html
    branches/dspace-1_5_x/dspace/docs/business.html
    branches/dspace-1_5_x/dspace/docs/configure.html
    branches/dspace-1_5_x/dspace/docs/index.html
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/BrandedPreviewJPEGFilter.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilter.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java

Added Paths:
-----------
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/FormatFilter.java

Modified: branches/dspace-1_5_x/dspace/CHANGES
===================================================================
--- branches/dspace-1_5_x/dspace/CHANGES	2007-11-27 10:02:09 UTC (rev 2392)
+++ branches/dspace-1_5_x/dspace/CHANGES	2007-11-27 22:03:24 UTC (rev 2393)
@@ -61,6 +61,7 @@
 
 (Tim Donohue)
 - Added Configurable Submission to JSP-UI and XML-UI (updated version of SF Patch #1691345)
+- SF Patch #1589429 "Self-Named" Media Filters (i.e. MediaFilter Plugins) (updated version of this patch)
 
 (Stuart Lewis)
 - SF Patch #1737792 Patch for bug 1552760 - Submit interface looks bad in Safari

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-11-27 10:02:09 UTC (rev 2392)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-11-27 22:03:24 UTC (rev 2393)
@@ -784,15 +784,25 @@
 # will be left blank in the new eperson object.
 #ldap.phone_field = telephoneNumber
 
-#### Media Filter plugins (through PluginManager) ####
 
-plugin.sequence.org.dspace.app.mediafilter.MediaFilter = \
-    org.dspace.app.mediafilter.PDFFilter, org.dspace.app.mediafilter.HTMLFilter, \
-    org.dspace.app.mediafilter.WordFilter, org.dspace.app.mediafilter.JPEGFilter
-# to enable branded preview: remove last line above, and uncomment 2 lines below
-#   org.dspace.app.mediafilter.WordFilter, org.dspace.app.mediafilter.JPEGFilter, \
-#   org.dspace.app.mediafilter.BrandedPreviewJPEGFilter
-        
+#### Media Filter / Format Filter plugins (through PluginManager) ####
+
+#Names of the enabled MediaFilter or FormatFilter plugins
+filter.plugins = PDF Text Extractor, HTML Text Extractor, \
+				 Word Text Extractor, JPEG Thumbnail
+# [To enable Branded Preview]: remove last line above, and uncomment 2 lines below
+#   			 Word Text Extractor, JPEG Thumbnail, \
+#   			 Branded Preview JPEG
+
+#Assign 'human-understandable' names to each filter
+plugin.named.org.dspace.app.mediafilter.FormatFilter = \
+  org.dspace.app.mediafilter.PDFFilter = PDF Text Extractor, \
+  org.dspace.app.mediafilter.HTMLFilter = HTML Text Extractor, \
+  org.dspace.app.mediafilter.WordFilter = Word Text Extractor, \
+  org.dspace.app.mediafilter.JPEGFilter = JPEG Thumbnail, \
+  org.dspace.app.mediafilter.BrandedPreviewJPEGFilter = Branded Preview JPEG
+
+#Configure each filter's input format(s)
 filter.org.dspace.app.mediafilter.PDFFilter.inputFormats = Adobe PDF
 filter.org.dspace.app.mediafilter.HTMLFilter.inputFormats = HTML, Text
 filter.org.dspace.app.mediafilter.WordFilter.inputFormats = Microsoft Word

Modified: branches/dspace-1_5_x/dspace/docs/application.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/application.html	2007-11-27 10:02:09 UTC (rev 2392)
+++ branches/dspace-1_5_x/dspace/docs/application.html	2007-11-27 22:03:24 UTC (rev 2393)
@@ -949,42 +949,65 @@
 
   <h2><a name="mediafilters" id="mediafilters">MediaFilters: Transforming DSpace Content</a></h2>
 
-  <p>DSpace can apply filters to content/bitstreams, creating new content. Filters are included that extract text for <strong>full-text searching</strong>, and create <strong>thumbnails</strong> for items that contain images. The media filters are controlled by the <code>MediaFilterManager</code> which traverses the asset store, invoking the <code>MediaFilter</code> subclasses on bitstreams. The MediaFilter plugin config item <code>plugin.named.org.dspace.app.mediafilter.MediaFilter</code> in <code>dspace.cfg</code> contains a list of bitstream format types and the filters that operate on bitstreams of that type. The media filter system is intended to be run from the command line (or regularly as a cron task):</p>
+  <p>DSpace can apply filters to content/bitstreams, creating new content. Filters are included that extract text for <strong>full-text searching</strong>, and create <strong>thumbnails</strong> for items that contain images. 
+  The media filters are controlled by the <code>MediaFilterManager</code> which traverses the asset store, invoking the <code>MediaFilter</code> or <code>FormatFilter</code> classes on bitstreams. 
+  The media filter plugin configuration <code>filter.plugins</code> in <code>dspace.cfg</code> contains a list of all enabled media/format filter plugins (see <a href="configure.html#mediafilters">Configuring Media Filters</a> for more information).  
+  The media filter system is intended to be run from the command line (or regularly as a cron task):</p>
   <pre>
-dspace/bin/filter-media
+[dspace]/bin/filter-media
 </pre>
 
-  <p>Traverse the asset store, applying media filters to bitstreams, skipping bitstreams that have already been filtered.</p>
-  <pre>
-dspace/bin/filter-media -f
-</pre>
+  <p>With no options, this traverses the asset store, applying media filters to bitstreams, and skipping bitstreams that have already been filtered.</p>
+  
+  <p><strong>Available Command-Line Options:</strong></p>
 
-  <p>Apply filters to ALL bitstreams, even if they've already been filtered.</p>
-  <pre>
-dspace/bin/filter-media -v
-</pre>
+<ul>
+<li><code>[dspace]/bin/filter-media -h</code>
+   <ul>
+   <li>Display help message describing all command-line options.</li>
+   </ul>
+</li>
 
-  <p>Verbose mode - print all extracted text and other filter details to STDOUT.</p>
-  <pre>
-dspace/bin/filter-media -n
-</pre>
+<li><code>[dspace]/bin/filter-media -f</code>
+	<ul>
+	<li>"Force" mode - Apply filters to ALL bitstreams, even if they've already been filtered.  If they've already been filtered, the previously filtered content is overwritten.</li>
+ 	</ul>
+</li>
+ 
+<li><code>[dspace]/bin/filter-media -i 123456789/2</code>
+	<ul>
+	<li>Restrict processing to the community, collection, or item named by the identifier - by default, all bitstreams of all items in the repository are processed. The identifier must be a Handle, not a DB key. This option may be combined with any other option.</li>
+	</ul>
+</li>
+ 
+<li><code>[dspace]/bin/filter-media -m 1000</code>
+	<ul>
+	<li>Suspend operation after the specified maximum number of items have been processed - by default, no limit exists. This option may be combined with any other option.</li>
+	</ul>
+</li>
+ 
+<li><code>[dspace]/bin/filter-media -n</code>
+	<ul>
+	<li>Suppress index creation - by default, a new search index is created for full-text searching. This option suppresses index creation if you intend to run <code>index-all</code> elsewhere.</li>
+  	</ul>
+</li>
 
-  <p>Suppress index creation - by default, a new search index is created for full-text searching. This option suppresses index creation if you intend to run <code>index-all</code> elsewhere.</p>
+<li><code>[dspace]/bin/filter-media -p "PDF Text Extractor","Word Text Extractor"</code>
+	<ul>
+	<li>Apply ONLY the filter plugin(s) listed (separated by commas).  By default all named filters listed in the <code>filter.plugins</code> field of <code>dspace.cfg</code> are applied. This option may be combined with any other option. <em>WARNING:</em> multiple plugin names must be separated by a comma (i.e. ',') and NOT a comma followed by a space (i.e. ', ').</li>
+	</ul>
+</li>
   
-  <pre>
-dspace/bin/filter-media -i 123456789/2
-</pre>
+<li><code>[dspace]/bin/filter-media -v</code>
+	<ul>
+	<li>Verbose mode - print all extracted text and other filter details to STDOUT.</li>
+	</ul>
+</li>
 
-  <p>Restrict processing to the community, collection, or item named by the identifier - by default, all bitstreams of all items in the repository are processed. The identifier must be a handle, not a DB key. This option may be combined with any other option.</p>
-  
-  <pre>
-dspace/bin/filter-media -m 1000
-</pre>
+</ul>
 
-  <p>Suspend operation after the specified maximum number of items have been processed - by default, no limit exists. This option may be combined with any other option.</p>
+  <p>Adding your own filters is done by creating a class which <code>implements</code> the <code>org.dspace.app.mediafilter.FormatFilter</code> interface. See the <a href="configure.html#newfilter">Creating a new Media Filter</a> topic and comments in the source file FormatFilter.java for more information. In theory filters could be implemented in any programming language (C, Perl, etc.) However, they need to be invoked by the Java code in the Media Filter class that you create.</p>
 
-  <p>Adding your own filters is done by creating a sub-class of the <code>MediaFilter</code> class. See the comments in the source file MediaFilter.java for more information. In theory filters could be implemented in any language (C, Perl, etc.) They only need to be invoked by the Java code in the <code>MediaFilter</code> class that you create.</p>
-
   <h2><a name="filiator" id="filiator">Sub-Community Management</a></h2>
 
   <p>DSpace provides an administrative tool - 'CommunityFiliator' - for managing community sub-structure. Normally this structure seldom changes, but prior to the 1.2 release sub-communities were not supported, so this tool could be used to place existing pre-1.2 communities into a hierarchy. It has two operations, either establishing a community to sub-community relationship, or dis-establishing an existing relationship.</p>

Modified: branches/dspace-1_5_x/dspace/docs/business.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/business.html	2007-11-27 10:02:09 UTC (rev 2392)
+++ branches/dspace-1_5_x/dspace/docs/business.html	2007-11-27 22:03:24 UTC (rev 2393)
@@ -425,7 +425,7 @@
     <p>See the <a href="#pluginmethods">getNamedPlugin()</a> method and the getPluginNames() methods.</p></li>
     </ol></p>
 
-    <h4>Self-Named Plugins</h4>
+    <h4><a name="selfnamedplugin">Self-Named Plugins</a></h4>
 
     <p>Named plugins can get their names either from the configuration or, for a variant called self-named plugins, from within the plugin itself.</p>
 
@@ -513,7 +513,7 @@
 
   <h4>SelfNamedPlugin Class</h4>
 
-  <p>A named plugin implementation must extend this class if it wants to supply its own Plugin Name(s). See Self-Named Plugins for why this is sometimes necessary.</p>
+  <p>A named plugin implementation must extend this class if it wants to supply its own Plugin Name(s). See <a href="#selfnamedplugin">Self-Named Plugins</a> for why this is sometimes necessary.</p>
 
 <pre>abstract class SelfNamedPlugin
 {
@@ -544,11 +544,11 @@
 
   <p>This is a <code>RuntimeException</code> so it doesn't have to be declared, and can be passed all the way up to a generalized fatal exception handler.</p>
 
-  <h3>Configuring Plugins</h3>
+  <h3><a name="pluginconfig">Configuring Plugins</a></h3>
 
   <p>All of the Plugin Manager's configuration comes from the DSpace Configuration Manager, which is a Java Properties map. You can configure these characteristics of each plugin:
   <ol>
-  <li><strong>Interface</strong>: Classname of the Java interface which defines the plugin, including package name. e.g. <code>org.dspace.app.mediafilter.MediaFilter</code></li>
+  <li><strong>Interface</strong>: Classname of the Java interface which defines the plugin, including package name. e.g. <code>org.dspace.app.mediafilter.FormatFilter</code></li>
   <li><strong>Implementation Class</strong>: Classname of the implementation class, including package. e.g. <code>org.dspace.app.mediafilter.PDFFilter</code></li>
   <li><strong>Names</strong>: (Named plugins only) There are two ways to bind names to plugins: listing them in the value of a plugin.named.interface key, or configuring a class in <code>plugin.selfnamed.<i>interface</i></code> which extends the <code>SelfNamedPlugin</code> class.</li>
   <li><strong>Reusable option</strong>: (Optional) This is declared in a <code>plugin.reusable</code> configuration line. Plugins are reusable by default, so you only need to configure the non-reusable ones.</li>

Modified: branches/dspace-1_5_x/dspace/docs/configure.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/configure.html	2007-11-27 10:02:09 UTC (rev 2392)
+++ branches/dspace-1_5_x/dspace/docs/configure.html	2007-11-27 22:03:24 UTC (rev 2393)
@@ -1141,29 +1141,133 @@
 
   <p><strong>NOTE:</strong> While the indexes are created, this only affects the search results and has no effect on the search components of the user interface. To add new search capability (e.g. to add a new search category to the Advanced Search) requires local customisation to the user interface.</p>
 
-  <h2><a name="mediafilters" id="mediafilters">Media Filters</a></h2>
+  <h2><a name="mediafilters" id="mediafilters">Configuring Media Filters</a></h2>
   
-  <p>Media Filters are classes used to generate derivative or alternative versions of master bitstreams. For example, the PDF Media Filter will extract textual content from PDF bitstreams, the JPEG Media Filter can create thumbnails from image bitstreams.</p>
+  <p>Media or Format Filters are classes used to generate derivative or alternative versions of content or bitstreams within DSpace. For example, the PDF Media Filter will extract textual content from PDF bitstreams, the JPEG Media Filter can create thumbnails from image bitstreams.</p>
 
-  <p>Media Filters are configured as a <a href="business.html#plugin">Sequence Plugin</a>, with each filter also having a separate config item indicating which formats it can process. The default configuration is shown below.</p>
+  <p>Media Filters are configured as <a href="business.html#plugin">Named Plugins</a>, with each filter also having a separate configuration setting (in <code>dspace.cfg</code>) indicating which formats it can process. The default configuration is shown below.</p>
 
-<p><pre>#### Media Filter plugins (through PluginManager) ####
+<p><pre>
+	#### Media Filter / Format Filter plugins (through PluginManager) ####
 
-plugin.sequence.org.dspace.app.mediafilter.MediaFilter = \
-    org.dspace.app.mediafilter.PDFFilter, org.dspace.app.mediafilter.HTMLFilter, \
-    org.dspace.app.mediafilter.WordFilter, org.dspace.app.mediafilter.JPEGFilter
-# to enable branded preview: remove last line above, and uncomment 2 lines below
-#   org.dspace.app.mediafilter.WordFilter, org.dspace.app.mediafilter.JPEGFilter, \
-#   org.dspace.app.mediafilter.BrandedPreviewJPEGFilter
+	#Names of the enabled MediaFilter or FormatFilter plugins
+	filter.plugins = PDF Text Extractor, HTML Text Extractor, \
+						Word Text Extractor, JPEG Thumbnail
+	# to enable branded preview: remove last line above, and uncomment 2 lines below
+	#   					Word Text Extractor, JPEG Thumbnail, \
+	#   					Branded Preview JPEG
 
-filter.org.dspace.app.mediafilter.PDFFilter.inputFormats = Adobe PDF
-filter.org.dspace.app.mediafilter.HTMLFilter.inputFormats = HTML, Text
-filter.org.dspace.app.mediafilter.WordFilter.inputFormats = Microsoft Word
-filter.org.dspace.app.mediafilter.JPEGFilter.inputFormats = GIF, JPEG, image/png
-filter.org.dspace.app.mediafilter.BrandedPreviewJPEGFilter.inputFormats = GIF, JPEG, image/png</pre></p>
+	#Assign 'human-understandable' names to each filter
+	plugin.named.org.dspace.app.mediafilter.FormatFilter = \
+  		org.dspace.app.mediafilter.PDFFilter = PDF Text Extractor, \
+  		org.dspace.app.mediafilter.HTMLFilter = HTML Text Extractor, \
+  		org.dspace.app.mediafilter.WordFilter = Word Text Extractor, \
+  		org.dspace.app.mediafilter.JPEGFilter = JPEG Thumbnail, \
+  		org.dspace.app.mediafilter.BrandedPreviewJPEGFilter = Branded Preview JPEG
 
-<p>To add a new Media Filter, add the new filter class to the <code>plugin.sequence.org.dspace.app.mediafilter.MediaFilter</code> config item and add a corresponding <code>filter.<i>&lt;class path&gt;</i>.inputFormats</code> config item. Note the input formats must match the <code>short_description</code> field in the <code>bitstreamformatregistry</code> table.</p>
+	#Configure each filter's input format(s)
+	filter.org.dspace.app.mediafilter.PDFFilter.inputFormats = Adobe PDF
+	filter.org.dspace.app.mediafilter.HTMLFilter.inputFormats = HTML, Text
+	filter.org.dspace.app.mediafilter.WordFilter.inputFormats = Microsoft Word
+	filter.org.dspace.app.mediafilter.JPEGFilter.inputFormats = GIF, JPEG, image/png
+	filter.org.dspace.app.mediafilter.BrandedPreviewJPEGFilter.inputFormats = GIF, JPEG, image/png</pre></p>
 
+<p>The enabled Media/Format Filters are named in the <code>filter.plugins</code> field above.</p>
+<p>Names are assigned to each filter using the <code>plugin.named.org.dspace.app.mediafilter.FormatFilter</code> field
+(e.g. by default the <code>PDFFilter</code> is named "PDF Text Extractor").</p>  
+<p>Finally the appropriate <code>filter.<em>&lt;class path&gt;</em>.inputFormats</code> defines the vaild input formats which each filter can be applied to.  These
+format names <strong>must match</strong> the <code>short description</code> field of the <a href="appendix.html#bitstreamformatregistry">Bitstream Format Registry</a>.</p>
+
+<p>You can also implement more dynamic or configurable Media/Format Filters which extend <a href="business.html#selfnamedplugin"><code>SelfNamedPlugin</code></a>.  
+More information is provide below in <a href="#newfilter">Creating a new Media/Format Filter</a></p>
+
+ <h3><a name="newfilter">Creating a new Media/Format Filter</a></h3>
+
+    <h4>Creating a simple Media Filter</h4>
+    <p>New Media Filters <strong>must implement</strong> the <code>org.dspace.app.mediafilter.FormatFilter</code> interface.  More information on the methods you need to implement is provided in the <code>FormatFilter.java</code> source file.  For example:
+    <code><pre>
+	public class MySimpleMediaFilter implements FormatFilter</pre></code>
+    </p>  
+	
+	<p>Alternatively, you could extend the <code>org.dspace.app.mediafilter.MediaFilter</code> class, which just defaults to performing no pre/post-processing of bitstreams before or after filtering.
+	<code><pre>
+	public class MySimpleMediaFilter extends MediaFilter</pre></code>
+	</p>
+	
+	<p>You must give your new filter a "name", by adding it and its name to the <code>plugin.named.org.dspace.app.mediafilter.FormatFilter</code> field in <code>dspace.cfg</code>.
+	In addition to naming your filter, make sure to specify its input formats in the
+	<code>filter.<i>&lt;class path&gt;</i>.inputFormats</code> config item. Note the input formats must match the <code>short description</code> field in the <a href="appendix.html#bitstreamformatregistry">Bitstream Format Registry</a> (i.e. <code>bitstreamformatregistry</code> table).
+	<code><pre>
+	plugin.named.org.dspace.app.mediafilter.FormatFilter = \
+  		org.dspace.app.mediafilter.MySimpleMediaFilter = My Simple Text Filter, \
+  		...
+  	
+  	filter.org.dspace.app.mediafilter.MySimpleMediaFilter.inputFormats = Text</pre></code>
+	</p>
+	
+	<em>WARNING: If you neglect to define the <code>inputFormats</code> for
+	   a particular filter, the <code>MediaFilterManager</code> will never call that filter, since it will never find a bitstream which has a format
+	   matching that filter's input format(s).</em>
+	
+	<p>If you have a complex Media Filter class, which actually performs different filtering for different formats (e.g. conversion from Word to PDF <strong>and</strong> conversion from Excel to CSV), you should define this as a <a href="selfnamedfilter">Dynamic / Self-Named Format Filter</a>.
+	
+    <h4>Creating a Dynamic or "Self-Named" Format Filter</h4>	
+	<p>If you have a more complex Media/Format Filter, which actually performs <strong>multiple</strong> filtering or conversions for different formats (e.g. conversion from Word to PDF <strong>and</strong> conversion from Excel to CSV), you should have define a class which implements the <code>FormatFilter</code> interface, 
+	while also extending the <a href="business.html#selfnamedplugin"><code>SelfNamedPlugin</code></a> class.  For example:
+	<code><pre>
+	public class MyComplexMediaFilter extends SelfNamedPlugin implements FormatFilter</pre></code>
+	</p>
+
+	<p>Since <code>SelfNamedPlugins</code> are self-named (as stated), they must provide the various names the plugin uses by defining a <a href="business.html#pluginmethods">getPluginNames()</a> method</a>.  
+	Generally speaking, each "name" the plugin uses should correspond to a different type of filter it implements (e.g. "Word2PDF" and "Excel2CSV" are two good names for a complex media filter which performs both Word to PDF and Excel to CSV conversions).
+	</p>
+	
+	<p>Self-Named Media/Format Filters are also configured differently in <code>dspace.cfg</code>.  Below is a general template for a Self Named Filter (defined by an imaginary <code>MyComplexMediaFilter</code> class, which
+	can perform both Word to PDF and Excel to CSV conversions):</p>
+	
+	<p><code><pre>
+	#Add to a list of all Self Named filters
+	plugin.selfnamed.org.dspace.app.mediafilter.FormatFilter = \
+  		org.dspace.app.mediafilter.MyComplexMediaFilter
+  		
+	#Define input formats for each "named" plugin this filter implements
+	filter.org.dspace.app.mediafilter.MyComplexMediaFilter.Word2PDF.inputFormats = Microsoft Word
+	filter.org.dspace.app.mediafilter.MyComplexMediaFilter.Excel2CSV.inputFormats = Microsoft Excel</pre>
+	</code></p>
+	
+	<p>As shown above, each Self-Named Filter class must be listed in the <code>plugin.selfnamed.org.dspace.app.mediafilter.FormatFilter</code> item in <code>dspace.cfg</code>.
+	   In addition, each Self-Named Filter <strong>must</strong> define the input formats for <em>each named plugin</em> defined by that filter.  
+	   In the above example the <code>MyComplexMediaFilter</code> class is assumed to have defined two named plugins, <code>Word2PDF</code> and <code>Excel2CSV</code>. 
+	   So, these two valid plugin names ("Word2PDF" and "Excel2CSV") <strong>must</strong> be returned by the <code>getPluginNames()</code> method of the <code>MyComplexMediaFilter</code> class.</p>
+	<p>These named plugins take different input formats as defined above (see the corresponding <code>inputFormats</code> setting).  <em>WARNING: If you neglect to define the <code>inputFormats</code> for
+	   a particular named plugin, the <code>MediaFilterManager</code> will never call that plugin, since it will never find a bitstream which has a format
+	   matching that plugin's input format(s).</em>
+	</p>
+	
+	<p>For a particular Self-Named Filter, you are also welcome to define additional configuration settings in <code>dspace.cfg</code>.
+	To continue with our current example, each of our imaginary plugins actually results in a different output format (Word2PDF creates "Adobe PDF", while Excel2CSV creates "Comma Separated Values").
+	To allow this complex Media Filter to be even more configurable (especially across institutions, with potential different "Bitstream Format Registries"), you may 
+	wish to allow for the output format to be customizable for each named plugin.  For example:</p>
+	
+	<p><code><pre>
+	#Define output formats for each named plugin
+	filter.org.dspace.app.mediafilter.MyComplexMediaFilter.Word2PDF.outputFormat = Adobe PDF
+	filter.org.dspace.app.mediafilter.MyComplexMediaFilter.Excel2CSV.outputFormat = Comma Separated Values</pre>
+	</code></p>
+	
+	<p>Any custom configuration fields in <code>dspace.cfg</code> defined by your filter are ignored by the <code>MediaFilterManager</code>, so it is up to your custom media filter class to read those configurations and apply them as necessary.  
+	For example, you could use the following sample Java code in your <code>MyComplexMediaFilter</code> class to read these custom <code>outputFormat</code> configurations from <code>dspace.cfg</code> :
+	<code><pre>
+	//get "outputFormat" configuration from dspace.cfg
+	String outputFormat = ConfigurationManager.getProperty(MediaFilterManager.FILTER_PREFIX + "." + 
+		MyComplexMediaFilter.class.getName() + "." + this.getPluginInstanceName() + ".outputFormat");</pre></code>
+	</p>
+	
+  <h3><a name="runningfilter">Running Media/Format Filter</a></h3>	
+  
+  <p>Information on scheduling Media/Format Filters to run is available in the section:
+  <a href="application.html#mediafilters">MediaFilters: Transforming DSpace Content</a></p>
+
   <h2><a name="statistics" id="statistics">Configuring System Statistical Reports</a></h2>
 
   <p>Statistics for the system can be made available at <code>http://www.mydspaceinstance.edu/statistics</code>. To use the system statistics you will have to initialise them as per the installation documentation, but before you do so you need to perform the customisations discussed here in order to ensure that the reports are generated correctly.</p>
@@ -1260,8 +1364,8 @@
   <p>To activate this feature and display a preview image on the item page (all properties mentioned below
      are found in <code>dspace.cfg</code>):</p>
   <ol>
-	<li>Uncomment the lines defining the list of configured mediafilters at
-<code>plugin.sequence.org.dspace.app.mediafilter.MediaFilter</code> to include <code>org.dspace.app.mediafilter.BrandedPreviewJPEGFilter</code>.</li>
+	<li>Uncomment the lines defining the list of enabled mediafilters at
+<code>filter.plugins</code> to include <code>Branded Preview JPEG</code>.</li>
 	<li>Set the maximum pixel dimensions for the preview image by altering the <code>webui.preview.maxwidth</code> and <code>webui.preview.maxheight</code> (default is 600) config items.</li>
 	<li>Set the <code>webui.preview.brand</code> to the text you want to brand the image with. The brand will appear as white text on a black background strip across the base of the image. For example you might set the text to the owning organisation. The handle is also displayed as part of the branding.</li>
 	<li>Set the <code>webui.preview.brand.abbrev</code>. This is an abbreviated form of the  <code>webui.preview.brand</code> text and will be shown where the brand text is longer than the image width (e.g. for narrow images).</li>
@@ -1282,7 +1386,7 @@
 
   <p><code>webui.browse.thumbnail.show = true</code></p>
 
-  <p>If set to <code>false</code> or this configuration item is missing then thumbnails will not be shown.  Additionally, appropriate <A HREF="application.html#mediafilters">media filters</a> must be configured and the media filter configured to run periodically (for example, via a 'cron' job) </p>
+  <p>If set to <code>false</code> or this configuration item is missing then thumbnails will not be shown.  Additionally, the appropriate <A HREF="#mediafilters">"JPEG Thumbnail" media filter</a> must be configured and the <a href="application.html#mediafilters">filter-media</a> script configured to run periodically (for example, via a 'cron' job) </p>
 
   <p>The size of the browse/search thumbnails can also be configured to a smaller size than that generated by the mediafilter. To do this set the following configuration items:</p>
 
@@ -1586,7 +1690,7 @@
 <li>passing in a properties file containing retention policies when using the -p option. </li>
 </ol>
 
-  <p>Pruning is controlled by a number of properties, each of which describes a checksum result code, and the length of time for which results with that code should be retained. The format is <code>checker.retention.[RESULT CODE]=[duration]. For example: -</p>
+  <p>Pruning is controlled by a number of properties, each of which describes a checksum result code, and the length of time for which results with that code should be retained. The format is <code>checker.retention.[RESULT CODE]=[duration]</code>. For example: -</p>
   
   <pre>checker.retention.CHECKSUM_MATCH=8w</pre>
   

Modified: branches/dspace-1_5_x/dspace/docs/index.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/index.html	2007-11-27 10:02:09 UTC (rev 2392)
+++ branches/dspace-1_5_x/dspace/docs/index.html	2007-11-27 22:03:24 UTC (rev 2393)
@@ -86,7 +86,7 @@
           <LI><A HREF="configure.html#ldap">Configuring LDAP Authentication</A></LI>
           <LI><A HREF="configure.html#search-index">Configuring Lucene Search Indexes</A></LI>
           <LI><A HREF="configure.html#statistics">Configuring System Statistical Reports</A></LI>
-          <LI><A HREF="configure.html#mediafilters">MediaFilters</A></LI>
+          <LI><A HREF="configure.html#mediafilters">Configuring MediaFilters</A></LI>
           <LI><A HREF="configure.html#preview">Displaying Image Item Preview</A></LI>
           <LI><A HREF="configure.html#webuithumbs">Displaying Image Thumbnails</A></LI>
           <LI><A HREF="configure.html#strengths">Displaying Community and Collection Item Counts</A></LI>

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/BrandedPreviewJPEGFilter.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/BrandedPreviewJPEGFilter.java	2007-11-27 10:02:09 UTC (rev 2392)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/BrandedPreviewJPEGFilter.java	2007-11-27 22:03:24 UTC (rev 2393)
@@ -182,7 +182,7 @@
         Brand brand = new Brand((int) xsize, brandHeight, new Font(brandFont, Font.PLAIN, brandFontPoint), 5);
 		BufferedImage brandImage = brand.create(ConfigurationManager.getProperty("webui.preview.brand"),
 												ConfigurationManager.getProperty("webui.preview.brand.abbrev"),
-												item == null ? "" : "hdl:" + item.getHandle());
+												MediaFilterManager.getCurrentItem() == null ? "" : "hdl:" + MediaFilterManager.getCurrentItem().getHandle());
 		
 		g2d.drawImage(brandImage, (int)0, (int)ysize, (int) xsize, (int) 20, null);
 

Added: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/FormatFilter.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/FormatFilter.java	                        (rev 0)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/FormatFilter.java	2007-11-27 22:03:24 UTC (rev 2393)
@@ -0,0 +1,135 @@
+/*
+ * FormatFilter.java
+ *
+ * Version: $Revision: 1491 $
+ *
+ * Date: $Date: 2006-03-29 21:46:42 -0500 (Wed, 29 Mar 2006) $
+ *
+ * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+package org.dspace.app.mediafilter;
+
+import java.io.InputStream;
+
+import org.dspace.content.Bitstream;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * Public interface for any class which transforms or converts content/bitstreams 
+ * from one format to another.  This interface should be implemented by any class
+ * which defines a "filter" to be run by the MediaFilterManager.
+ */
+public interface FormatFilter
+{
+    /**
+     * Get a filename for a newly created filtered bitstream
+     * 
+     * @param sourceName
+     *            name of source bitstream
+     * @return filename generated by the filter - for example, document.pdf
+     *         becomes document.pdf.txt
+     */
+    public String getFilteredName(String sourceName);
+
+    /**
+     * @return name of the bundle this filter will stick its generated
+     *         Bitstreams
+     */
+    public String getBundleName();
+
+    /**
+     * @return name of the bitstream format (say "HTML" or "Microsoft Word")
+     *         returned by this filter look in the bitstream format registry or
+     *         mediafilter.cfg for valid format strings.
+     */
+    public String getFormatString();
+
+    /**
+     * @return string to describe the newly-generated Bitstream's - how it was
+     *         produced is a good idea
+     */
+    public String getDescription();
+
+    /**
+     * @param source
+     *            input stream
+     * 
+     * @return result of filter's transformation, written out to a bitstream
+     */
+    public InputStream getDestinationStream(InputStream source)
+            throws Exception;
+
+    /**
+     * Perform any pre-processing of the source bitstream *before* the actual 
+     * filtering takes place in MediaFilterManager.processBitstream().
+     * <p>
+     * Return true if pre-processing is successful (or no pre-processing
+     * is necessary).  Return false if bitstream should be skipped
+     * for any reason.
+     * 
+     * 
+     * @param c
+     *            context
+     * @param item
+     *            item containing bitstream to process
+     * @param source
+     *            source bitstream to be processed
+     * 
+     * @return true if bitstream processing should continue, 
+     * 			false if this bitstream should be skipped
+     */
+    public boolean preProcessBitstream(Context c, Item item, Bitstream source)
+            throws Exception;
+        
+    /**
+     * Perform any post-processing of the generated bitstream *after* this
+     * filter has already been run.
+     * <p>
+     * Return true if pre-processing is successful (or no pre-processing
+     * is necessary).  Return false if bitstream should be skipped
+     * for some reason.
+     * 
+     * 
+     * @param c
+     *            context
+     * @param item
+     *            item containing bitstream to process
+     * @param generatedBitstream
+     *            the bitstream which was generated by
+     *            this filter.
+     */
+    public void postProcessBitstream(Context c, Item item, Bitstream generatedBitstream)
+            throws Exception;
+}
+


Property changes on: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/FormatFilter.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilter.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilter.java	2007-11-27 10:02:09 UTC (rev 2392)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilter.java	2007-11-27 22:03:24 UTC (rev 2393)
@@ -39,156 +39,64 @@
  */
 package org.dspace.app.mediafilter;
 
-import java.io.InputStream;
-
 import org.dspace.content.Bitstream;
-import org.dspace.content.BitstreamFormat;
-import org.dspace.content.Bundle;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 
-public abstract class MediaFilter
-{
-	protected Item item = null;
-	
-    /* To create your own filter, implement the following virtual methods */
 
-    /**
-     * Get a filename for a newly created filtered bitstream
+/**
+ * Abstract class which defines the default settings for a *simple* Media or Format Filter. 
+ * This class may be extended by any class which wishes to define a simple filter to be run 
+ * by the MediaFilterManager.  More complex filters should likely implement the FormatFilter
+ * interface directly, so that they can define their own pre/postProcessing methods.
+ */
+public abstract class MediaFilter implements FormatFilter
+{
+	/**
+     * Perform any pre-processing of the source bitstream *before* the actual 
+     * filtering takes place in MediaFilterManager.processBitstream().
+     * <p>
+     * Return true if pre-processing is successful (or no pre-processing
+     * is necessary).  Return false if bitstream should be skipped
+     * for any reason.
      * 
-     * @param sourceName
-     *            name of source bitstream
-     * @return filename generated by the filter - for example, document.pdf
-     *         becomes document.pdf.txt
-     */
-    public abstract String getFilteredName(String sourceName);
-
-    /**
-     * @return name of the bundle this filter will stick its generated
-     *         Bitstreams
-     */
-    public abstract String getBundleName();
-
-    /**
-     * @return name of the bitstream format (say "HTML" or "Microsoft Word")
-     *         returned by this filter look in the bitstream format registry or
-     *         mediafilter.cfg for valid format strings.
-     */
-    public abstract String getFormatString();
-
-    /**
-     * @return string to describe the newly-generated Bitstream's - how it was
-     *         produced is a good idea
-     */
-    public abstract String getDescription();
-
-    /**
+     * 
+     * @param c
+     *            context
+     * @param item
+     *            item containing bitstream to process
      * @param source
-     *            input stream
+     *            source bitstream to be processed
      * 
-     * @return result of filter's transformation, written out to a bitstream
+     * @return true if bitstream processing should continue, 
+     *          false if this bitstream should be skipped
      */
-    public abstract InputStream getDestinationStream(InputStream source)
-            throws Exception;
-
-    /* end of methods you need to implement! */
-
+    public boolean preProcessBitstream(Context c, Item item, Bitstream source)
+            throws Exception
+    {
+        return true;  //default to no pre-processing
+    }
+     
     /**
-     * processBitstream is a utility class that calls the above virtual methods -
-     * it is unlikely that you will need to override it. It scans the bitstreams
-     * in an item, and decides if a bitstream has already been filtered, and if
-     * not or if overWrite is set, invokes the filter.
+     * Perform any post-processing of the generated bitstream *after* this
+     * filter has already been run.
+     * <p>
+     * Return true if pre-processing is successful (or no pre-processing
+     * is necessary).  Return false if bitstream should be skipped
+     * for some reason.
      * 
+     * 
      * @param c
      *            context
      * @param item
      *            item containing bitstream to process
-     * @param source
-     *            source bitstream to process
-     * 
-     * @return true if new rendition is created, false if rendition already
-     *         exists and overWrite is not set
+     * @param generatedBitstream
+     *            the bitstream which was generated by
+     *            this filter.
      */
-    public boolean processBitstream(Context c, Item item, Bitstream source)
+    public void postProcessBitstream(Context c, Item item, Bitstream generatedBitstream)
             throws Exception
     {
-        boolean overWrite = MediaFilterManager.isForce;
-        
-        this.item = item;
-
-        // get bitstream filename, calculate destination filename
-        String newName = getFilteredName(source.getName());
-
-        Bitstream existingBitstream = null; // is there an existing rendition?
-        Bundle targetBundle = null; // bundle we're modifying
-
-        Bundle[] bundles = item.getBundles(getBundleName());
-
-        // check if destination bitstream exists
-        if (bundles.length > 0)
-        {
-            // only finds the last match (FIXME?)
-            for (int i = 0; i < bundles.length; i++)
-            {
-                Bitstream[] bitstreams = bundles[i].getBitstreams();
-
-                for (int j = 0; j < bitstreams.length; j++)
-                {
-                    if (bitstreams[j].getName().equals(newName))
-                    {
-                        targetBundle = bundles[i];
-                        existingBitstream = bitstreams[j];
-                    }
-                }
-            }
-        }
-
-        // if exists and overwrite = false, exit
-        if (!overWrite && (existingBitstream != null))
-        {
-            System.out.println("SKIPPED: bitstream " + source.getID()
-                    + " because '" + newName + "' already exists");
-
-            return false;
-        }
-
-        InputStream destStream = getDestinationStream(source.retrieve());
-
-        // create new bundle if needed
-        if (bundles.length < 1)
-        {
-            targetBundle = item.createBundle(getBundleName());
-        }
-        else
-        {
-            // take the first match
-            targetBundle = bundles[0];
-        }
-
-        Bitstream b = targetBundle.createBitstream(destStream);
-
-        // Now set the format and name of the bitstream
-        b.setName(newName);
-        b.setSource("Written by MediaFilter " + this.getClass().getName()); // or
-                                                                            // obj.getClass().getName();
-        b.setDescription(getDescription());
-
-        // Find the proper format
-        BitstreamFormat bf = BitstreamFormat.findByShortDescription(c,
-                getFormatString());
-        b.setFormat(bf);
-        b.update();
-
-        // fixme - set date?
-        // we are overwriting, so remove old bitstream
-        if (existingBitstream != null)
-        {
-            targetBundle.removeBitstream(existingBitstream);
-        }
-
-        System.out.println("FILTERED: bitstream " + source.getID()
-                + " and created '" + newName + "'");
-
-        return true;
+        //default to no post-processing necessary
     }
 }

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java	2007-11-27 10:02:09 UTC (rev 2392)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java	2007-11-27 22:03:24 UTC (rev 2393)
@@ -40,22 +40,30 @@
 
 package org.dspace.app.mediafilter;
 
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
-import java.util.Arrays;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.MissingArgumentException;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.PosixParser;
 
+import org.dspace.authorize.AuthorizeManager;
 import org.dspace.content.Bitstream;
 import org.dspace.content.BitstreamFormat;
 import org.dspace.content.Bundle;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
+import org.dspace.content.DCDate;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.content.ItemIterator;
@@ -63,11 +71,12 @@
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.PluginManager;
+import org.dspace.core.SelfNamedPlugin;
 import org.dspace.handle.HandleManager;
 import org.dspace.search.DSIndexer;
 
 /**
- * MediaFilterManager is the class that invokes the media filters over the
+ * MediaFilterManager is the class that invokes the media/format filters over the
  * repository's content. a few command line flags affect the operation of the
  * MFM: -v verbose outputs all extracted text to STDOUT; -f force forces all
  * bitstreams to be processed, even if they have been before; -n noindex does not
@@ -77,6 +86,15 @@
  */
 public class MediaFilterManager
 {
+	//key (in dspace.cfg) which lists all enabled filters by name
+    public static String MEDIA_FILTER_PLUGINS_KEY = "filter.plugins";
+	
+    //prefix (in dspace.cfg) for all filter properties
+    public static String FILTER_PREFIX = "filter";
+    
+    //suffix (in dspace.cfg) for input formats supported by each filter
+    public static String INPUT_FORMATS_SUFFIX = "inputFormats";
+    
     public static boolean updateIndex = true; // default to updating index
 
     public static boolean isVerbose = false; // default to not verbose
@@ -85,14 +103,20 @@
     
     public static String identifier = null; // object scope limiter
     
-    public static int max2Process = Integer.MAX_VALUE;  // maximum number to process
+    public static int max2Process = Integer.MAX_VALUE;  // maximum number items to process
     
-    public static int processed = 0;   // number processed
+    public static int processed = 0;   // number items processed
     
-    private static MediaFilter[] filterClasses = null;
+    private static Item currentItem = null;   // current item being processed
     
+    private static FormatFilter[] filterClasses = null;
+    
     private static Map filterFormats = new HashMap();
     
+    //separator in filterFormats Map between a filter class name and a plugin name,
+    //for MediaFilters which extend SelfNamedPlugin (\034 is "file separator" char)
+    public static String FILTER_PLUGIN_SEPARATOR = "\034";
+    
     public static void main(String[] argv) throws Exception
     {
         // set headless for non-gui workstations
@@ -117,12 +141,35 @@
 				"process no more than maximum items");
         options.addOption("h", "help", false, "help");
 
-        CommandLine line = parser.parse(options, argv);
+        //create a "plugin" option (to specify specific MediaFilter plugins to run)
+        OptionBuilder.withLongOpt("plugins");
+        OptionBuilder.withValueSeparator(',');
+        OptionBuilder.withDescription(
+                       "ONLY run the specified Media Filter plugin(s)\n" +
+                       "listed from '" + MEDIA_FILTER_PLUGINS_KEY + "' in dspace.cfg.\n" + 
+                       "Separate multiple with a comma (,)\n" +
+                       "(e.g. MediaFilterManager -p \n\"Word Text Extraction\",\"PDF Text Extraction\")");                
+        Option pluginOption = OptionBuilder.create('p');
+        pluginOption.setArgs(Option.UNLIMITED_VALUES); //unlimited number of args
+        options.addOption(pluginOption);                             
+         
+        CommandLine line = null;
+        try
+        {
+            line = parser.parse(options, argv);
+        }
+        catch(MissingArgumentException e)
+        {
+            System.out.println("ERROR: " + e.getMessage());
+            HelpFormatter myhelp = new HelpFormatter();
+            myhelp.printHelp("MediaFilterManager\n", options);
+            System.exit(1);
+        }          
 
         if (line.hasOption('h'))
         {
             HelpFormatter myhelp = new HelpFormatter();
-            myhelp.printHelp("MediaFilter\n", options);
+            myhelp.printHelp("MediaFilterManager\n", options);
 
             System.exit(0);
         }
@@ -158,20 +205,110 @@
         	}
         }
 
-        // set up filters
-        filterClasses =
-        	(MediaFilter[])PluginManager.getPluginSequence(MediaFilter.class);
-        for (int i = 0; i < filterClasses.length; i++)
+        String filterNames[] = null;
+        if(line.hasOption('p'))
         {
-        	String filterName = filterClasses[i].getClass().getName();
-        	String formats = ConfigurationManager.getProperty( 
-        					"filter." + filterName + ".inputFormats");
-        	if (formats != null)
-        	{
-        		filterFormats.put(filterName, Arrays.asList(formats.split(",[\\s]*")));
-        	}
+            //specified which media filter plugins we are using
+            filterNames = line.getOptionValues('p');
+        
+            if(filterNames==null || filterNames.length==0)
+            {   //display error, since no plugins specified
+                System.err.println("\nERROR: -p (-plugin) option requires at least one plugin to be specified.\n" +
+                                          "(e.g. MediaFilterManager -p \"Word Text Extractor\",\"PDF Text Extractor\")\n");
+                HelpFormatter myhelp = new HelpFormatter();
+                myhelp.printHelp("MediaFilterManager\n", options);
+                System.exit(1);
+             }
         }
+        else
+        { 
+            //retrieve list of all enabled media filter plugins!
+            String enabledPlugins = ConfigurationManager.getProperty(MEDIA_FILTER_PLUGINS_KEY);
+            filterNames = enabledPlugins.split(",\\s*");
+        }
+                
+        //initialize an array of our enabled filters
+        List filterList = new ArrayList();
+                
+        //set up each filter
+        for(int i=0; i< filterNames.length; i++)
+        {
+            //get filter of this name & add to list of filters
+            FormatFilter filter = (FormatFilter) PluginManager.getNamedPlugin(FormatFilter.class, filterNames[i]);
+            if(filter==null)
+            {   
+                System.err.println("\nERROR: Unknown MediaFilter specified (either from command-line or in dspace.cfg): '" + filterNames[i] + "'");
+                System.exit(1);
+            }
+            else
+            {   
+                filterList.add(filter);
+                       
+                String filterClassName = filter.getClass().getName();
+                           
+                String pluginName = null;
+                           
+                //If this filter is a SelfNamedPlugin,
+                //then the input formats it accepts may differ for
+                //each "named" plugin that it defines.
+                //So, we have to look for every key that fits the
+                //following format: filter.<class-name>.<plugin-name>.inputFormats
+                if( SelfNamedPlugin.class.isAssignableFrom(filter.getClass()) )
+                {
+                    //Get the plugin instance name for this class
+                    pluginName = ((SelfNamedPlugin) filter).getPluginInstanceName();
+                }
+            
+                
+                //Retrieve our list of supported formats from dspace.cfg
+                //For SelfNamedPlugins, format of key is:  
+                //  filter.<class-name>.<plugin-name>.inputFormats
+                //For other MediaFilters, format of key is: 
+                //  filter.<class-name>.inputFormats
+                String formats = ConfigurationManager.getProperty(
+                    FILTER_PREFIX + "." + filterClassName + 
+                    (pluginName!=null ? "." + pluginName : "") +
+                    "." + INPUT_FORMATS_SUFFIX);
+            
+                //add to internal map of filters to supported formats	
+                if (formats != null)
+                {
+                    //For SelfNamedPlugins, map key is:  
+                    //  <class-name><separator><plugin-name>
+                    //For other MediaFilters, map key is just:
+                    //  <class-name>
+                    filterFormats.put(filterClassName + 
+        	            (pluginName!=null ? FILTER_PLUGIN_SEPARATOR + pluginName : ""),
+        	            Arrays.asList(formats.split(",[\\s]*")));
+                }
+            }//end if filter!=null
+        }//end for
         
+        //If verbose, print out loaded mediafilter info
+        if(isVerbose)
+        {   
+            System.out.println("The following MediaFilters are enabled: ");
+            java.util.Iterator i = filterFormats.keySet().iterator();
+            while(i.hasNext())
+            {
+                String filterName = (String) i.next();
+                System.out.println("Full Filter Name: " + filterName);
+                String pluginName = null;
+                if(filterName.contains(FILTER_PLUGIN_SEPARATOR))
+                {
+                    String[] fields = filterName.split(FILTER_PLUGIN_SEPARATOR);
+                    filterName=fields[0];
+                    pluginName=fields[1];
+                }
+                 
+                System.out.println(filterName +
+                        (pluginName!=null? " (Plugin: " + pluginName + ")": ""));
+             }
+        }
+              
+        //store our filter list into an internal array
+        filterClasses = (MediaFilter[]) filterList.toArray(new MediaFilter[filterList.size()]);
+            
         Context c = null;
 
         try
@@ -270,6 +407,11 @@
        
     public static void applyFiltersItem(Context c, Item item) throws Exception
     {
+        //cache this item in MediaFilterManager
+        //so it can be accessed by MediaFilters as necessary
+        currentItem = item;
+        
+        
           if (filterItem(c, item))
           {
         	  // commit changes after each filtered item
@@ -277,8 +419,9 @@
               // increment processed count
               ++processed;
           }
-          // clear item objects from context cache
+          // clear item objects from context cache and internal cache
           item.decache();
+          currentItem = null;
     }
 
     /**
@@ -325,14 +468,33 @@
     	// by more than one filter
     	for (int i = 0; i < filterClasses.length; i++)
     	{
-    		List fmts = (List)filterFormats.get(filterClasses[i].getClass().getName());
-    		if (fmts.contains(myBitstream.getFormat().getShortDescription()))
+    		//List fmts = (List)filterFormats.get(filterClasses[i].getClass().getName());
+    	    String pluginName = null;
+    	               
+    	    //if this filter class is a SelfNamedPlugin,
+    	    //its list of supported formats is different for
+    	    //differently named "plugin"
+    	    if( SelfNamedPlugin.class.isAssignableFrom(filterClasses[i].getClass()) )
+    	    {
+    	        //get plugin instance name for this media filter
+    	        pluginName = ((SelfNamedPlugin)filterClasses[i]).getPluginInstanceName();
+    	    }
+    	               
+    	    //Get list of supported formats for the filter (and possibly named plugin)
+    	    //For SelfNamedPlugins, map key is:  
+    	    //  <class-name><separator><plugin-name>
+    	    //For other MediaFilters, map key is just:
+    	    //  <class-name>
+    	    List fmts = (List)filterFormats.get(filterClasses[i].getClass().getName() + 
+    	                       (pluginName!=null ? FILTER_PLUGIN_SEPARATOR + pluginName : ""));
+    	   
+    	    if (fmts.contains(myBitstream.getFormat().getShortDescription()))
     		{
             	try
             	{
 		            // only update item if bitstream not skipped
-		            if (filterClasses[i].processBitstream(c, myItem, myBitstream))
-		            {
+		            if (processBitstream(c, myItem, myBitstream, filterClasses[i]))
+            	    {
 		           		myItem.update(); // Make sure new bitstream has a sequence
 		                                 	// number
 		           		filtered = true;
@@ -348,4 +510,135 @@
     	}
         return filtered;
     }
+    
+    /**
+     * processBitstream is a utility class that calls the virtual methods
+     * from the current MediaFilter class.
+     * It scans the bitstreams in an item, and decides if a bitstream has 
+     * already been filtered, and if not or if overWrite is set, invokes the 
+     * filter.
+     * 
+     * @param c
+     *            context
+     * @param item
+     *            item containing bitstream to process
+     * @param source
+     *            source bitstream to process
+     * @param mediaFilter
+     *            MediaFilter to perform filtering
+     * 
+     * @return true if new rendition is created, false if rendition already
+     *         exists and overWrite is not set
+     */
+    public static boolean processBitstream(Context c, Item item, Bitstream source, FormatFilter formatFilter)
+            throws Exception
+    {
+        //do pre-processing of this bitstream, and if it fails, skip this bitstream!
+    	if(!formatFilter.preProcessBitstream(c, item, source))
+        	return false;
+        	
+    	boolean overWrite = MediaFilterManager.isForce;
+        
+        // get bitstream filename, calculate destination filename
+        String newName = formatFilter.getFilteredName(source.getName());
+
+        Bitstream existingBitstream = null; // is there an existing rendition?
+        Bundle targetBundle = null; // bundle we're modifying
+
+        Bundle[] bundles = item.getBundles(formatFilter.getBundleName());
+
+        // check if destination bitstream exists
+        if (bundles.length > 0)
+        {
+            // only finds the last match (FIXME?)
+            for (int i = 0; i < bundles.length; i++)
+            {
+                Bitstream[] bitstreams = bundles[i].getBitstreams();
+
+                for (int j = 0; j < bitstreams.length; j++)
+                {
+                    if (bitstreams[j].getName().equals(newName))
+                    {
+                        targetBundle = bundles[i];
+                        existingBitstream = bitstreams[j];
+                    }
+                }
+            }
+        }
+
+        // if exists and overwrite = false, exit
+        if (!overWrite && (existingBitstream != null))
+        {
+            System.out.println("SKIPPED: bitstream " + source.getID()
+                    + " because '" + newName + "' already exists");
+
+            return false;
+        }
+
+        InputStream destStream = formatFilter.getDestinationStream(source.retrieve());
+
+        // create new bundle if needed
+        if (bundles.length < 1)
+        {
+            targetBundle = item.createBundle(formatFilter.getBundleName());
+        }
+        else
+        {
+            // take the first match
+            targetBundle = bundles[0];
+        }
+
+        Bitstream b = targetBundle.createBitstream(destStream);
+
+        // Now set the format and name of the bitstream
+        b.setName(newName);
+        b.setSource("Written by FormatFilter " + formatFilter.getClass().getName() +
+        			" on " + DCDate.getCurrent() + " (GMT)."); 
+        b.setDescription(formatFilter.getDescription());
+
+        // Find the proper format
+        BitstreamFormat bf = BitstreamFormat.findByShortDescription(c,
+                formatFilter.getFormatString());
+        b.setFormat(bf);
+        b.update();
+        
+        //UIUC change - inherit policies from the source bitstream
+        //(first remove any existing policies)
+        AuthorizeManager.removeAllPolicies(c, b);
+        AuthorizeManager.inheritPolicies(c, source, b);
+
+        // fixme - set date?
+        // we are overwriting, so remove old bitstream
+        if (existingBitstream != null)
+        {
+            targetBundle.removeBitstream(existingBitstream);
+        }
+
+        System.out.println("FILTERED: bitstream " + source.getID()
+                + " and created '" + newName + "'");
+
+        //do post-processing of the generated bitstream
+        formatFilter.postProcessBitstream(c, item, b);
+        
+        return true;
+    }
+    
+    /**
+     * Return the item that is currently being processed/filtered
+     * by the MediaFilterManager
+     * <p>
+     * This allows FormatFilters to retrieve the Item object
+     * in case they need access to item-level information for their format
+     * transformations/conversions.
+     * 
+     * @return current Item being processed by MediaFilterManager
+     */
+    public static Item getCurrentItem()
+    {
+        return currentItem;
+    }
+    
+    
+    /** END UIUC Change **/
+    
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2398
          http://dspace.svn.sourceforge.net/dspace/?rev=2398&view=rev
Author:   mdiggory
Date:     2007-11-28 13:07:34 -0800 (Wed, 28 Nov 2007)

Log Message:
-----------
New options for ItemImporter to support bitstream permissions and descriptions

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/CHANGES
    branches/dspace-1_5_x/dspace/docs/application.html
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java

Modified: branches/dspace-1_5_x/dspace/CHANGES
===================================================================
--- branches/dspace-1_5_x/dspace/CHANGES	2007-11-28 17:53:16 UTC (rev 2397)
+++ branches/dspace-1_5_x/dspace/CHANGES	2007-11-28 21:07:34 UTC (rev 2398)
@@ -1,3 +1,6 @@
+(Mark Diggory)
+- New options for ItemImporter to support bitstream permissions and descriptions.
+
 (Graham Triggs/Mark Diggory)
 - S.F. Bug 1824710 Creative Commons RDF has changed. Adjusted CC processing to be XSL driven 
   and adjusted generated XML/RDF. Created LicenseCleanup CLI to process existing CC license_rdf

Modified: branches/dspace-1_5_x/dspace/docs/application.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/application.html	2007-11-28 17:53:16 UTC (rev 2397)
+++ branches/dspace-1_5_x/dspace/docs/application.html	2007-11-28 21:07:34 UTC (rev 2398)
@@ -807,6 +807,8 @@
   <pre>
 -r -s n -f filepath
 -r -s n -f filepath\tbundle:bundlename
+-r -s n -f filepath\tbundle:bundlename\tpermissions: -[r|w] 'group name'
+-r -s n -f filepath\tbundle:bundlename\tpermissions: -[r|w] 'group name'\tdescription: some text
 </pre>
 
   <P>where</P>
@@ -817,6 +819,8 @@
     <li><code>-f filepath</code> indicates the path and name of the content file to be registered (filepath)</li>
     <li><code>\t</code> is a tab character</li>
     <li><code>bundle:bundlename</code> is an optional bundle name</li>
+    <li><code>permissions: -[r|w] 'group name'</code> is an optional read or write permission that can be attached to the bitstream</li>
+    <li><code>description: some text</code> is an optional description field to add to the file</li>
   </ul>
 
   <p>The bundle, that is everything after the filepath, is optional and is normally not used.</p>

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java	2007-11-28 17:53:16 UTC (rev 2397)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java	2007-11-28 21:07:34 UTC (rev 2398)
@@ -54,6 +54,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.StringTokenizer;
+import java.util.Vector;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -67,6 +68,8 @@
 import org.apache.commons.cli.PosixParser;
 import org.apache.xpath.XPathAPI;
 import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.AuthorizeManager;
+import org.dspace.authorize.ResourcePolicy;
 import org.dspace.content.Bitstream;
 import org.dspace.content.BitstreamFormat;
 import org.dspace.content.Bundle;
@@ -81,6 +84,7 @@
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.eperson.Group;
 import org.dspace.handle.HandleManager;
 import org.dspace.workflow.WorkflowManager;
 import org.w3c.dom.Document;
@@ -639,9 +643,10 @@
                 + File.separatorChar);
 
         // and the bitstreams from the contents file
-        // process contents file, add bistreams and bundles
-        processContentsFile(c, myitem, path + File.separatorChar + itemname,
-                "contents");
+        // process contents file, add bistreams and bundles, return any
+        // non-standard permissions
+        Vector options = processContentsFile(c, myitem, path
+                + File.separatorChar + itemname, "contents");
 
         if (useWorkflow)
         {
@@ -671,6 +676,13 @@
 
                 mapOutput = itemname + " " + myhandle;
             }
+
+            // set permissions if specified in contents file
+            if (options.size() > 0)
+            {
+                System.out.println("Processing options");
+                processOptions(c, myitem, options);
+            }
         }
 
         // now add to multiple collections if requested
@@ -875,7 +887,7 @@
         }
         else
         {
-        	// If we're just test the import, let's check that the actual metadata field exists.
+            // If we're just test the import, let's check that the actual metadata field exists.
         	MetadataSchema foundSchema = MetadataSchema.find(c,schema);
         	
         	if (foundSchema == null)
@@ -896,26 +908,6 @@
     }
 
     /**
-     * Return the String value of a Node
-     */
-    public String getStringValue(Node node)
-    {
-        String value = node.getNodeValue();
-
-        if (node.hasChildNodes())
-        {
-            Node first = node.getFirstChild();
-
-            if (first.getNodeType() == Node.TEXT_NODE)
-            {
-                return first.getNodeValue();
-            }
-        }
-
-        return value;
-    }
-
-    /**
      * Read in the handle file or return null if empty or doesn't exist
      */
     private String processHandleFile(Context c, Item i, String path,
@@ -964,14 +956,16 @@
 
     /**
      * Given a contents file and an item, stuffing it with bitstreams from the
-     * contents file
+     * contents file Returns a Vector of Strings with lines from the contents
+     * file that request non-default bitstream permission
      */
-    private void processContentsFile(Context c, Item i, String path,
+    private Vector processContentsFile(Context c, Item i, String path,
             String filename) throws SQLException, IOException,
             AuthorizeException
     {
         String contentspath = path + File.separatorChar + filename;
         String line = "";
+        Vector options = new Vector();
 
         System.out.println("\tProcessing contents file: " + contentspath);
 
@@ -1051,29 +1045,99 @@
                     continue;				// process next line in contents file
             	}
 
-            	// look for a bundle name
-                String bundleMarker = "\tbundle:";
+                int bitstreamEndIndex = line.indexOf("\t");
 
-                int markerIndex = line.indexOf(bundleMarker);
-
-                if (markerIndex == -1)
+                if (bitstreamEndIndex == -1)
                 {
-                    // no bundle found
+                    // no extra info
                     processContentFileEntry(c, i, path, line, null);
                     System.out.println("\tBitstream: " + line);
                 }
                 else
                 {
-                    // found bundle
-                    String bundleName = line.substring(markerIndex
-                            + bundleMarker.length());
-                    String bitstreamName = line.substring(0, markerIndex);
-                    bitstreamName = bitstreamName.trim();
-                    
-                    processContentFileEntry(c, i, path, bitstreamName,
-                            bundleName);
-                    System.out.println("\tBitstream: " + bitstreamName
-                            + "\tBundle: " + bundleName);
+
+                    String bitstreamName = line.substring(0, bitstreamEndIndex);
+
+                    boolean bundleExists = false;
+                    boolean permissionsExist = false;
+                    boolean descriptionExists = false;
+
+                    // look for a bundle name
+                    String bundleMarker = "\tbundle:";
+                    int bMarkerIndex = line.indexOf(bundleMarker);
+                    int bEndIndex = 0;
+                    if (bMarkerIndex > 0)
+                    {
+                        bEndIndex = line.indexOf("\t", bMarkerIndex + 1);
+                        if (bEndIndex == -1)
+                        {
+                            bEndIndex = line.length();
+                        }
+                        bundleExists = true;
+                    }
+
+                    // look for permissions
+                    String permissionsMarker = "\tpermissions:";
+                    int pMarkerIndex = line.indexOf(permissionsMarker);
+                    int pEndIndex = 0;
+                    if (pMarkerIndex > 0)
+                    {
+                        pEndIndex = line.indexOf("\t", pMarkerIndex + 1);
+                        if (pEndIndex == -1)
+                        {
+                            pEndIndex = line.length();
+                        }
+                        permissionsExist = true;
+                    }
+
+                    // look for descriptions
+                    String descriptionMarker = "\tdescription:";
+                    int dMarkerIndex = line.indexOf(descriptionMarker);
+                    int dEndIndex = 0;
+                    if (dMarkerIndex > 0)
+                    {
+                        dEndIndex = line.indexOf("\t", dMarkerIndex + 1);
+                        if (dEndIndex == -1)
+                        {
+                            dEndIndex = line.length();
+                        }
+                        descriptionExists = true;
+                    }
+
+                    if (bundleExists)
+                    {
+                        String bundleName = line.substring(bMarkerIndex
+                                + bundleMarker.length(), bEndIndex);
+
+                        processContentFileEntry(c, i, path, bitstreamName,
+                                bundleName);
+                        System.out.println("\tBitstream: " + bitstreamName
+                                + "\tBundle: " + bundleName);
+                    }
+                    else
+                    {
+                        processContentFileEntry(c, i, path, bitstreamName, null);
+                        System.out.println("\tBitstream: " + bitstreamName);
+                    }
+
+                    if (permissionsExist || descriptionExists)
+                    {
+                        String extraInfo = bitstreamName;
+
+                        if (permissionsExist)
+                        {
+                            extraInfo = extraInfo
+                                    + line.substring(pMarkerIndex, pEndIndex);
+                        }
+
+                        if (descriptionExists)
+                        {
+                            extraInfo = extraInfo
+                                    + line.substring(dMarkerIndex, dEndIndex);
+                        }
+
+                        options.add(extraInfo);
+                    }
                 }
             }
         }
@@ -1084,10 +1148,21 @@
                 is.close();
             }
         }
+        return options;
     }
 
-    // each entry represents a bitstream....
-    public void processContentFileEntry(Context c, Item i, String path,
+    /**
+     * each entry represents a bitstream....
+     * @param c
+     * @param i
+     * @param path
+     * @param fileName
+     * @param bundleName
+     * @throws SQLException
+     * @throws IOException
+     * @throws AuthorizeException
+     */
+    private void processContentFileEntry(Context c, Item i, String path,
             String fileName, String bundleName) throws SQLException,
             IOException, AuthorizeException
     {
@@ -1158,7 +1233,7 @@
      * @throws IOException
      * @throws AuthorizeException
      */
-    public void registerBitstream(Context c, Item i, int assetstore, 
+    private void registerBitstream(Context c, Item i, int assetstore, 
             String bitstreamPath, String bundleName )
         	throws SQLException, IOException, AuthorizeException
     {
@@ -1215,72 +1290,261 @@
         }
     }
 
+    /**
+     * 
+     * Process the Options to apply to the Item. The options are tab delimited
+     * 
+     * Options:
+     *      48217870-MIT.pdf        permissions: -r 'MIT Users'     description: Full printable version (MIT only)
+     *      permissions:[r|w]-['group name']
+     *      description: 'the description of the file'
+     *      
+     *      where:
+     *          [r|w] (meaning: read|write)
+     *          ['MIT Users'] (the group name)
+     *          
+     * @param c
+     * @param myItem
+     * @param options
+     * @throws SQLException
+     * @throws AuthorizeException
+     */
+    private void processOptions(Context c, Item myItem, Vector options)
+            throws SQLException, AuthorizeException
+    {
+        for (int i = 0; i < options.size(); i++)
+        {
+            String line = options.elementAt(i).toString();
+
+            System.out.println("\tprocessing " + line);
+
+            boolean permissionsExist = false;
+            boolean descriptionExists = false;
+
+            String permissionsMarker = "\tpermissions:";
+            int pMarkerIndex = line.indexOf(permissionsMarker);
+            int pEndIndex = 0;
+            if (pMarkerIndex > 0)
+            {
+                pEndIndex = line.indexOf("\t", pMarkerIndex + 1);
+                if (pEndIndex == -1)
+                {
+                    pEndIndex = line.length();
+                }
+                permissionsExist = true;
+            }
+
+            String descriptionMarker = "\tdescription:";
+            int dMarkerIndex = line.indexOf(descriptionMarker);
+            int dEndIndex = 0;
+            if (dMarkerIndex > 0)
+            {
+                dEndIndex = line.indexOf("\t", dMarkerIndex + 1);
+                if (dEndIndex == -1)
+                {
+                    dEndIndex = line.length();
+                }
+                descriptionExists = true;
+            }
+
+            int bsEndIndex = line.indexOf("\t");
+            String bitstreamName = line.substring(0, bsEndIndex);
+
+            int actionID = -1;
+            String groupName = "";
+            Group myGroup = null;
+            if (permissionsExist)
+            {
+                String thisPermission = line.substring(pMarkerIndex
+                        + permissionsMarker.length(), pEndIndex);
+
+                // get permission type ("read" or "write")
+                int pTypeIndex = thisPermission.indexOf("-");
+
+                // get permission group (should be in single quotes)
+                int groupIndex = thisPermission.indexOf("'", pTypeIndex);
+                int groupEndIndex = thisPermission.indexOf("'", groupIndex + 1);
+
+                // if not in single quotes, assume everything after type flag is
+                // group name
+                if (groupIndex == -1)
+                {
+                    groupIndex = thisPermission.indexOf(" ", pTypeIndex);
+                    groupEndIndex = thisPermission.length();
+                }
+
+                groupName = thisPermission.substring(groupIndex + 1,
+                        groupEndIndex);
+
+                if (thisPermission.toLowerCase().charAt(pTypeIndex + 1) == 'r')
+                {
+                    actionID = Constants.READ;
+                }
+                else if (thisPermission.toLowerCase().charAt(pTypeIndex + 1) == 'w')
+                {
+                    actionID = Constants.WRITE;
+                }
+
+                try
+                {
+                    myGroup = Group.findByName(c, groupName);
+                }
+                catch (SQLException sqle)
+                {
+                    System.out.println("SQL Exception finding group name: "
+                            + groupName);
+                    // do nothing, will check for null group later
+                }
+            }
+
+            String thisDescription = "";
+            if (descriptionExists)
+            {
+                thisDescription = line.substring(
+                        dMarkerIndex + descriptionMarker.length(), dEndIndex)
+                        .trim();
+            }
+
+            Bitstream bs = null;
+            boolean notfound = true;
+            if (!isTest)
+            {
+                // find bitstream
+                Bitstream[] bitstreams = myItem.getNonInternalBitstreams();
+                for (int j = 0; j < bitstreams.length && notfound; j++)
+                {
+                    if (bitstreams[j].getName().equals(bitstreamName))
+                    {
+                        bs = bitstreams[j];
+                        notfound = false;
+                    }
+                }
+            }
+
+            if (notfound && !isTest)
+            {
+                // this should never happen
+                System.out.println("\tdefault permissions set for "
+                        + bitstreamName);
+            }
+            else if (!isTest)
+            {
+                if (permissionsExist)
+                {
+                    if (myGroup == null)
+                    {
+                        System.out.println("\t" + groupName
+                                + " not found, permissions set to default");
+                    }
+                    else if (actionID == -1)
+                    {
+                        System.out
+                                .println("\tinvalid permissions flag, permissions set to default");
+                    }
+                    else
+                    {
+                        System.out.println("\tSetting special permissions for "
+                                + bitstreamName);
+                        setPermission(c, myGroup, actionID, bs);
+                    }
+                }
+
+                if (descriptionExists)
+                {
+                    System.out.println("\tSetting description for "
+                            + bitstreamName);
+                    bs.setDescription(thisDescription);
+                    bs.update();
+                }
+            }
+        }
+    }
+
+    /**
+     * Set the Permission on a Bitstream.
+     * 
+     * @param c
+     * @param g
+     * @param actionID
+     * @param bs
+     * @throws SQLException
+     * @throws AuthorizeException
+     */
+    private void setPermission(Context c, Group g, int actionID, Bitstream bs)
+            throws SQLException, AuthorizeException
+    {
+        if (!isTest)
+        {
+            // remove the default policy
+            AuthorizeManager.removeAllPolicies(c, bs);
+
+            // add the policy
+            ResourcePolicy rp = ResourcePolicy.create(c);
+
+            rp.setResource(bs);
+            rp.setAction(actionID);
+            rp.setGroup(g);
+
+            rp.update();
+        }
+        else
+        {
+            if (actionID == Constants.READ)
+            {
+                System.out.println("\t\tpermissions: READ for " + g.getName());
+            }
+            else if (actionID == Constants.WRITE)
+            {
+                System.out.println("\t\tpermissions: WRITE for " + g.getName());
+            }
+        }
+
+    }
+
     // XML utility methods
-    public String getAttributeValue(Node n, String myattributename)
+    /**
+     * Lookup an attribute from a DOM node.
+     * @param n
+     * @param name
+     * @return
+     */
+    private String getAttributeValue(Node n, String name)
     {
-        String myvalue = "";
-
         NamedNodeMap nm = n.getAttributes();
 
         for (int i = 0; i < nm.getLength(); i++)
         {
             Node node = nm.item(i);
-            String name = node.getNodeName();
-            String value = node.getNodeValue();
 
-            if (myattributename.equals(name))
+            if (name.equals(node.getNodeName()))
             {
-                return value;
+                return node.getNodeValue();
             }
         }
 
-        return myvalue;
+        return "";
     }
 
-    // XML utility methods stolen from administer.
-
+    
     /**
-     * Get the CDATA of a particular element. For example, if the XML document
-     * contains:
-     * <P>
-     * <code>
-     * &lt;foo&gt;&lt;mimetype&gt;application/pdf&lt;/mimetype&gt;&lt;/foo&gt;
-     * </code>
-     * passing this the <code>foo</code> node and <code>mimetype</code> will
-     * return <code>application/pdf</code>.
-     * </P>
-     * Why this isn't a core part of the XML API I do not know...
-     * 
-     * @param parentElement
-     *            the element, whose child element you want the CDATA from
-     * @param childName
-     *            the name of the element you want the CDATA from
-     * 
-     * @return the CDATA as a <code>String</code>
+     * Return the String value of a Node.
+     * @param node
+     * @return
      */
-    private String getElementData(Node parentElement, String childName)
-            throws TransformerException
+    private String getStringValue(Node node)
     {
-        // Grab the child node
-        Node childNode = XPathAPI.selectSingleNode(parentElement, childName);
+        String value = node.getNodeValue();
 
-        if (childNode == null)
+        if (node.hasChildNodes())
         {
-            // No child node, so no values
-            return null;
-        }
+            Node first = node.getFirstChild();
 
-        // Get the #text
-        Node dataNode = childNode.getFirstChild();
-
-        if (dataNode == null)
-        {
-            return null;
+            if (first.getNodeType() == Node.TEXT_NODE)
+            {
+                return first.getNodeValue();
+            }
         }
 
-        // Get the data
-        String value = dataNode.getNodeValue().trim();
-
         return value;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2406
          http://dspace.svn.sourceforge.net/dspace/?rev=2406&view=rev
Author:   grahamtriggs
Date:     2007-11-29 03:58:05 -0800 (Thu, 29 Nov 2007)

Log Message:
-----------
Improved browse configuration (ability to hide sort options from the browse controls, can set left-hand navigation to asc and/or desc lists). Improves normalisation of titles.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderTitleMarc21.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowserScope.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/SortOption.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/InitialArticleWord.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/MARC21InitialArticleWord.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/AbstractBrowserServlet.java
    branches/dspace-1_5_x/dspace-jspui/src/main/webapp/browse/full.jsp
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java

Added Paths:
-----------
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/StripLeadingNonAlphaNum.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-11-29 05:00:58 UTC (rev 2405)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-11-29 11:58:05 UTC (rev 2406)
@@ -453,11 +453,15 @@
 # The other form is for indexes of the items themselves, ie. each entry will be displayed 
 # according to the configuration of by webui.itemlist.columns:
 #
-# webui.browse.index.<n> = <index name> : item : <sort option name>
+# webui.browse.index.<n> = <index name> : item : <sort option name> : (asc | desc)
 #
 # sort option name: this is the sorting to be applied to the display. It must match the
 #                   name given to one of the webui.browse.sort-option entries given below.
 # 
+#   The final part of the configuration is optional, and specifies the default ordering
+#   for the index - whether it is ASCending (the default, and best for text indexes), or
+#   DESCending (useful for dates - ie. most recent submissions)
+
 #   NOTE: the text to render the index will use the <sort option name> parameter to select
 #   the message key from Messages.properties using a key of the form:
 #
@@ -485,15 +489,16 @@
 #
 # webui.browse.sort-option.<n> = <option name> : \
 #									<schema prefix>.<element>[.<qualifier>|.*] : \
-#									(date | text | ...) : (asc | desc)
+#									(date | text | ...) : (show | hide)
 #
 # This is defined much the same as above.  The parameter after the metadata
 # just lets the sorter know which normalisation to use - standard normalisations are title,
 # text or date - however additional normalisations can be defined using the PluginManager.
 #
-# The final part of the configuration is optional, and specifies the default ordering
-# for the index - whether it is ASCending (the default, and best for text indexes), or
-# DESCending (useful for dates - ie. most recent submissions)
+# The final parts of the configuration is optional -  whether to SHOW (the default) or
+# HIDE the option from the sorting controls in the user interface. This can be useful if
+# you need to define a specific date sort for use by the recent items lists,
+# but otherwise don't want users to choose that option.
 #
 webui.browse.sort-option.1 = title:dc.title:title
 webui.browse.sort-option.2 = dateissued:dc.date.issued:date

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java	2007-11-29 05:00:58 UTC (rev 2405)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java	2007-11-29 11:58:05 UTC (rev 2406)
@@ -184,7 +184,16 @@
 
                 if (sortOption == null)
                     valid = false;
-                
+
+                // If an optional ordering configuration is supplied,
+                // set the defaultOrder appropriately (asc or desc)
+                if (matcher.groupCount() > 3)
+                {
+                    String order = matcher.group(4);
+                    if (SortOption.DESCENDING.equalsIgnoreCase(order))
+                        this.defaultOrder = SortOption.DESCENDING;
+                }
+
                 tableBaseName = getItemBrowseIndex().tableBaseName;
             }
             else
@@ -629,23 +638,19 @@
      * @throws BrowseException
      */
     public static String[] tables()
-    	throws BrowseException
+            throws BrowseException
     {
         BrowseIndex[] bis = getBrowseIndices();
-        ArrayList tables = new ArrayList();
+        String[] returnTables = new String[bis.length + 1];
         for (int i = 0; i < bis.length; i++)
         {
-            String tableName = bis[i].getTableName();
-            tables.add(tableName);
+            returnTables[i] = bis[i].getTableName();
         }
-        
+
         // FIXME: this complies with the old BrowseTables method, but I'm
         // not really sure why it's here
-        tables.add("Communities2Item");
-        
-        String[] returnTables = new String[tables.size()];
-        returnTables = (String[]) tables.toArray((String[]) returnTables);
-        
+        returnTables[bis.length] = "Communities2Item";
+
         return returnTables;
     }
     
@@ -668,17 +673,17 @@
             browseIndices.add(bi);
             idx++;
         }
-        
+
         BrowseIndex[] bis = new BrowseIndex[browseIndices.size()];
         bis = (BrowseIndex[]) browseIndices.toArray((BrowseIndex[]) bis);
-        
+
         return bis;
     }
-    
+
     /**
      * Get the browse index from configuration with the specified name.
      * The name is the first part of the browse configuration
-     * 
+     *
      * @param name		the name to retrieve
      * @return			the specified browse index
      * @throws BrowseException

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderTitleMarc21.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderTitleMarc21.java	2007-11-29 05:00:58 UTC (rev 2405)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderTitleMarc21.java	2007-11-29 11:58:05 UTC (rev 2406)
@@ -40,10 +40,7 @@
 
 package org.dspace.browse;
 
-import org.dspace.text.filter.DecomposeDiactritics;
-import org.dspace.text.filter.LowerCaseAndTrim;
-import org.dspace.text.filter.MARC21InitialArticleWord;
-import org.dspace.text.filter.TextFilter;
+import org.dspace.text.filter.*;
 
 /**
  * MARC 21 title ordering delegate implementation
@@ -54,7 +51,8 @@
 {
 	{
 		filters = new TextFilter[] { new MARC21InitialArticleWord(),
-									 new DecomposeDiactritics(),
+                                     new DecomposeDiactritics(),
+                                     new StripLeadingNonAlphaNum(),
 									 new LowerCaseAndTrim() };
 	}
 }

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowserScope.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowserScope.java	2007-11-29 05:00:58 UTC (rev 2405)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowserScope.java	2007-11-29 11:58:05 UTC (rev 2406)
@@ -335,19 +335,10 @@
         if (order != null)
             return order;
 
-        try
-        {
-            SortOption so = getSortOption();
+        BrowseIndex bi = getBrowseIndex();
+        if (bi != null)
+            return bi.getDefaultOrder();
 
-            if (so != null)
-                return so.getDefaultOrder();
-        }
-        catch (BrowseException be)
-        {
-            // recoverable problem, just log the error and continue
-            log.debug("Unable to retrieve a sort option for this browse", be);
-        }
-
         return SortOption.ASCENDING;
     }
 
@@ -425,7 +416,7 @@
 				    // Create a dummy sortOption for the metadata sort
 					String dataType = browseIndex.getDataType();
 					String type = ("date".equals(dataType) ? "date" : "text");
-                    sortOption = new SortOption(0, browseIndex.getName(), browseIndex.getMetadata(), type, browseIndex.getDefaultOrder());
+                    sortOption = new SortOption(0, browseIndex.getName(), browseIndex.getMetadata(), type);
 				}
 				else
 				{
@@ -570,18 +561,10 @@
             return false;
         }
 
-        try
-        {
-            SortOption so = getSortOption();
+        BrowseIndex bi = getBrowseIndex();
 
-            if (so != null && SortOption.DESCENDING.equalsIgnoreCase(so.getDefaultOrder()))
-                return false;
-        }
-        catch (BrowseException be)
-        {
-            // recoverable problem, just log the error and continue
-            log.debug("Unable to retrieve a sort option for this browse", be);
-        }
+        if (bi != null && SortOption.DESCENDING.equalsIgnoreCase(bi.getDefaultOrder()))
+            return false;
 
         return true;
 	}

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java	2007-11-29 05:00:58 UTC (rev 2405)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java	2007-11-29 11:58:05 UTC (rev 2406)
@@ -561,7 +561,8 @@
 	public static void main(String[] argv)
 		throws SQLException, BrowseException, ParseException
 	{
-	    IndexBrowse indexer = new IndexBrowse();
+        Context context = new Context();
+        IndexBrowse indexer = new IndexBrowse(context);
 	    
 	    // create an options object and populate it
 	    CommandLineParser parser = new PosixParser();
@@ -655,6 +656,7 @@
 	    }
 	    
 	    indexer.usage(options);
+        context.complete();
 	}
 
 	/**

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/SortOption.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/SortOption.java	2007-11-29 05:00:58 UTC (rev 2405)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/SortOption.java	2007-11-29 11:58:05 UTC (rev 2406)
@@ -36,7 +36,6 @@
 package org.dspace.browse;
 
 import java.io.IOException;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -73,8 +72,8 @@
 	/** the metadata broken down into bits for convenience */
 	private String[] mdBits;
 
-    /** default ordering for this sort, when not supplied by the user */
-    private String defaultOrder;
+    /** should the sort option be visible for user selection */
+    private boolean visible;
 
     /** the sort options available for this index */
     private static Set<SortOption> sortOptionsSet = null;
@@ -96,24 +95,10 @@
 		this.type = type;
 		this.metadata = md;
 		this.number = number;
-        this.defaultOrder = SortOption.ASCENDING;
+        this.visible = true;
         generateMdBits();
 	}
 
-    public SortOption(int number, String name, String md, String type, String defaultOrder)
-        throws BrowseException
-    {
-        this.name = name;
-        this.type = type;
-        this.metadata = md;
-        this.number = number;
-        if (SortOption.DESCENDING.equalsIgnoreCase(defaultOrder))
-            this.defaultOrder = SortOption.DESCENDING;
-        else
-            this.defaultOrder = SortOption.ASCENDING;
-        generateMdBits();
-    }
-
 	/**
 	 * Construct a new SortOption object using the definition from the configuration
 	 * 
@@ -139,28 +124,18 @@
         name = matcher.group(1);
         metadata = matcher.group(2);
         type = matcher.group(3);
-        if (matcher.groupCount() > 3)
-            defaultOrder = matcher.group(4);
 
-        // If the default order is specified as descending, keep it
-        // Otherwise, set the default order to ascending
-        if (SortOption.DESCENDING.equalsIgnoreCase(defaultOrder))
-            defaultOrder = SortOption.DESCENDING;
+        // If the option is configured to be hidden, then set the visible flag to false
+        // otherwise, flag it as visible (true)
+        if (matcher.groupCount() > 3 && "hide".equalsIgnoreCase(matcher.group(4)))
+            visible = false;
         else
-            defaultOrder = SortOption.ASCENDING;
+            visible = true;
 
         generateMdBits();
 	}
 
     /**
-     * @return Returns the default ordering for this sort option
-     */
-    public String getDefaultOrder()
-    {
-        return defaultOrder;
-    }
-
-    /**
 	 * @return Returns the metadata.
 	 */
 	public String getMetadata()
@@ -223,8 +198,17 @@
 	{
 		this.number = number;
 	}
-	
-	/**
+
+    /**
+     * Should this sort option be made visible in the UI
+     * @return true if visible, false otherwise
+     */
+    public boolean isVisible()
+    {
+        return visible;
+    }
+
+    /**
 	 * @return	a 3 element array of the metadata bits
 	 */
 	public String[] getMdBits()
@@ -346,22 +330,14 @@
         SortOption.sortOptionsSet = new HashSet<SortOption>();
         synchronized (SortOption.sortOptionsSet)
         {
-            Enumeration en = ConfigurationManager.propertyNames();
-            
-            String rx = "webui\\.browse\\.sort-option\\.(\\d+)";
-            Pattern pattern = Pattern.compile(rx);
-            
-            while (en.hasMoreElements())
+            int idx = 1;
+            String option;
+
+            while ( ((option = ConfigurationManager.getProperty("webui.browse.sort-option." + idx))) != null)
             {
-                String property = (String) en.nextElement();
-                Matcher matcher = pattern.matcher(property);
-                if (matcher.matches())
-                {
-                    int number = Integer.parseInt(matcher.group(1));
-                    String option = ConfigurationManager.getProperty(property);
-                    SortOption so = new SortOption(number, option);
-                    SortOption.sortOptionsSet.add(so);
-                }
+                SortOption so = new SortOption(idx, option);
+                SortOption.sortOptionsSet.add(so);
+                idx++;
             }
         }
 

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/InitialArticleWord.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/InitialArticleWord.java	2007-11-29 05:00:58 UTC (rev 2405)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/InitialArticleWord.java	2007-11-29 11:58:05 UTC (rev 2406)
@@ -83,7 +83,7 @@
             while (initialEnd < 0 && curPos < str.length())
             {
                 // Have we found a significant character
-                if (Character.isLetterOrDigit(str.charAt(curPos)) || str.charAt(curPos) == '\'')
+                if (Character.isLetterOrDigit(str.charAt(curPos)))
                 {
                     // Mark this as the cut point for the initial word
                     initialStart = curPos;

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/MARC21InitialArticleWord.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/MARC21InitialArticleWord.java	2007-11-29 05:00:58 UTC (rev 2405)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/MARC21InitialArticleWord.java	2007-11-29 11:58:05 UTC (rev 2406)
@@ -133,7 +133,7 @@
             { "die",        Language.AFRIKAANS, Language.GERMAN, Language.YIDDISH },
             { "dos",        Language.YIDDISH },
             { "e",          Language.NORWEGIAN },
-            { "'e",         Language.FRISIAN },
+            { "e",          Language.FRISIAN },         // should be 'e - leading apostrophes are ignored
             { "een",        Language.DUTCH },
             { "eene",       Language.DUTCH },
             { "egy",        Language.HUNGARIAN },
@@ -205,21 +205,21 @@
             { "mga",        Language.TAGALOG },
             { "m\u0303ga",  Language.TAGALOG },
             { "mia",        Language.GREEK },
-            { "'n",         Language.AFRIKAANS, Language.DUTCH, Language.FRISIAN },
+            { "n",          Language.AFRIKAANS, Language.DUTCH, Language.FRISIAN },              // should be 'n - leading apostrophes are ignored
             { "na",         Language.HAWAIIAN, Language.IRISH, Language.SCOTTISH_GAELIC },
             { "na h-",      Language.IRISH, Language.SCOTTISH_GAELIC },
             { "nje",        Language.ALBANIAN },
             { "ny",         Language.MALAGASY },
-            { "'o",         Language.NEAPOLITAN_ITALIAN },
+            { "o",          Language.NEAPOLITAN_ITALIAN },               // should be 'o - leading apostrophes are ignored
             { "o",          Language.GALICIAN, Language.HAWAIIAN, Language.PORTUGUESE, Language.ROMANIAN },
             { "os",         Language.PORTUGUESE },
-            { "'r",         Language.ICELANDIC },
-            { "'s",         Language.GERMAN },
+            { "r",          Language.ICELANDIC },                // should be 'r - leading apostrophes are ignored
+            { "s",          Language.GERMAN },                   // should be 's - leading apostrophes are ignored
             { "sa",         Language.TAGALOG },
             { "sa mga",     Language.TAGALOG },
             { "si",         Language.TAGALOG },
             { "sin\u00e1",  Language.TAGALOG },
-            { "'t",         Language.DUTCH, Language.FRISIAN },
+            { "t",          Language.DUTCH, Language.FRISIAN },          // should be 't - leading apostrophes are ignored
             { "ta",         Language.CLASSICAL_GREEK, Language.GREEK },
             { "tais",       Language.CLASSICAL_GREEK },
             { "tas",        Language.CLASSICAL_GREEK },

Added: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/StripLeadingNonAlphaNum.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/StripLeadingNonAlphaNum.java	                        (rev 0)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/StripLeadingNonAlphaNum.java	2007-11-29 11:58:05 UTC (rev 2406)
@@ -0,0 +1,62 @@
+/*
+ * StripLeadingNonAlphaNum.java
+ *
+ * Version: $Revision: 1.0 $
+ *
+ * Date: $Date: 2007/03/02 11:22:13 $
+ *
+ * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+
+package org.dspace.text.filter;
+
+public class StripLeadingNonAlphaNum implements TextFilter
+{
+    public String filter(String str)
+    {
+        int i = 0;
+
+        while (i < str.length() && !Character.isLetterOrDigit(str.charAt(i)))
+            i++;
+
+        if (i > 0)
+            return str.substring(i);
+
+        return str;
+    }
+
+    public String filter(String str, String lang)
+    {
+        return filter(str);
+    }
+}

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/AbstractBrowserServlet.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/AbstractBrowserServlet.java	2007-11-29 05:00:58 UTC (rev 2405)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/AbstractBrowserServlet.java	2007-11-29 11:58:05 UTC (rev 2406)
@@ -138,7 +138,12 @@
                     }
                 }
             }
-            
+
+            if (order == null && bi != null)
+            {
+                order = bi.getDefaultOrder();
+            }
+
             // if no resultsperpage set, default to 20
             if (resultsperpage == -1)
             {

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/webapp/browse/full.jsp
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/webapp/browse/full.jsp	2007-11-29 05:00:58 UTC (rev 2405)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/webapp/browse/full.jsp	2007-11-29 11:58:05 UTC (rev 2406)
@@ -359,10 +359,13 @@
 <%
 		for (SortOption sortBy : sortOptions)
 		{
-			String selected = (sortBy.getName().equals(sortedBy) ? "selected=\"selected\"" : "");
-			String mKey = "browse.sort-by." + sortBy.getName();
-			%> <option value="<%= sortBy.getNumber() %>" <%= selected %>><fmt:message key="<%= mKey %>"/></option><%
-		}
+            if (sortBy.isVisible())
+            {
+                String selected = (sortBy.getName().equals(sortedBy) ? "selected=\"selected\"" : "");
+                String mKey = "browse.sort-by." + sortBy.getName();
+                %> <option value="<%= sortBy.getNumber() %>" <%= selected %>><fmt:message key="<%= mKey %>"/></option><%
+            }
+        }
 %>
 		</select>
 <%

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java	2007-11-29 05:00:58 UTC (rev 2405)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java	2007-11-29 11:58:05 UTC (rev 2406)
@@ -465,8 +465,11 @@
     
                     for (SortOption so : sortOptions)
                     {
-                        sortSelect.addOption(so.equals(info.getSortOption()), so.getNumber(),
-                                message("xmlui.ArtifactBrowser.ConfigurableBrowse.sort_by." + so.getName()));
+                        if (so.isVisible())
+                        {
+                            sortSelect.addOption(so.equals(info.getSortOption()), so.getNumber(),
+                                    message("xmlui.ArtifactBrowser.ConfigurableBrowse.sort_by." + so.getName()));
+                        }
                     }
                 }
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2410
          http://dspace.svn.sourceforge.net/dspace/?rev=2410&view=rev
Author:   tdonohue
Date:     2007-11-30 10:14:41 -0800 (Fri, 30 Nov 2007)

Log Message:
-----------
Small addition of a "Skip" flag to MediaFilterManager/filter-media. Allows one to specific a list of identifiers (communities/collections/items) to SKIP during filtering process.  Updated documentation to explain this new flag.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/docs/application.html
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java

Modified: branches/dspace-1_5_x/dspace/docs/application.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/application.html	2007-11-30 05:00:44 UTC (rev 2409)
+++ branches/dspace-1_5_x/dspace/docs/application.html	2007-11-30 18:14:41 UTC (rev 2410)
@@ -966,43 +966,52 @@
   <p><strong>Available Command-Line Options:</strong></p>
 
 <ul>
-<li><code>[dspace]/bin/filter-media -h</code>
+<li><strong>Help</strong>: <code>[dspace]/bin/filter-media -h</code>
    <ul>
    <li>Display help message describing all command-line options.</li>
    </ul>
 </li>
 
-<li><code>[dspace]/bin/filter-media -f</code>
+<li><strong>Force mode</strong>: <code>[dspace]/bin/filter-media -f</code>
 	<ul>
-	<li>"Force" mode - Apply filters to ALL bitstreams, even if they've already been filtered.  If they've already been filtered, the previously filtered content is overwritten.</li>
+	<li>Apply filters to ALL bitstreams, even if they've already been filtered.  If they've already been filtered, the previously filtered content is overwritten.</li>
  	</ul>
 </li>
  
-<li><code>[dspace]/bin/filter-media -i 123456789/2</code>
+<li><strong>Identifier mode</strong>: <code>[dspace]/bin/filter-media -i 123456789/2</code>
 	<ul>
 	<li>Restrict processing to the community, collection, or item named by the identifier - by default, all bitstreams of all items in the repository are processed. The identifier must be a Handle, not a DB key. This option may be combined with any other option.</li>
 	</ul>
 </li>
  
-<li><code>[dspace]/bin/filter-media -m 1000</code>
+<li><strong>Maximum mode</strong>: <code>[dspace]/bin/filter-media -m 1000</code>
 	<ul>
 	<li>Suspend operation after the specified maximum number of items have been processed - by default, no limit exists. This option may be combined with any other option.</li>
 	</ul>
 </li>
  
-<li><code>[dspace]/bin/filter-media -n</code>
+<li><strong>No-Index mode</strong>: <code>[dspace]/bin/filter-media -n</code>
 	<ul>
 	<li>Suppress index creation - by default, a new search index is created for full-text searching. This option suppresses index creation if you intend to run <code>index-all</code> elsewhere.</li>
   	</ul>
 </li>
 
-<li><code>[dspace]/bin/filter-media -p "PDF Text Extractor","Word Text Extractor"</code>
+<li><strong>Plugin mode</strong>: <code>[dspace]/bin/filter-media -p "PDF Text Extractor","Word Text Extractor"</code>
 	<ul>
 	<li>Apply ONLY the filter plugin(s) listed (separated by commas).  By default all named filters listed in the <code>filter.plugins</code> field of <code>dspace.cfg</code> are applied. This option may be combined with any other option. <em>WARNING:</em> multiple plugin names must be separated by a comma (i.e. ',') and NOT a comma followed by a space (i.e. ', ').</li>
 	</ul>
 </li>
+
+<li><strong>Skip mode</strong>: <code>[dspace]/bin/filter-media -s 123456789/9,123456789/100</code>
+	<ul>
+	<li>SKIP the listed identifiers (separated by commas) during processing.  The identifiers must be Handles (not DB Keys).  They may refer to items, collections or communities which should be skipped.  This option may be combined with any other option. <em>WARNING:</em> multiple identifiers must be separated by a comma (i.e. ',') and NOT a comma followed by a space (i.e. ', ').</li>
+	<li>NOTE: If you have a large number of identifiers to skip, you may maintain this comma-separated list within a separate file (e.g. <code>filter-skiplist.txt</code>), and call it similar to the following:
+		<ul><li><code>[dspace]/bin/filter-media -s `less filter-skiplist.txt`</code></li></ul>
+	</li>
+	</ul>
+</li>
   
-<li><code>[dspace]/bin/filter-media -v</code>
+<li><strong>Verbose mode</strong>: <code>[dspace]/bin/filter-media -v</code>
 	<ul>
 	<li>Verbose mode - print all extracted text and other filter details to STDOUT.</li>
 	</ul>

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java	2007-11-30 05:00:44 UTC (rev 2409)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java	2007-11-30 18:14:41 UTC (rev 2410)
@@ -113,6 +113,8 @@
     
     private static Map filterFormats = new HashMap();
     
+    private static List skipList = null; //list of identifiers to skip during processing
+    
     //separator in filterFormats Map between a filter class name and a plugin name,
     //for MediaFilters which extend SelfNamedPlugin (\034 is "file separator" char)
     public static String FILTER_PLUGIN_SEPARATOR = "\034";
@@ -151,8 +153,19 @@
                        "(e.g. MediaFilterManager -p \n\"Word Text Extractor\",\"PDF Text Extractor\")");                
         Option pluginOption = OptionBuilder.create('p');
         pluginOption.setArgs(Option.UNLIMITED_VALUES); //unlimited number of args
-        options.addOption(pluginOption);                             
-         
+        options.addOption(pluginOption);	
+        
+         //create a "skip" option (to specify communities/collections/items to skip)
+        OptionBuilder.withLongOpt("skip");
+        OptionBuilder.withValueSeparator(',');
+        OptionBuilder.withDescription(
+                "SKIP the bitstreams belonging to identifier\n" + 
+                "Separate multiple identifiers with a comma (,)\n" +
+                "(e.g. MediaFilterManager -s \n 123456789/34,123456789/323)");                
+        Option skipOption = OptionBuilder.create('s');
+        skipOption.setArgs(Option.UNLIMITED_VALUES); //unlimited number of args
+        options.addOption(skipOption);    
+        
         CommandLine line = null;
         try
         {
@@ -308,7 +321,29 @@
               
         //store our filter list into an internal array
         filterClasses = (FormatFilter[]) filterList.toArray(new FormatFilter[filterList.size()]);
+        
+        
+        //Retrieve list of identifiers to skip (if any)
+        String skipIds[] = null;
+        if(line.hasOption('s'))
+        {
+            //specified which identifiers to skip when processing
+            skipIds = line.getOptionValues('s');
             
+            if(skipIds==null || skipIds.length==0)
+            {   //display error, since no identifiers specified to skip
+                System.err.println("\nERROR: -s (-skip) option requires at least one identifier to SKIP.\n" +
+                                    "Make sure to separate multiple identifiers with a comma!\n" +
+                                    "(e.g. MediaFilterManager -s 123456789/34,123456789/323)\n");
+                HelpFormatter myhelp = new HelpFormatter();
+                myhelp.printHelp("MediaFilterManager\n", options);
+                System.exit(0);
+            }
+            
+            //save to a global skip list
+            skipList = Arrays.asList(skipIds);
+        }
+        
         Context c = null;
 
         try
@@ -372,46 +407,68 @@
 
     public static void applyFiltersAllItems(Context c) throws Exception
     {
-        ItemIterator i = Item.findAll(c);
-        while (i.hasNext() && processed < max2Process)
+        if(skipList!=null)
+        {    
+            //if a skip-list exists, we need to filter community-by-community
+            //so we can respect what is in the skip-list
+            Community[] topLevelCommunities = Community.findAllTop(c);
+          
+            for(int i=0; i<topLevelCommunities.length; i++)
+                applyFiltersCommunity(c, topLevelCommunities[i]);
+        }
+        else 
         {
-        	applyFiltersItem(c, i.next());
+            //otherwise, just find every item and process
+            ItemIterator i = Item.findAll(c);
+            while (i.hasNext() && processed < max2Process)
+            {
+            	applyFiltersItem(c, i.next());
+            }
         }
     }
     
     public static void applyFiltersCommunity(Context c, Community community)
                                              throws Exception
-    {
-       	Community[] subcommunities = community.getSubcommunities();
-       	for (int i = 0; i < subcommunities.length; i++)
-       	{
-       		applyFiltersCommunity(c, subcommunities[i]);
-       	}
-       	
-       	Collection[] collections = community.getCollections();
-       	for (int j = 0; j < collections.length; j++)
-       	{
-       		applyFiltersCollection(c, collections[j]);
-       	}
+    {   //only apply filters if community not in skip-list
+        if(!inSkipList(community.getHandle()))
+        {    
+           	Community[] subcommunities = community.getSubcommunities();
+           	for (int i = 0; i < subcommunities.length; i++)
+           	{
+           		applyFiltersCommunity(c, subcommunities[i]);
+           	}
+           	
+           	Collection[] collections = community.getCollections();
+           	for (int j = 0; j < collections.length; j++)
+           	{
+           		applyFiltersCollection(c, collections[j]);
+           	}
+        }
     }
         
     public static void applyFiltersCollection(Context c, Collection collection)
                                               throws Exception
     {
-        ItemIterator i = collection.getItems();
-        while (i.hasNext() && processed < max2Process)
+        //only apply filters if collection not in skip-list
+        if(!inSkipList(collection.getHandle()))
         {
-        	applyFiltersItem(c, i.next());
+            ItemIterator i = collection.getItems();
+            while (i.hasNext() && processed < max2Process)
+            {
+            	applyFiltersItem(c, i.next());
+            }
         }
     }
        
     public static void applyFiltersItem(Context c, Item item) throws Exception
     {
-        //cache this item in MediaFilterManager
-        //so it can be accessed by MediaFilters as necessary
-        currentItem = item;
-        
-        
+        //only apply filters if item not in skip-list
+        if(!inSkipList(item.getHandle()))
+        {
+    	  //cache this item in MediaFilterManager
+    	  //so it can be accessed by MediaFilters as necessary
+    	  currentItem = item;
+    	
           if (filterItem(c, item))
           {
         	  // commit changes after each filtered item
@@ -422,6 +479,7 @@
           // clear item objects from context cache and internal cache
           item.decache();
           currentItem = null;
+        }  
     }
 
     /**
@@ -638,4 +696,24 @@
         return currentItem;
     }
     
+    /**
+     * Check whether or not to skip processing the given identifier
+     * 
+     * @param identifier
+     *            identifier (handle) of a community, collection or item
+     *            
+     * @return true if this community, collection or item should be skipped
+     *          during processing.  Otherwise, return false.
+     */
+    public static boolean inSkipList(String identifier)
+    {
+        if(skipList!=null && skipList.contains(identifier))
+        {
+            System.out.println("SKIP-LIST: skipped bitstreams within identifier " + identifier);
+            return true;
+        }    
+        else
+            return false;
+    }
+    
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2435
          http://dspace.svn.sourceforge.net/dspace/?rev=2435&view=rev
Author:   mdiggory
Date:     2007-12-13 11:26:33 -0800 (Thu, 13 Dec 2007)

Log Message:
-----------
Allow X509Authentication to be triggered from Login Choices page as well. Default is old behavior, This allows one to maintain the site under http and only protect certificate login page with https for certificate authentication. Implicit X509 Authentication is not ideal in relation to default Internet Explorer behavior.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
    branches/dspace-1_5_x/dspace-api/src/main/resources/Messages.properties
    branches/dspace-1_5_x/dspace-jspui/src/main/webapp/WEB-INF/web.xml

Added Paths:
-----------
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/X509CertificateServlet.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-12-13 17:37:59 UTC (rev 2434)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-12-13 19:26:33 UTC (rev 2435)
@@ -249,6 +249,13 @@
 ## Create e-persons for unknown names in valid certificates?
 #authentication.x509.autoregister = true
 
+## Allow Certificate auth to show as a choice in chooser
+# Use Messages.properties key for title
+#authentication.x509.chooser.title.key=org.dspace.eperson.X509Authentication.title
+#
+# Identify the location of the Certificate Login Servlet.
+#authentication.x509.chooser.uri=/certificate-login
+        
 #### Example of configuring IP-based authentication
 #### (to use, add org.dspace.authenticate.IPAuthentication to auth stack above)
 #

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java	2007-12-13 17:37:59 UTC (rev 2434)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java	2007-12-13 19:26:33 UTC (rev 2435)
@@ -110,6 +110,10 @@
     /** key store for CA certs if we use that */
     private static KeyStore caCertKeyStore = null;
 
+    private static String loginPageTitle = null;
+    
+    private static String loginPageURL = null;
+    
     /**
      * Initialization:
      *  Set caPublicKey and/or keystore.  This loads the information
@@ -117,6 +121,14 @@
      */
     static
     {
+        /*
+         * allow identification of alternative entry points 
+         * for certificate authentication when
+         * selected by the user rather than implicitly.
+         */
+        loginPageTitle = ConfigurationManager.getProperty("authentication.x509.chooser.title.key");
+        loginPageURL = ConfigurationManager.getProperty("authentication.x509.chooser.uri");
+        
         String keystorePath = ConfigurationManager.getProperty("authentication.x509.keystore.path");
         String keystorePassword = ConfigurationManager.getProperty("authentication.x509.keystore.password");
         String caCertPath = ConfigurationManager.getProperty("authentication.x509.ca.cert");
@@ -457,10 +469,10 @@
     }
 
     /**
-     * Return null, since this is an implicit method with no login page.
+     * Returns URL of password-login servlet.
      *
      * @param context
-     *  DSpace context, will be modified (ePerson set) upon success.
+     *  DSpace context, will be modified (EPerson set) upon success.
      *
      * @param request
      *  The HTTP request that started this operation, or null if not applicable.
@@ -474,19 +486,20 @@
                             HttpServletRequest request,
                             HttpServletResponse response)
     {
-        return null;
+        return loginPageURL;
     }
 
     /**
-     * Return null, since this is an implicit method with no login page.
+     * Returns message key for title of the "login" page, to use
+     * in a menu showing the choice of multiple login methods.
      *
      * @param context
-     *  DSpace context, will be modified (ePerson set) upon success.
+     *  DSpace context, will be modified (EPerson set) upon success.
      *
      * @return Message key to look up in i18n message catalog.
      */
     public String loginPageTitle(Context context)
     {
-        return null;
+        return loginPageTitle;
     }
 }

Modified: branches/dspace-1_5_x/dspace-api/src/main/resources/Messages.properties
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/resources/Messages.properties	2007-12-13 17:37:59 UTC (rev 2434)
+++ branches/dspace-1_5_x/dspace-api/src/main/resources/Messages.properties	2007-12-13 19:26:33 UTC (rev 2435)
@@ -1329,6 +1329,7 @@
 org.dspace.content.Community.untitled                                           = Untitled
 org.dspace.eperson.LDAPAuthentication.title                                     = Enter LDAP Netid and Password
 org.dspace.eperson.PasswordAuthentication.title                                 = Enter DSpace Username and Password
+org.dspace.eperson.X509Authentication.title                                     = Enter DSpace using Web Certificate
 org.dspace.eperson.Subscribe.id                                                 = ID: 
 org.dspace.eperson.Subscribe.new-items                                          = New Items:
 org.dspace.eperson.Subscribe.title                                              = Title:

Added: branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/X509CertificateServlet.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/X509CertificateServlet.java	                        (rev 0)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/X509CertificateServlet.java	2007-12-13 19:26:33 UTC (rev 2435)
@@ -0,0 +1,115 @@
+/*
+ * X509CertificateServlet.java
+ *
+ * Version: $Revision$
+ *
+ * Date: $Date$
+ *
+ * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+package org.dspace.app.webui.servlet;
+
+import java.io.IOException;
+import java.security.cert.X509Certificate;
+import java.sql.SQLException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.dspace.app.webui.util.Authenticate;
+import org.dspace.app.webui.util.JSPManager;
+import org.dspace.app.webui.util.UIUtil;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.dspace.core.LogManager;
+import org.dspace.eperson.EPerson;
+
+/**
+ * X509 certificate authentication servlet. This is an
+ * access point for interactive certificate auth that will
+ * not be implicit (i.e. not immediately performed
+ * because the resource is being accessed via HTTP
+ * 
+ * @author Robert Tansley
+ * @author Mark Diggory
+ * @version $Revision$
+ */
+public class X509CertificateServlet extends DSpaceServlet
+{
+    /** serialization id */
+    private static final long serialVersionUID = -3571151231655696793L;
+    
+    /** log4j logger */
+    private static Logger log = Logger.getLogger(X509CertificateServlet.class);
+
+    protected void doDSGet(Context context, HttpServletRequest request,
+            HttpServletResponse response) throws ServletException, IOException,
+            SQLException, AuthorizeException
+    {
+        // Obtain the certificate from the request, if any
+        X509Certificate[] certs = (X509Certificate[]) request
+                .getAttribute("javax.servlet.request.X509Certificate");
+
+        if ((certs == null) || (certs.length == 0))
+        {
+            log.info(LogManager.getHeader(context, "failed_login",
+                    "type=x509certificate"));
+
+            JSPManager.showJSP(request, response, "/login/no-valid-cert.jsp");
+        }
+        else
+        {
+
+            Context ctx = UIUtil.obtainContext(request);
+
+            EPerson eperson = ctx.getCurrentUser();
+
+            // Do we have an active e-person now?
+            if ((eperson != null) && eperson.canLogIn())
+            {
+                // Everything OK - they should have already been logged in.
+                // resume previous request
+                Authenticate.resumeInterruptedRequest(request, response);
+
+                return;
+            }
+
+            // If we get to here, no valid cert
+            log.info(LogManager.getHeader(context, "failed_login",
+                    "type=x509certificate"));
+            JSPManager.showJSP(request, response, "/login/no-valid-cert.jsp");
+        }
+    }
+}


Property changes on: branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/X509CertificateServlet.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/webapp/WEB-INF/web.xml	2007-12-13 17:37:59 UTC (rev 2434)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/webapp/WEB-INF/web.xml	2007-12-13 19:26:33 UTC (rev 2435)
@@ -298,6 +298,11 @@
   </servlet>
 
   <servlet>
+    <servlet-name>certificate-login</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.X509CertificateServlet</servlet-class>
+  </servlet>
+  
+  <servlet>
     <servlet-name>profile</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.EditProfileServlet</servlet-class>
   </servlet>
@@ -544,6 +549,11 @@
   </servlet-mapping>
 
   <servlet-mapping>
+    <servlet-name>certificate-login</servlet-name>
+    <url-pattern>/certificate-login</url-pattern>
+  </servlet-mapping>
+  
+  <servlet-mapping>
     <servlet-name>profile</servlet-name>
     <url-pattern>/profile</url-pattern>
   </servlet-mapping>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2468
          http://dspace.svn.sourceforge.net/dspace/?rev=2468&view=rev
Author:   grahamtriggs
Date:     2007-12-29 14:19:26 -0800 (Sat, 29 Dec 2007)

Log Message:
-----------
Added "db.poolname" configuration (so that multiple applications can share a single DBCP). Also add a shutdown method to allow web applications to clean up on undeploy.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-12-25 22:45:58 UTC (rev 2467)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2007-12-29 22:19:26 UTC (rev 2468)
@@ -55,6 +55,10 @@
 # Determine if prepared statement should be cached. (default is true)
 db.statementpool = true
 
+# Specify a name for the connection pool (useful if you have multiple applications sharing Tomcat's dbcp)
+# If not specified, defaults to 'dspacepool'
+# db.poolname = dspacepool
+
 ##### Email settings ######
 
 # SMTP mail server

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java	2007-12-25 22:45:58 UTC (rev 2467)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java	2007-12-29 22:19:26 UTC (rev 2468)
@@ -96,6 +96,9 @@
 
     /** True if initialization has been done */
     private static boolean initialized = false;
+
+    /** Name to use for the pool */
+    private static String poolName = "dspacepool";
     
     /** 
      * This regular expression is used to perform sanity checks 
@@ -509,7 +512,7 @@
         initialize();
 
         return DriverManager
-                .getConnection("jdbc:apache:commons:dbcp:dspacepool");
+                .getConnection("jdbc:apache:commons:dbcp:" + poolName);
     }
 
     /**
@@ -1386,9 +1389,24 @@
     }
 
     /**
+     * Provide a means for a (web) application to cleanly terminate the connection pool.
+     * @throws SQLException
+     */
+    public static synchronized void shutdown() throws SQLException
+    {
+        if (initialized)
+        {
+            initialized = false;
+            PoolingDriver driver = (PoolingDriver)DriverManager.getDriver("jdbc:apache:commons:dbcp:" + poolName);
+            if (driver != null)
+                driver.closePool(poolName);
+        }
+    }
+
+    /**
      * Initialize the DatabaseManager.
      */
-    private static void initialize() throws SQLException
+    private static synchronized void initialize() throws SQLException
     {
         if (initialized)
         {
@@ -1491,6 +1509,12 @@
                     false, // read only is not default for now
                     false); // Autocommit defaults to none
 
+            // Obtain a poolName from the config, default is "dspacepool"
+            if (ConfigurationManager.getProperty("db.poolname") != null)
+            {
+                poolName = ConfigurationManager.getProperty("db.poolname");
+            }
+
             //
             // Finally, we create the PoolingDriver itself...
             //
@@ -1499,7 +1523,7 @@
             //
             // ...and register our pool with it.
             //
-            driver.registerPool("dspacepool", connectionPool);
+            driver.registerPool(poolName, connectionPool);
 
             // Old SimplePool init
             //DriverManager.registerDriver(new SimplePool());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2481
          http://dspace.svn.sourceforge.net/dspace/?rev=2481&view=rev
Author:   tdonohue
Date:     2008-01-04 14:45:19 -0800 (Fri, 04 Jan 2008)

Log Message:
-----------
Various bug fixes to JSP-UI file upload step:
Fixed NPE when no file selected to upload.  Fixed small bug in processing of upload-error.jsp (was not returning to file upload screen).  Fixed ability to enable *skipping* uploading a file during JSPUI submission (some of the code never made it into 1.5 codebase during my original Config Submission patch, so this feature was not working properly).

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/submission.html
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/UploadStep.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/SubmissionController.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPUploadStep.java
    branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/choose-file.jsp
    branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/review-init.jsp
    branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/upload-error.jsp

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-01-04 17:33:41 UTC (rev 2480)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-01-04 22:45:19 UTC (rev 2481)
@@ -176,6 +176,9 @@
 # Where to put the logs (used in configuration only)
 log.dir = ${dspace.dir}/log
 
+
+##### Upload File settings #####
+
 # Where to temporarily store uploaded files
 upload.temp.dir = ${dspace.dir}/upload
 
@@ -183,6 +186,10 @@
 # 512Mb
 upload.max = 536870912
 
+# Whether or not we REQUIRE that a file be uploaded
+# during the 'Upload' step in the submission process
+# Defaults to true; If set to 'false', submitter has option to skip upload
+#webui.submit.upload.required = true
 
 ##### Search settings #####
 

Modified: branches/dspace-1_5_x/dspace/docs/submission.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/submission.html	2008-01-04 17:33:41 UTC (rev 2480)
+++ branches/dspace-1_5_x/dspace/docs/submission.html	2008-01-04 22:45:19 UTC (rev 2481)
@@ -24,6 +24,7 @@
       <li><a href="#stepOrdering">Reordering/Removing Submission Steps</a></li>
       <li><a href="#collectionSubmission">Assigning a custom Submission Process to a Collection</a></li>
       <li><a href="#metadataEntry">Customizing the Metadata-entry pages</a></li>
+      <li><a href="#uploadStep">Configuring the File Upload step</a></li>
       <li><a href="#createStep">Creating new Submission Steps</a></li>
   </ul>
   
@@ -661,6 +662,18 @@
   <P>Any mistake in the syntax or semantics of the form definitions, such as poorly formed XML or a reference to a nonexistent field name, will cause a fatal error in the DSpace UI. The exception message (at the top of the stack trace in the <CODE>dspace.log</CODE> file) usually has a concise and helpful explanation of what went wrong. Don't forget to stop and restart the servlet container before testing your fix to a bug.</P>
 
 
+  <a name="uploadStep" id="uploadStep"></a>
+  <H2>Configuring the File Upload step</H2>
+
+  <P>The <em>Upload</em> step in the DSpace submission process has two configuration options 
+  which can be set with your <code>[dspace]/config/dspace.cfg</code> configuration file.  They are as follows:</P>
+  <UL>
+  	<LI><code>upload.max</code> - 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. 
+  		<UL><LI><em>Note:</em> Increasing this value or setting to -1 does <strong>not</strong> 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.</LI></UL>
+  	</LI>
+  	<LI><code>webui.submit.upload.required</code> - Whether or not all users are <em>required</em> 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.</LI>
+  </UL>
+
   <a name="createStep" id="createStep"></a>
   <H2>Creating new Submission Steps</H2>
   

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/UploadStep.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/UploadStep.java	2008-01-04 17:33:41 UTC (rev 2480)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/UploadStep.java	2008-01-04 22:45:19 UTC (rev 2481)
@@ -81,6 +81,9 @@
     /** Button to upload a file * */
     public static final String SUBMIT_UPLOAD_BUTTON = "submit_upload";
 
+    /** Button to skip uploading a file * */
+    public static final String SUBMIT_SKIP_BUTTON = "submit_skip";
+
     /** Button to submit more files * */
     public static final String SUBMIT_MORE_BUTTON = "submit_more";
 
@@ -259,7 +262,7 @@
                 // (return any status messages or errors reported)
                 int status = processUploadFile(context, request, response,
                         subInfo);
-
+                
                 // if error occurred, return immediately
                 if (status != STATUS_COMPLETE)
                     return status;
@@ -317,8 +320,8 @@
         // Step #7: Determine if there is an error because no
         // files have been uploaded.
         // ---------------------------------------------------
-        // if "submit_skip" is unspecified, then a file is required!
-        boolean allowEmptyItems = (request.getParameter("submit_skip") != null);
+        // if "submit_skip" button was not pressed, then a file is required!
+        boolean allowEmptyItems = (request.getParameter(SUBMIT_SKIP_BUTTON) != null);
         if (!allowEmptyItems)
         {
             Bundle[] bundles = item.getBundles("ORIGINAL");
@@ -484,7 +487,7 @@
                 String filePath = (String) request.getAttribute(param + "-path");
                 InputStream fileInputStream = (InputStream) request
                                     .getAttribute(param + "-inputstream");
-
+                
                 //attempt to get description from attribute first, then direct from a parameter
                 String fileDescription =  (String) request
                                     .getAttribute(param + "-description");

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/SubmissionController.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/SubmissionController.java	2008-01-04 17:33:41 UTC (rev 2480)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/SubmissionController.java	2008-01-04 22:45:19 UTC (rev 2481)
@@ -402,6 +402,13 @@
             //if this step is finished, continue to next step
             if(stepFinished)
             {
+                // If we finished up an upload, then we need to change
+                // the FileUploadRequest object back to a normal HTTPServletRequest
+                if(request instanceof FileUploadRequest)
+                {    
+                    request = ((FileUploadRequest)request).getOriginalRequest();
+                }
+                
                 //retrieve any changes to the SubmissionInfo object
                 subInfo = getSubmissionInfo(context, request);
                 

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPUploadStep.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPUploadStep.java	2008-01-04 17:33:41 UTC (rev 2480)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPUploadStep.java	2008-01-04 22:45:19 UTC (rev 2481)
@@ -225,6 +225,8 @@
                     }
                     
                     File temp = wrapper.getFile("file");
+                    
+                    //if file exists and has a size greater than zero
                     if (temp != null && temp.length() > 0)
                     {
                         // Read the temp file into an inputstream
@@ -232,9 +234,10 @@
                                 new FileInputStream(temp));
 
                         filePath = wrapper.getFilesystemName("file");
+                    
+                        // cleanup our temp file
+                        temp.delete();
                     }
-                    // remove our temp file
-                    temp.delete();
                     
                     //save file info to request (for UploadStep class)
                     request.setAttribute("file-path", filePath);
@@ -288,7 +291,7 @@
         String buttonPressed = UIUtil.getSubmitButton(request, NEXT_BUTTON);
 
         // Do we need to skip the upload entirely?
-        if (request.getParameter("submit_skip") != null)
+        if (buttonPressed.equalsIgnoreCase(SUBMIT_SKIP_BUTTON))
         {
             Bundle[] bundles = subInfo.getSubmissionItem().getItem()
                     .getBundles("ORIGINAL");
@@ -300,9 +303,16 @@
                 showUploadFileList(context, request, response, subInfo, true,
                         false);
             }
-
+            
             return; // return immediately, since we are skipping upload
         }
+        
+        //If upload failed in JSPUI (just came from upload-error.jsp), user can retry the upload
+        if(buttonPressed.equalsIgnoreCase("submit_retry"))
+        {
+            showUploadPage(context, request, response, subInfo, false);
+        }
+        
         // ------------------------------
         // Check for Errors!
         // ------------------------------
@@ -316,20 +326,28 @@
                         UIUtil.getRequestLogInfo(request)));
                 JSPManager.showIntegrityError(request, response);
             }
-            else if (status == STATUS_UPLOAD_ERROR)
+            else if (status == STATUS_UPLOAD_ERROR || status == STATUS_NO_FILES_ERROR)
             {
                 // There was a problem uploading the file!
 
-                // So, we need to show the file upload error page
-                if (subInfo != null)
+                //First, check if we just removed our uploaded file
+                if(buttonPressed.startsWith("submit_remove_"))
                 {
-                    Collection c = subInfo.getSubmissionItem().getCollection();
-                    DCInputsReader inputsReader = new DCInputsReader();
-                    request.setAttribute("submission.inputs", inputsReader
-                            .getInputs(c.getHandle()));
+                    //if file was just removed, go back to upload page
+                    showUploadPage(context, request, response, subInfo, false);
                 }
-                JSPStepManager.showJSP(request, response, subInfo, UPLOAD_ERROR_JSP);
-
+                else
+                {
+                    // We need to show the file upload error page
+                    if (subInfo != null)
+                    {
+                        Collection c = subInfo.getSubmissionItem().getCollection();
+                        DCInputsReader inputsReader = new DCInputsReader();
+                        request.setAttribute("submission.inputs", inputsReader
+                                .getInputs(c.getHandle()));
+                    }
+                    JSPStepManager.showJSP(request, response, subInfo, UPLOAD_ERROR_JSP);
+                }
             }
             else if (status == STATUS_UNKNOWN_FORMAT)
             {
@@ -339,7 +357,7 @@
                 showGetFileFormat(context, request, response, subInfo);
             }
         }
-
+        
         // As long as there are no errors, clicking Next
         // should immediately send them to the next step
         if (status == STATUS_COMPLETE && buttonPressed.equals(NEXT_BUTTON))

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/choose-file.jsp
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/choose-file.jsp	2008-01-04 17:33:41 UTC (rev 2480)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/choose-file.jsp	2008-01-04 22:45:19 UTC (rev 2481)
@@ -47,6 +47,7 @@
 
 <%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
 
+<%@ page import="org.dspace.core.ConfigurationManager" %>
 <%@ page import="org.dspace.core.Context" %>
 <%@ page import="org.dspace.app.webui.servlet.SubmissionController" %>
 <%@ page import="org.dspace.submit.AbstractProcessingStep" %>
@@ -66,6 +67,8 @@
 	//get submission information object
     SubmissionInfo subInfo = SubmissionController.getSubmissionInfo(context, request);
    
+ 	// Determine whether a file is REQUIRED to be uploaded (default to true)
+ 	boolean fileRequired = ConfigurationManager.getBooleanProperty("webui.submit.upload.required", true);
 %>
 
 
@@ -157,7 +160,19 @@
 				<%  } %>
                     <td>
                         <input type="submit" name="<%=UploadStep.SUBMIT_UPLOAD_BUTTON%>" value="<fmt:message key="jsp.submit.general.next"/>" />
-                    </td>           
+                    </td> 
+                    <%
+                        //if upload is set to optional, or user returned to this page after pressing "Add Another File" button
+                    	if (!fileRequired || UIUtil.getSubmitButton(request, "").equals(UploadStep.SUBMIT_MORE_BUTTON))
+                        {
+                    %>
+                        	<td>
+                                <input type="submit" name="<%=UploadStep.SUBMIT_SKIP_BUTTON%>" value="<fmt:message key="jsp.submit.choose-file.skip"/>" />
+                            </td>
+                    <%
+                        }
+                    %>   
+                              
                     <td>&nbsp;&nbsp;&nbsp;</td>
                     <td align="right">
                         <input type="submit" name="<%=AbstractProcessingStep.CANCEL_BUTTON%>" value="<fmt:message key="jsp.submit.general.cancel-or-save.button"/>" />

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/review-init.jsp
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/review-init.jsp	2008-01-04 17:33:41 UTC (rev 2480)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/review-init.jsp	2008-01-04 22:45:19 UTC (rev 2481)
@@ -74,7 +74,7 @@
   <%-- ====================================================== --%>
                
 				<tr>
-                   <td class="oddRowOddCol">
+                   <td class="evenRowOddCol">
                        <table>
                            <tr>
                                <td width="100%">

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/upload-error.jsp
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/upload-error.jsp	2008-01-04 17:33:41 UTC (rev 2480)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/upload-error.jsp	2008-01-04 22:45:19 UTC (rev 2481)
@@ -96,7 +96,7 @@
 <%-- HACK: <center> tag needed for broken Netscape 4.78 behaviour --%>
         <center>
             <p>
-                <input type="submit" name="submit" value="<fmt:message key="jsp.submit.upload-error.retry.button"/>" />
+                <input type="submit" name="submit_retry" value="<fmt:message key="jsp.submit.upload-error.retry.button"/>" />
             </p>
         </center>
     </form>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2491
          http://dspace.svn.sourceforge.net/dspace/?rev=2491&view=rev
Author:   tdonohue
Date:     2008-01-08 09:53:25 -0800 (Tue, 08 Jan 2008)

Log Message:
-----------
Merged 'item-submission-JSPUI.xml' and 'item-submission-XMLUI.xml' files into a single 'item-submission.xml' configuration file (based on suggestions from Graham Triggs).  

Small updates throughout API for Configurable Submission to support this merged configuration file (majority of changes in dspace-api and dspace-jspui modules).   Also includes updates to Configurable Submission documentation and small updates to I18N to make the XMLUI and JSPUI keys more parallel.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/item-submission.dtd
    branches/dspace-1_5_x/dspace/docs/submission.html
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfig.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfigReader.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionInfo.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionStepConfig.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/AbstractProcessingStep.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/DescribeStep.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/InitialQuestionsStep.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/UploadStep.java
    branches/dspace-1_5_x/dspace-api/src/main/resources/Messages.properties
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/MyDSpaceServlet.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/SubmissionController.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/JSPStep.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/JSPStepManager.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPCompleteStep.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPDescribeStep.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPInitialQuestionsStep.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPLicenseStep.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPSampleStep.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPSelectCollectionStep.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPUploadStep.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPVerifyStep.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/util/FileUploadRequest.java
    branches/dspace-1_5_x/dspace-jspui/src/main/webapp/submit/progressbar.jsp
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/AbstractStep.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/FlowUtils.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Submission/submission.js
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml

Added Paths:
-----------
    branches/dspace-1_5_x/dspace/config/item-submission.xml

Removed Paths:
-------------
    branches/dspace-1_5_x/dspace/config/item-submission-JSPUI.xml
    branches/dspace-1_5_x/dspace/config/item-submission-XMLUI.xml

Deleted: branches/dspace-1_5_x/dspace/config/item-submission-JSPUI.xml
===================================================================
--- branches/dspace-1_5_x/dspace/config/item-submission-JSPUI.xml	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace/config/item-submission-JSPUI.xml	2008-01-08 17:53:25 UTC (rev 2491)
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE item-submission SYSTEM "item-submission.dtd">
-
-<!-- JSP-UI Configurable Submission configuration file  -->
-
-<!-- This XML configuration file allows you to configure the ordering     -->
-<!-- and number of the steps that occur in the Item Submission Process.   -->
-<item-submission>
-
- <!-- The process-map maps collection handles to a particular Item         -->
- <!-- Submission Process.  This requires that a collection's name be       -->
- <!-- unique, even within a community. DSpace does however insure that each-->
- <!-- collection's handle is unique.  Process-map provides the means to    -->
- <!-- associate a unique collection name with an Item Submission process.  -->
- <!-- The process-map also provides the special handle "default" (which is -->
- <!-- never a collection), here mapped to "traditional". Any collection    -->
- <!-- which does not appear in this map will be associated with the mapping-->
- <!-- for handle "default".                                                -->
- <submission-map>
-   <name-map collection-handle="default" submission-name="traditional" />
- </submission-map>
-
-
- 
- <!-- The 'step-definitions' allows you to define steps which you may wish -->
- <!-- to "share" amongst multiple submission-item definitions.  In order to-->
- <!-- share the same step definition, you can refer to it by its unique id -->
- <!-- defined in this section.  EVERY 'step' in this section MUST have a   -->
- <!-- unique identifier in the 'id' attribute!                             -->
- <!--                                                                      -->
- <!-- Each <step> REQUIRES the following attributes (@) and properties:    --> 
- <!-- @id       - The unique identifier for this step                      -->
- <!-- <processing-class> - The class which will process all information for-->
- <!--             this step. The class must implement the                  -->
- <!--             'org.dspace.app.webui.submit.JSPStep' interface AND      -->
- <!--             extend 'org.dspace.submit.AbstractProcessingStep'        -->
- <!--             (or one of the org.dspace.submit.step.* classes)         -->
- <!--             This property should reference the full path of the class-->
- <!--			  (e.g. org.dspace.app.webui.submit.MyCustomJSPStep)       -->
- <!--																	   -->
- <!-- The following properties are OPTIONAL for each <step>:			   -->
- <!-- <heading> -    References the message text (from the 				   -->
- <!--			     Messages.properties file) which will be used as this  -->
- <!--			     step's heading in the progress-bar.  If unspecified,  -->
- <!--			     the step does not show up in the Progress Bar.	       -->
- <!-- <review-jsp> - The context path (e.g. /submit/myJSP.jsp) of the JSP  -->
- <!--				 which will give a READ-ONLY view of the users answers -->
- <!--				 for this entire step.  This JSP is used by the        -->
- <!--				 "Verify" step to allow the users to review his/her    -->
- <!--				 for each previous step.  If the <review-jsp> is       -->
- <!--				 unspecified, the user will not be able to review      -->
- <!--				 his/her answers for this <step> in the "Verify" step. -->
- <!-- <workflow-editable> - whether or not this step will appear during the-->
- <!--				 "Edit Metadata" workflow approval process.  This field-->
- <!--				 defaults to TRUE (which means it can be edited during -->
- <!--				 the "Edit Metadata" workflow stage)				   -->
- <!--                                                                      -->
- <!--                                                                      -->
- <step-definitions>
-     <!-- The "collection" step is a "special step" which is *REQUIRED* to be-->
-     <!-- in this section!  In DSpace, all submitted items must be           -->
-     <!-- immediately assigned to a collection. This step ensures that a     -->
-     <!-- collection is always selected.  If a user is already submitting    -->
-     <!-- from within a Collection (by clicking the "Submit to This          -->
-     <!-- Collection" button) then this step will be automatically skipped.  -->
-     <!-- In all other cases, this step ensures that the user *first* selects-->
-     <!-- a collection!                                                      -->
-     <!-- Since this is a "special step", it is *automatically* added at the -->
-     <!-- beginning of each 'submission-process' (therefore it should not be -->
-     <!-- referenced by any of the below 'submission-process' tags).  Also as-->
-     <!-- a special step, it is currently NEVER editable in a workflow.      -->                              
-     <step id="collection">
-       <heading></heading> <!--can specify heading, if you want it to appear in Progress Bar-->
-       <processing-class>org.dspace.app.webui.submit.step.JSPSelectCollectionStep</processing-class>
-       <workflow-editable>false</workflow-editable>
-     </step>
-   
-     <!-- The "complete" step is a "special step" which is *REQUIRED* to be-->
-     <!-- in this section!  In DSpace, when a submission is completed,       -->
-     <!-- a workflow is automatically kicked off (if one exists)             -->
-     <!-- This "complete" step performs all backend processing that occurs   -->
-     <!-- immediately upon completing the submission.                        -->
-     <!-- Since this is a "special step", it is *automatically* added at the -->
-     <!-- end of each 'submission-process' (therefore it should not be       -->
-     <!-- referenced by any of the below 'submission-process' tags).  Also as-->
-     <!-- a special step, it is currently NEVER editable in a workflow.      -->                               
-     <step id="complete">
-       <heading>jsp.submit.progressbar.complete</heading>
-       <processing-class>org.dspace.app.webui.submit.step.JSPCompleteStep</processing-class>
-       <workflow-editable>false</workflow-editable>
-     </step>
-   
-   
-     <!-- This is the Sample Step which utilizes the JSPSampleStep class-->
-     <step id="sample">
-            <heading>Sample</heading>
-            <processing-class>org.dspace.app.webui.submit.step.JSPSampleStep</processing-class>
-            <review-jsp>/submit/sample-review.jsp</review-jsp>
-            <workflow-editable>true</workflow-editable>
-     </step>
- </step-definitions>
-
- <!-- The submission-definitions map lays out the detailed definition of   -->
- <!-- all the Item Submission Processes (and the ordering of their steps). -->
- <!-- Each separate "submission-process" has a unique name as an attribute,-->
- <!-- which matches one of the names in the process-map. One named         -->
- <!-- "submit-process" has the name "traditional"; as this name suggests,  -->
- <!-- it is the default item submission process, which gets used when      -->
- <!-- the specified collection has no correspondingly named submit-process.-->
- <!--                                                                      -->
- <!-- Each submit-process contains an ordered set of steps; each step      -->
- <!-- defines one "step" occurring during the process of submitting an     -->
- <!-- item.  A step can either be reference by 'id' (in which case it must -->
- <!-- be defined in <step-definitions> above), or defined completely here. -->
- <!--                                                                      -->
- <!-- If the step is not referred to by 'id', then the <step> REQUIRES the -->
- <!-- following properties are defined:                                    --> 
- <!-- <processing-class> - The class which will process all information for-->
- <!--             this step. The class must implement the                  -->
- <!--             'org.dspace.app.webui.submit.JSPStep' interface AND      -->
- <!--             extend 'org.dspace.submit.AbstractProcessingStep'        -->
- <!--             (or one of the org.dspace.submit.step.* classes)         -->
- <!--             This property should reference the full path of the class-->
- <!--			  (e.g. org.dspace.app.webui.submit.MyCustomJSPStep)       -->
- <!--                                                                      -->
- <!-- The following properties are OPTIONAL for each <step>:			   -->
- <!-- <heading> -    References the message text (from the 				   -->
- <!--			     Messages.properties file) which will be used as this  -->
- <!--			     step's heading in the progress-bar.  If unspecified,  -->
- <!--			     the Step does not show up in the Progress Bar.	       -->
- <!-- <review-jsp> - The context path (e.g. /submit/myJSP.jsp) of the JSP  -->
- <!--				 which will give a READ-ONLY view of the users answers -->
- <!--				 for this entire step.  This JSP is used by the        -->
- <!--				 "Verify" step to allow the users to review his/her    -->
- <!--				 for each previous step.  If the <review-jsp> is       -->
- <!--				 unspecified, the user will not be able to review      -->
- <!--				 his/her answers for this <step> in the "Verify" step. -->
- <!-- <workflow-editable> - whether or not this step will appear during the-->
- <!--				 "Edit Metadata" workflow approval process.  This field-->
- <!--				 defaults to TRUE (which means it can be edited during -->
- <!--				 the "Edit Metadata" workflow stage).  Set to either   -->
- <!--				 "true" or "false".				                       -->
- <!--                                                                      -->
- <submission-definitions>
-   
-   <!--This "traditional" process defines the DEFAULT item submission process-->
-   <submission-process name="traditional">
-     
-     <!--Uncommment to display the SAMPLE step as your first step-->
-     <!--<step id="sample"/>-->
-          
-     <!--Step 1 will be to gather initial information-->
-	  <step>
-	    <heading>jsp.submit.progressbar.describe</heading>
-	    <processing-class>org.dspace.app.webui.submit.step.JSPInitialQuestionsStep</processing-class>
-	    <review-jsp>/submit/review-init.jsp</review-jsp>
-	    <workflow-editable>true</workflow-editable>
-	  </step>  
-          
-      <!--Step 2 will be to Describe the item.-->
-      <step>
-        <heading>jsp.submit.progressbar.describe</heading>
-        <processing-class>org.dspace.app.webui.submit.step.JSPDescribeStep</processing-class>
-        <review-jsp>/submit/review-metadata.jsp</review-jsp>
-        <workflow-editable>true</workflow-editable>
-      </step>
-          
-      <!--Step 3 will be to Upload the item-->
-      <step>
-        <heading>jsp.submit.progressbar.upload</heading>
-        <processing-class>org.dspace.app.webui.submit.step.JSPUploadStep</processing-class>
-        <review-jsp>/submit/review-upload.jsp</review-jsp>
-        <workflow-editable>true</workflow-editable>
-      </step>
-     
- 	  <!--Step 4 will be to Verify everything -->
- 	  <!--(this uses all the "review-jsp" tags set in the above steps to load the "Verify" page).-->
-      <step>
-        <heading>jsp.submit.progressbar.verify</heading>
-        <processing-class>org.dspace.app.webui.submit.step.JSPVerifyStep</processing-class>
-        <workflow-editable>true</workflow-editable>
-      </step>
-     
-      <!--Step 5 will be to Sign off on the License-->
-      <step>
-        <heading>jsp.submit.progressbar.license</heading>
-        <processing-class>org.dspace.app.webui.submit.step.JSPLicenseStep</processing-class>
-        <workflow-editable>false</workflow-editable>
-      </step>
-     
-   </submission-process>
-
- </submission-definitions>
-
-</item-submission>

Deleted: branches/dspace-1_5_x/dspace/config/item-submission-XMLUI.xml
===================================================================
--- branches/dspace-1_5_x/dspace/config/item-submission-XMLUI.xml	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace/config/item-submission-XMLUI.xml	2008-01-08 17:53:25 UTC (rev 2491)
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE item-submission SYSTEM "item-submission.dtd">
-
-<!-- XML-UI Configurable Submission configuration file  -->
-
-<!-- This XML configuration file allows you to configure the ordering     -->
-<!-- and number of the steps that occur in the Item Submission Process.   -->
-<item-submission>
-
- <!-- The process-map maps collection handles to a particular Item         -->
- <!-- Submission Process.  This requires that a collection's name be       -->
- <!-- unique, even within a community. DSpace does however insure that each-->
- <!-- collection's handle is unique.  Process-map provides the means to    -->
- <!-- associate a unique collection name with an Item Submission process.  -->
- <!-- The process-map also provides the special handle "default" (which is -->
- <!-- never a collection), here mapped to "traditional". Any collection    -->
- <!-- which does not appear in this map will be associated with the mapping-->
- <!-- for handle "default".                                                -->
- <submission-map>
-   <name-map collection-handle="default" submission-name="traditional" />
- </submission-map>
-
-
- 
- <!-- The 'step-definitions' allows you to define steps which you may wish -->
- <!-- to "share" amongst multiple submission-item definitions.  In order to-->
- <!-- share the same step definition, you can refer to it by its unique id -->
- <!-- defined in this section.  EVERY 'step' in this section MUST have a   -->
- <!-- unique identifier in the 'id' attribute!                             -->
- <!--                                                                      -->
- <!-- Each <step> REQUIRES the following attributes (@) and properties:    --> 
- <!-- @id       - The unique identifier for this step                      -->
- <!-- <processing-class> - The class which will process all information for-->
- <!--             this step. The class must extend the                     -->
- <!--             'org.dspace.submit.AbstractProcessingStep' class!        -->
- <!--             This property should reference the full path of the class-->
- <!--			  (e.g. org.dspace.submit.step.MyCustomStep)               -->
- <!--																	   -->
- <!-- The following properties are OPTIONAL for each <step>:			   -->
- <!-- <heading> -    References the message text (from the 				   -->
- <!--			     Messages.xml file) which will be used as this         -->
- <!--			     step's heading in the progress-bar.  If unspecified,  -->
- <!--			     the step does not show up in the Progress Bar.	       -->
- <!-- <xml-ui-class> - The class which acts as the XML-UI Transformer      -->
- <!--				 for this step.  This class must extend the            -->
- <!--				 'org.dspace.app.xmlui.submission.AbstractSubmissionStep'-->
- <!--				 class.  This class must generate the body of a valid  -->
- <!--                XML DRI document which can be transformed by Manakin. -->
- <!-- <workflow-editable> - whether or not this step will appear during the-->
- <!--				 "Edit Metadata" workflow approval process.  This field-->
- <!--				 defaults to TRUE (which means it can be edited during -->
- <!--				 the "Edit Metadata" workflow stage)				   -->
- <!--                                                                      -->
- <!--                                                                      -->
- <step-definitions>
-     <!-- The "collection" step is a "special step" which is *REQUIRED* to be-->
-     <!-- in this section!  In DSpace, all submitted items must be           -->
-     <!-- immediately assigned to a collection. This step ensures that a     -->
-     <!-- collection is always selected.  If a user is already submitting    -->
-     <!-- from within a Collection (by clicking the "Submit to This          -->
-     <!-- Collection" button) then this step will be automatically skipped.  -->
-     <!-- In all other cases, this step ensures that the user *first* selects-->
-     <!-- a collection!                                                      -->
-     <!-- Since this is a "special step", it is *automatically* added at the -->
-     <!-- beginning of each 'submission-process' (therefore it should not be -->
-     <!-- referenced by any of the below 'submission-process' tags).  Also as-->
-     <!-- a special step, it is currently NEVER editable in a workflow.      -->                              
-     <step id="collection">
-       <heading></heading> <!--can specify heading, if you want it to appear in Progress Bar-->
-       <processing-class>org.dspace.submit.step.SelectCollectionStep</processing-class>
-       <xml-ui-class>org.dspace.app.xmlui.aspect.submission.submit.SelectCollectionStep</xml-ui-class>
-       <workflow-editable>false</workflow-editable>
-     </step>
-     
-     <!-- The "complete" step is a "special step" which is *REQUIRED* to be  -->
-     <!-- in this section!  In DSpace, when a submission is completed,       -->
-     <!-- a workflow is automatically kicked off (if one exists)             -->
-     <!-- This "complete" step performs all backend processing that occurs   -->
-     <!-- immediately upon completing the submission.                        -->
-     <!-- Since this is a "special step", it is *automatically* added at the -->
-     <!-- end of each 'submission-process' (therefore it should not be       -->
-     <!-- referenced by any of the below 'submission-process' tags).  Also as-->
-     <!-- a special step, it is currently NEVER editable in a workflow.      -->                             
-     <step id="complete">
-       <heading>xmlui.Submission.general.progress.complete</heading>
-       <processing-class>org.dspace.submit.step.CompleteStep</processing-class>
-       <workflow-editable>false</workflow-editable>
-     </step>
-     
- </step-definitions>
-
- <!-- The submission-definitions map lays out the detailed definition of   -->
- <!-- all the Item Submission Processes (and the ordering of their steps). -->
- <!-- Each separate "submission-process" has a unique name as an attribute,-->
- <!-- which matches one of the names in the process-map. One named         -->
- <!-- "submit-process" has the name "traditional"; as this name suggests,  -->
- <!-- it is the default item submission process, which gets used when      -->
- <!-- the specified collection has no correspondingly named submit-process.-->
- <!--                                                                      -->
- <!-- Each submit-process contains an ordered set of steps; each step      -->
- <!-- defines one "step" occurring during the process of submitting an     -->
- <!-- item.  A step can either be reference by 'id' (in which case it must -->
- <!-- be defined in <step-definitions> above), or defined completely here. -->
- <!--                                                                      -->
- <!-- If the step is not referred to by 'id', then the <step> REQUIRES the -->
- <!-- following properties are defined:                                    --> 
- <!-- <processing-class> - The class which will process all information for-->
- <!--             this step. The class must extend the                     -->
- <!--             'org.dspace.submit.AbstractProcessingStep' class!        -->
- <!--             This property should reference the full path of the class-->
- <!--			  (e.g. org.dspace.submit.step.MyCustomStep)               -->
- <!--                                                                      -->
- <!-- The following properties are OPTIONAL for each <step>:			   -->
- <!-- <heading> -    References the message text (from the 				   -->
- <!--			     Messages.xml file) which will be used as this         -->
- <!--			     step's heading in the progress-bar.  If unspecified,  -->
- <!--			     the Step does not show up in the Progress Bar.	       -->
- <!-- <xml-ui-class> - The class which acts as the XML-UI Transformer      -->
- <!--				 for this step.  This class must extend the            -->
- <!--				 'org.dspace.app.xmlui.submission.AbstractSubmissionStep'-->
- <!--				 class.  This class must generate the body of a valid  -->
- <!--                XML DRI document which can be transformed by Manakin. -->
- <!-- <workflow-editable> - whether or not this step will appear during the-->
- <!--				 "Edit Metadata" workflow approval process.  This field-->
- <!--				 defaults to TRUE (which means it can be edited during -->
- <!--				 the "Edit Metadata" workflow stage).  Set to either   -->
- <!--				 "true" or "false".				                       -->
- <!--                                                                      -->
- <submission-definitions>
-   
-   <!--This "traditional" process defines the DEFAULT item submission process-->
-   <submission-process name="traditional">
-        
-     <!--Step 1 will be to gather initial information-->
-	  <step>
-	    <heading>xmlui.Submission.general.progress.initial-questions</heading>
-	    <processing-class>org.dspace.submit.step.InitialQuestionsStep</processing-class>
-	    <xml-ui-class>org.dspace.app.xmlui.aspect.submission.submit.InitialQuestionsStep</xml-ui-class>
-	    <workflow-editable>true</workflow-editable>
-	  </step>  
-          
-      <!--Step 2 will be to Describe the item.-->
-      <step>
-        <heading>xmlui.Submission.general.progress.describe</heading>
-        <processing-class>org.dspace.submit.step.DescribeStep</processing-class>
-        <xml-ui-class>org.dspace.app.xmlui.aspect.submission.submit.DescribeStep</xml-ui-class>
-        <workflow-editable>true</workflow-editable>
-      </step>
-          
-      <!--Step 3 will be to Upload the item-->
-      <step>
-        <heading>xmlui.Submission.general.progress.upload</heading>
-        <processing-class>org.dspace.submit.step.UploadStep</processing-class>
-        <xml-ui-class>org.dspace.app.xmlui.aspect.submission.submit.UploadStep</xml-ui-class>
-        <workflow-editable>true</workflow-editable>
-      </step>
-     
- 	  <!--Step 4 will be to Verify everything -->
- 	  <step>
- 	    <heading>xmlui.Submission.general.progress.review</heading>
-        <processing-class>org.dspace.submit.step.VerifyStep</processing-class>
- 	    <xml-ui-class>org.dspace.app.xmlui.aspect.submission.submit.ReviewStep</xml-ui-class>
-        <workflow-editable>true</workflow-editable>
-      </step>
-     
-      <!--Step 5 will be to Sign off on the License-->
-      <step>
-        <heading>xmlui.Submission.general.progress.license</heading>
-        <processing-class>org.dspace.submit.step.LicenseStep</processing-class>
-        <xml-ui-class>org.dspace.app.xmlui.aspect.submission.submit.LicenseStep</xml-ui-class>
-        <workflow-editable>false</workflow-editable>
-     </step>
-     
-   </submission-process>
-
- </submission-definitions>
-
-</item-submission>

Modified: branches/dspace-1_5_x/dspace/config/item-submission.dtd
===================================================================
--- branches/dspace-1_5_x/dspace/config/item-submission.dtd	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace/config/item-submission.dtd	2008-01-08 17:53:25 UTC (rev 2491)
@@ -23,8 +23,8 @@
  
  <!ELEMENT heading (#PCDATA) >
  <!ELEMENT processing-class (#PCDATA)>
- <!ELEMENT xml-ui-class (#PCDATA)>
- <!ELEMENT review-jsp (#PCDATA)>
+ <!ELEMENT jspui-binding (#PCDATA)>
+ <!ELEMENT xmlui-binding (#PCDATA)>
  <!ELEMENT workflow-editable (#PCDATA)>
  
  <!-- 'submission-definitions' must contain at least one       -->

Added: branches/dspace-1_5_x/dspace/config/item-submission.xml
===================================================================
--- branches/dspace-1_5_x/dspace/config/item-submission.xml	                        (rev 0)
+++ branches/dspace-1_5_x/dspace/config/item-submission.xml	2008-01-08 17:53:25 UTC (rev 2491)
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE item-submission SYSTEM "item-submission.dtd">
+
+<!-- Configurable Submission configuration file  -->
+
+<!-- This XML configuration file allows you to configure the ordering     -->
+<!-- and number of the steps that occur in the Item Submission Process.   -->
+<item-submission>
+
+ <!-- The process-map maps collection handles to a particular Item         -->
+ <!-- Submission Process.  This requires that a collection's name be       -->
+ <!-- unique, even within a community. DSpace does however insure that each-->
+ <!-- collection's handle is unique.  Process-map provides the means to    -->
+ <!-- associate a unique collection name with an Item Submission process.  -->
+ <!-- The process-map also provides the special handle "default" (which is -->
+ <!-- never a collection), here mapped to "traditional". Any collection    -->
+ <!-- which does not appear in this map will be associated with the mapping-->
+ <!-- for handle "default".                                                -->
+ <submission-map>
+   <name-map collection-handle="default" submission-name="traditional" />
+ </submission-map>
+
+
+ 
+ <!-- The 'step-definitions' allows you to define steps which you may wish -->
+ <!-- to "share" amongst multiple submission-item definitions.  In order to-->
+ <!-- share the same step definition, you can refer to it by its unique id -->
+ <!-- defined in this section.  EVERY 'step' in this section MUST have a   -->
+ <!-- unique identifier in the 'id' attribute!                             -->
+ <!--                                                                      -->
+ <!-- Each <step> REQUIRES the following attributes (@) and properties:    --> 
+ <!-- @id                - The unique identifier for this step             -->
+ <!-- 																	   -->
+ <!-- <processing-class> - The class which will process all information for-->
+ <!--             this step. The class must extend						   -->
+ <!--             'org.dspace.submit.AbstractProcessingStep'               -->
+ <!--             (or one of the org.dspace.submit.step.* classes)         -->
+ <!--             This property should reference the full path of the class-->
+ <!--			  (e.g. org.dspace.submit.step.MyCustomStep)               -->
+ <!--																	   -->
+ <!-- The following properties are OPTIONAL for each <step>:			   -->
+ <!-- <heading> -    References the message key, from the 				   -->
+ <!--			     Messages.properties file (JSP-UI) or messages.xml     -->
+ <!--                (XML-UI) which will be used as this step's heading in -->
+ <!--			     the progress-bar.  If unspecified, the step does not  -->
+ <!--			     show up in the Progress Bar.  Keys in the <heading>   -->
+ <!--				 are prefixed as follows in the appropriate 		   -->
+ <!--				 "messages" file:							           -->
+ <!--						XML-UI:  "xmlui.Submission." prefix			   -->
+ <!--						JSP-UI:  "jsp." prefix			   			   -->
+ <!-- <jspui-binding> - JSP-UI binding step class which will generate the JSP-->
+ <!--                 based user interface for this step.  The class must  -->
+ <!--                 extend 'org.dspace.app.webui.submit.JSPStep'.        -->
+ <!--                 This property should reference the full path of the  -->
+ <!--                 class.  It is only necessary if you are using the    -->
+ <!--                 DSpace JSP-UI, and the step requires user interaction-->
+ <!-- <xmlui-binding> - XML-UI binding step class which will generate the  -->
+ <!--                 Manakin XML (DRI) structure for this step.  The class-->
+ <!--                 must extend                                          -->
+ <!--                 'org.dspace.app.xmlui.aspect.submission.StepTransformer'.-->
+ <!--                 This property should reference the full path of the  -->
+ <!--                 class.  It is only necessary if you are using the    -->
+ <!--                 DSpace XML-UI, and the step requires user interaction-->
+ <!-- <workflow-editable> - whether or not this step will appear during the-->
+ <!--				 "Edit Metadata" workflow approval process.  This field-->
+ <!--				 defaults to TRUE (which means it can be edited during -->
+ <!--				 the "Edit Metadata" workflow stage)				   -->
+ <!--                                                                      -->
+ <!--                                                                      -->
+ <step-definitions>
+     <!-- The "collection" step is a "special step" which is *REQUIRED* to be-->
+     <!-- in this section!  In DSpace, all submitted items must be           -->
+     <!-- immediately assigned to a collection. This step ensures that a     -->
+     <!-- collection is always selected.  If a user is already submitting    -->
+     <!-- from within a Collection (by clicking the "Submit to This          -->
+     <!-- Collection" button) then this step will be automatically skipped.  -->
+     <!-- In all other cases, this step ensures that the user *first* selects-->
+     <!-- a collection!                                                      -->
+     <!-- Since this is a "special step", it is *automatically* added at the -->
+     <!-- beginning of each 'submission-process' (therefore it should not be -->
+     <!-- referenced by any of the below 'submission-process' tags).  Also as-->
+     <!-- a special step, it is currently NEVER editable in a workflow.      -->                              
+     <step id="collection">
+       <heading></heading> <!--can specify heading, if you want it to appear in Progress Bar-->
+	   <processing-class>org.dspace.submit.step.SelectCollectionStep</processing-class>
+       <jspui-binding>org.dspace.app.webui.submit.step.JSPSelectCollectionStep</jspui-binding>
+       <xmlui-binding>org.dspace.app.xmlui.aspect.submission.submit.SelectCollectionStep</xmlui-binding>
+       <workflow-editable>false</workflow-editable>
+     </step>
+   
+     <!-- The "complete" step is a "special step" which is *REQUIRED* to be-->
+     <!-- in this section!  In DSpace, when a submission is completed,       -->
+     <!-- a workflow is automatically kicked off (if one exists)             -->
+     <!-- This "complete" step performs all backend processing that occurs   -->
+     <!-- immediately upon completing the submission.                        -->
+     <!-- Since this is a "special step", it is *automatically* added at the -->
+     <!-- end of each 'submission-process' (therefore it should not be       -->
+     <!-- referenced by any of the below 'submission-process' tags).  Also as-->
+     <!-- a special step, it is currently NEVER editable in a workflow.      -->                               
+     <step id="complete">
+       <heading>submit.progressbar.complete</heading>
+       <processing-class>org.dspace.submit.step.CompleteStep</processing-class>
+       <jspui-binding>org.dspace.app.webui.submit.step.JSPCompleteStep</jspui-binding>
+       <workflow-editable>false</workflow-editable>
+     </step>
+   
+     <!-- This is the Sample Step which utilizes the JSPSampleStep class-->
+     <step id="sample">
+       <heading>Sample</heading>
+       <processing-class>org.dspace.submit.step.SampleStep</processing-class>
+       <jspui-binding>org.dspace.app.webui.submit.step.JSPSampleStep</jspui-binding>
+       <workflow-editable>true</workflow-editable>
+     </step>
+ </step-definitions>
+
+ <!-- The submission-definitions map lays out the detailed definition of   -->
+ <!-- all the Item Submission Processes (and the ordering of their steps). -->
+ <!-- Each separate "submission-process" has a unique name as an attribute,-->
+ <!-- which matches one of the names in the process-map. One named         -->
+ <!-- "submit-process" has the name "traditional"; as this name suggests,  -->
+ <!-- it is the default item submission process, which gets used when      -->
+ <!-- the specified collection has no correspondingly named submit-process.-->
+ <!--                                                                      -->
+ <!-- Each submit-process contains an ordered set of steps; each step      -->
+ <!-- defines one "step" occurring during the process of submitting an     -->
+ <!-- item.  A step can either be reference by 'id' (in which case it must -->
+ <!-- be defined in <step-definitions> above), or defined completely here. -->
+ <!--                                                                      -->
+ <!-- If the step is not referred to by 'id', then the <step> REQUIRES the -->
+ <!-- following properties are defined:                                    --> 
+ <!-- <processing-class> - The class which will process all information for-->
+ <!--             this step. The class must implement the                  -->
+ <!--             'org.dspace.app.webui.submit.JSPStep' interface AND      -->
+ <!--             extend 'org.dspace.submit.AbstractProcessingStep'        -->
+ <!--             (or one of the org.dspace.submit.step.* classes)         -->
+ <!--             This property should reference the full path of the class-->
+ <!--			  (e.g. org.dspace.app.webui.submit.MyCustomJSPStep)       -->
+ <!--                                                                      -->
+ <!-- The following properties are OPTIONAL for each <step>:			   -->
+ <!-- <heading> -    References the message key, from the 				   -->
+ <!--			     Messages.properties file (JSP-UI) or messages.xml     -->
+ <!--                (XML-UI) which will be used as this step's heading in -->
+ <!--			     the progress-bar.  If unspecified, the step does not  -->
+ <!--			     show up in the Progress Bar.  Keys in the <heading>   -->
+ <!--				 are prefixed as follows in the appropriate 		   -->
+ <!--				 "messages" file:							           -->
+ <!--						XML-UI:  "xmlui.Submission." prefix			   -->
+ <!--						JSP-UI:  "jsp." prefix			   			   -->
+ <!-- <jspui-binding> - JSP-UI binding step class which will generate the JSP-->
+ <!--                 based user interface for this step.  The class must  -->
+ <!--                 extend 'org.dspace.app.webui.submit.JSPStep'.        -->
+ <!--                 This property should reference the full path of the  -->
+ <!--                 class.  It is only necessary if you are using the    -->
+ <!--                 DSpace JSP-UI, and the step requires user interaction-->
+ <!-- <xmlui-binding> - XML-UI binding step class which will generate the  -->
+ <!--                 Manakin XML (DRI) structure for this step.  The class-->
+ <!--                 must extend                                          -->
+ <!--                 'org.dspace.app.xmlui.aspect.submission.StepTransformer'.-->
+ <!--                 This property should reference the full path of the  -->
+ <!--                 class.  It is only necessary if you are using the    -->
+ <!--                 DSpace XML-UI, and the step requires user interaction-->
+ <!-- <workflow-editable> - whether or not this step will appear during the-->
+ <!--				 "Edit Metadata" workflow approval process.  This field-->
+ <!--				 defaults to TRUE (which means it can be edited during -->
+ <!--				 the "Edit Metadata" workflow stage).  Set to either   -->
+ <!--				 "true" or "false".				                       -->
+ <!--                                                                      -->
+ <submission-definitions>
+   
+   <!--This "traditional" process defines the DEFAULT item submission process-->
+   <submission-process name="traditional">
+     
+     <!--Uncommment to display the SAMPLE step as your first step-->
+     <!--<step id="sample"/>-->
+          
+     <!--Step 1 will be to gather initial information-->
+	  <step>
+	    <heading>submit.progressbar.initial-questions</heading>
+		<processing-class>org.dspace.submit.step.InitialQuestionsStep</processing-class>
+		<jspui-binding>org.dspace.app.webui.submit.step.JSPInitialQuestionsStep</jspui-binding>   	    
+		<xmlui-binding>org.dspace.app.xmlui.aspect.submission.submit.InitialQuestionsStep</xmlui-binding>
+	    <workflow-editable>true</workflow-editable>
+	  </step>  
+          
+      <!--Step 2 will be to Describe the item.-->
+      <step>
+        <heading>submit.progressbar.describe</heading>
+        <processing-class>org.dspace.submit.step.DescribeStep</processing-class>
+        <jspui-binding>org.dspace.app.webui.submit.step.JSPDescribeStep</jspui-binding>
+		<xmlui-binding>org.dspace.app.xmlui.aspect.submission.submit.DescribeStep</xmlui-binding>
+        <workflow-editable>true</workflow-editable>
+      </step>
+          
+      <!--Step 3 will be to Upload the item-->
+      <step>
+        <heading>submit.progressbar.upload</heading>
+        <processing-class>org.dspace.submit.step.UploadStep</processing-class>
+        <jspui-binding>org.dspace.app.webui.submit.step.JSPUploadStep</jspui-binding>
+		<xmlui-binding>org.dspace.app.xmlui.aspect.submission.submit.UploadStep</xmlui-binding>
+        <workflow-editable>true</workflow-editable>
+      </step>
+     
+ 	  <!--Step 4 will be to Verify/Review everything -->
+ 	  <step>
+        <heading>submit.progressbar.verify</heading>
+        <processing-class>org.dspace.submit.step.VerifyStep</processing-class>
+ 	    <jspui-binding>org.dspace.app.webui.submit.step.JSPVerifyStep</jspui-binding>
+		<xmlui-binding>org.dspace.app.xmlui.aspect.submission.submit.ReviewStep</xmlui-binding>
+		<workflow-editable>true</workflow-editable>
+      </step>
+     
+      <!--Step 5 will be to Sign off on the License-->
+      <step>
+        <heading>submit.progressbar.license</heading>
+        <processing-class>org.dspace.submit.step.LicenseStep</processing-class>
+        <jspui-binding>org.dspace.app.webui.submit.step.JSPLicenseStep</jspui-binding>
+		<xmlui-binding>org.dspace.app.xmlui.aspect.submission.submit.LicenseStep</xmlui-binding>
+		<workflow-editable>false</workflow-editable>
+      </step>
+     
+   </submission-process>
+
+ </submission-definitions>
+
+</item-submission>


Property changes on: branches/dspace-1_5_x/dspace/config/item-submission.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: branches/dspace-1_5_x/dspace/docs/submission.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/submission.html	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace/docs/submission.html	2008-01-08 17:53:25 UTC (rev 2491)
@@ -31,21 +31,11 @@
   <a name="configurationFile" id="configurationFile"></a>
   <H2>Understanding the Submission Configuration File</H2>
   
-  <p><em>PLEASE NOTE:  There are separate submission configuration files based on whether
-  you plan to use the DSpace JSP User Interface (JSP-UI) or the DSpace XML User Interface (XML-UI, aka. Manakin)</em>
-  <ul>
-  	<li><code><i>[dspace]</i>/config/item-submission-JSPUI.xml</code> - This is the JSP-UI configuration file</li>
-	<li><code><i>[dspace]</i>/config/item-submission-XMLUI.xml</code> - This is the XML-UI configuration file</li>
-  </ul>
+  <p>The <code>[dspace]/config/item-submission.xml</code> contains the submission configurations for <em>both</em> 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,
+  which should help you better understand how to best utilize it.
   </p>
   
-  <p>DSpace will automatically know which <code>item-submission.xml</code> to utilize based on the DSpace user interface being used.
-  <em>However, should you wish to make configuration changes, you must make sure to do so in the correct <code>item-submission.xml</code> 
-  file based on the DSpace user interface you are using!</em></p>
-  
-  <p>Each of the <code>item-submission.xml</code> configuration files contains detailed documentation within the file itself,
-  which should help you better undertand how to best utilize it.</p>
-  
   <H3>The Structure of <CODE>item-submission.xml</CODE></H3>
   <pre><code>
   	&lt;item-submission&gt;
@@ -91,14 +81,14 @@
   <a name="#stepDefinitions" id="#stepDefinitions"></a>
   <H3>Defining Steps (<code>&lt;step&gt;</code>) within the <CODE>item-submission.xml</CODE></H3>
   
-  <p>This section decribes how Steps of the Submission Process are defined within the <CODE>item-submission.xml</CODE>.</p>
+  <p>This section describes how Steps of the Submission Process are defined within the <CODE>item-submission.xml</CODE>.</p>
   
   <H4>Where to place your <code>&lt;step&gt;</code> definitions</H4>
   <p><code>&lt;step&gt;</code> definitions can appear in one of two places within the <CODE>item-submission.xml</CODE> configuration file.
   		<ol>
   		<li>Within the <code>&lt;step-definitions&gt;</code> section
   			<ul>
-  			  	<li>This is for globally definied <code>&lt;step&gt;</code> definitions 
+  			  	<li>This is for globally defined <code>&lt;step&gt;</code> definitions 
   			  	(i.e. steps which are used in multiple <code>&lt;submission-process&gt;</code>
   			  	 definitions).  Steps defined in this section <strong>must</strong> define
   			  	 a unique <code>id</code> which can be used to reference this step.</li>
@@ -136,30 +126,32 @@
   in which those steps will appear!</p>
   
   <p>For example, the following defines a Submission Process where the
-  <em>License</em> step directly precedes the <em>Describe</em> step 
+  <em>License</em> step directly precedes the <em>Initial Questions</em> step 
   (more information about the structure of the information under each &lt;step&gt;
    tag can be found in the section on <a href="#stepStructure">Structure of the &lt;step&gt; Definition</a> below):
   </p>
   
-  <p><em>(PLEASE NOTE: This example uses some syntax that is specific to the DSpace JSP user interface.)</em>
-  
   <pre><code>
 &lt;submission-process&gt;   			  	
       <em>&lt;!--Step 1 will be to Sign off on the License--&gt;</em>
       &lt;step&gt;
-        &lt;heading&gt;jsp.submit.progressbar.license&lt;/heading&gt;
-        &lt;processing-class&gt;org.dspace.app.webui.submit.step.JSPLicenseStep&lt;/processing-class&gt;
+        &lt;heading&gt;submit.progressbar.license&lt;/heading&gt;
+        &lt;processing-class&gt;org.dspace.submit.step.LicenseStep&lt;/processing-class&gt;
+        &lt;jspui-binding&gt;org.dspace.app.webui.submit.step.JSPLicenseStep&lt;/jspui-binding&gt;
+        &lt;xmlui-binding&gt;org.dspace.app.xmlui.aspect.submission.submit.LicenseStep&lt;/xmlui-binding&gt;
         &lt;workflow-editable&gt;false&lt;/workflow-editable&gt;
       &lt;/step&gt;
       
-      <em>&lt;!--Step 2 will be to Describe the Item--&gt;</em>
+      <em>&lt;!--Step 2 will be to Ask Initial Questions--&gt;</em>
       &lt;step&gt;
-        &lt;heading&gt;jsp.submit.progressbar.describe&lt;/heading&gt;
-        &lt;processing-class&gt;org.dspace.app.webui.submit.step.JSPDescribeStep&lt;/processing-class&gt;
-        &lt;review-jsp&gt;/submit/review-metadata.jsp&lt;/review-jsp&gt;
+        &lt;heading&gt;submit.progressbar.initial-questions&lt;/heading&gt;
+        &lt;processing-class&gt;org.dspace.submit.step.InitialQuestionsStep&lt;/processing-class&gt;
+        &lt;jspui-binding&gt;org.dspace.app.webui.submit.step.JSPInitialQuestionsStep&lt;/jspui-binding&gt;  	    
+        &lt;xmlui-binding&gt;org.dspace.app.xmlui.aspect.submission.submit.InitialQuestionsStep&lt;/xmlui-binding&gt;
         &lt;workflow-editable&gt;true&lt;/workflow-editable&gt;
       &lt;/step&gt;
-      ...
+      
+      ...[other steps]...
 &lt;/submission-process&gt; 
 	 </code></pre>
   </p>
@@ -167,109 +159,66 @@
   <a name="stepStructure" id="stepStructure"></a>
   <H4>Structure of the &lt;step&gt; Definition</H4>
   
-  <p>The actual structure of the &lt;step&gt; definition differs slightly, based on whether
-  you are using the DSpace JSP user interface (JSP-UI) or the DSpace XML user interface
-  (XML-UI or Manakin).  Unfortunately the same structure cannot be shared between
-  these user interfaces, since they each use different manners of generating the user interface.</p>
-  <ul>
-    <li><a href="#stepStructureJSP">Structure of the &lt;step&gt; Definition for the JSP User Interface</a></li>
-    <li><a href="#stepStructureXML">Structure of the &lt;step&gt; Definition for the XML User Interface (Manakin)</a></li>
-  </ul>
+  <p>The same &lt;step&gt; 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 &lt;step&gt; definition contains information
+  specific to each of these two interfaces.</p>
   
-  <a name="stepStructureJSP" id="stepStructureJSP"></a>
-  <H5>Structure of the &lt;step&gt; Definition for the JSP User Interface</H5>
-  
-  <p>The structure of the &lt;step&gt; Definition for the JSP UI is as follows:
+  <p>The structure of the &lt;step&gt; Definition is as follows:
   <pre><code>  
      &lt;step&gt;
-        &lt;heading&gt;jsp.submit.progressbar.describe&lt;/heading&gt;
-        &lt;processing-class&gt;org.dspace.app.webui.submit.step.JSPDescribeStep&lt;/processing-class&gt;
-        &lt;review-jsp&gt;/submit/review-metadata.jsp&lt;/review-jsp&gt;
+     	&lt;heading&gt;submit.progressbar.describe&lt;/heading&gt;
+        &lt;processing-class&gt;org.dspace.submit.step.DescribeStep&lt;/processing-class&gt;
+        &lt;jspui-binding&gt;org.dspace.app.webui.submit.step.JSPDescribeStep&lt;/jspui-binding&gt;
+        &lt;xmlui-binding&gt;org.dspace.app.xmlui.aspect.submission.submit.DescribeStep&lt;/xmlui-binding&gt;
         &lt;workflow-editable&gt;true&lt;/workflow-editable&gt;
-      &lt;/step&gt;
+     &lt;/step&gt;
   </code></pre>    
   </p>
   
-  <P>Each <CODE>step</CODE> contains the following elements, for the JSP UI. The required elements are so marked:</P>
+  <P>Each <CODE>step</CODE> contains the following elements. The required elements are so marked:</P>
 
   <DL>
     <DT><STRONG><CODE>heading</CODE></STRONG></DT>
 
-    <DD>Full I18N key (defined in <code>Messages.properties</code>) which corresponds to
-        the text that should be displayed in the Submission Progress Bar for this step.
-        <em>This need not be defined, if the step should not appear in the progress bar
-        (e.g. steps which are automatic and require no user interaction should not appear
-		in the progress bar).</em></DD>
+    <DD>Partial I18N key (defined in <code>Messages.properties</code> for JSP-UI or <code>messages.xml</code> for XML-UI) 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:
+        <ul>
+        	<li>XML-UI: prefix is <code>xmlui.Submission.</code> (e.g. "xmlui.Submission.submit.progressbar.describe" for 'Describe' step)</li>
+        	<li>JSP-UI: prefix is <code>jsp.</code> (e.g. "jsp.submit.progressbar.describe" for 'Describe' step)</li>
+        </ul>
+        <em>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
+		in the progress bar).</em>
+		</DD>
 
     <DT><STRONG><CODE>processing-class</CODE></STRONG> <EM>(Required)</EM></DT>
 
-    <DD>Full Java path to the JSP Processing Class for this Step. 
-    All valid JSP step processing classes must implement the interface 
-	`<code>org.dspace.app.webui.submit.JSPStep</code>` <strong>AND</strong>
-	extend the abstract `<code>org.dspace.submit.AbstractProcessingStep</code>` class
-    (or alternatively, extend one of the existing step processing classes in 
+    <DD>Full Java path to the Processing Class for this Step.  This Processing Class
+    <em>must</em> perform the primary processing of any information gathered in this step, <em>for both the XML-UI and JSP-UI</em>.
+    All valid step processing classes must extend the abstract `<code>org.dspace.submit.AbstractProcessingStep</code>` class
+    (or alternatively, extend one of the pre-existing step processing classes in 
 	<code>org.dspace.submit.step.*</code>)</DD>
 
-    <DT><STRONG><CODE>review-jsp</CODE></STRONG></DT>
+    <DT><STRONG><CODE>jspui-binding</CODE></STRONG></DT>
 
-    <DD>The relative path to the JSP which displays a read-only version
-    of the information gathered during this step.  This JSP should be very
-    simplistic in its form (most just display a simple table listing all
-    gathered information).  For examples, see the JSPs beginning with <code>review-</code>
-    that exist within the <code>/jsp/submit</code> directory of DSpace.
-	<em>This need not be defined if the step has no information that should be later reviewed 
-	(e.g. The License step doesn't need a review JSP as the act of
-	agreeing to a submission license is not considered reviewable)</em></DD>
-  
-    <DT><STRONG><CODE>workflow-editable</CODE></STRONG></DT>
+    <DD>Full Java path of the JSP-UI "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 <em>must</em> extend the abstract `<code>org.dspace.app.webui.submit.JSPStep</code>` class.
+    <em>This property need not be defined if you are using the XML-UI interface, or for steps which
+    only perform automated processing, i.e. non-interactive steps.</em>
+    </DD>
+    
+    <DT><STRONG><CODE>xmlui-binding</CODE></STRONG></DT>
 
-    <DD>Defines whether or not this step can be edited during the <em>Edit Metadata</em>
-    process with the DSpace approval/rejection workflow process. Possible values include <code>true</code>
-    and <code>false</code>.  If undefined, defaults to <code>true</code> (which
-    means that workflow reviewers would be allowed to edit information gathered
-    during that step).</DD>
-  </DL>
+    <DD>Full Java path of the XML-UI "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 <em>must</em> extend the abstract `<code>org.dspace.app.xmlui.submission.AbstractSubmissionStep</code>` class.
+    <em>This property need not be defined if you are using the JSP-UI interface, or for steps which
+    only perform automated processing, i.e. non-interactive steps.</em>
+    </DD>
   
-  <a name="stepStructureXML" id="stepStructureXML"></a>
-  <H5>Structure of the &lt;step&gt; Definition for the XML User Interface (Manakin)</H5>
-  
-  <p>The structure of the &lt;step&gt; Definition for the XML UI is as follows:
-  <pre><code>  
-     &lt;step&gt;
-        &lt;heading&gt;jsp.submit.progressbar.describe&lt;/heading&gt;
-        &lt;processing-class&gt;org.dspace.submit.step.DescribeStep&lt;/processing-class&gt;
-        &lt;xml-ui-class&gt;org.dspace.app.xmlui.submission.submit.DescribeStep&lt;/xml-ui-class&gt;
-        &lt;workflow-editable&gt;true&lt;/workflow-editable&gt;
-      &lt;/step&gt;
-  </code></pre>    
-  </p>
-  
-  <P>Each <CODE>step</CODE> contains the following elements, for the XML UI. The required elements are so marked:</P>
-
-  <DL>
-    <DT><STRONG><CODE>heading</CODE></STRONG></DT>
-
-    <DD>Full I18N key (defined in Manakin's <code>config/i18n/messages.xml</code>) which corresponds to
-        the text that should be displayed in the Submission Progress Bar for this step.
-        <em>This need not be defined, if the step should not appear in the progress bar
-        (e.g. steps which are automatic and require no user interaction should not appear
-		in the progress bar).</em></DD>
-
-    <DT><STRONG><CODE>processing-class</CODE></STRONG> <EM>(Required)</EM></DT>
-
-    <DD>Full Java path to the Processing Class for this Step. 
-    All step processing classes must extend the abstract `<code>org.dspace.submit.AbstractProcessingStep</code>` class,
-    and implement all necessary methods in that class.</DD>
-
-    <DT><STRONG><CODE>xml-ui-class</CODE></STRONG></DT>
-
-    <DD>Full Java path to the XML UI Transformer Class for this Step.
-    The Transformer class is responsible for generating the XML structure
-    which Manakin is able to understand (called DRI: Digital Repository Interface).
-    This class must extend the abstract `<code>org.dspace.app.xmlui.submission.AbstractSubmissionStep</code>` class,
-    and implement all necessary methods in that class.
-	<em>Note: This need not be defined if the step is automated and requires no user interaction (i.e. requires no user interface)</em></DD>
-  
     <DT><STRONG><CODE>workflow-editable</CODE></STRONG></DT>
 
     <DD>Defines whether or not this step can be edited during the <em>Edit Metadata</em>
@@ -279,7 +228,6 @@
     during that step).</DD>
   </DL>
   
-  
   <a name="stepOrdering" id="stepOrdering"></a>
   <H2>Reordering/Removing Submission Steps</H2>
   
@@ -677,7 +625,7 @@
   <a name="createStep" id="createStep"></a>
   <H2>Creating new Submission Steps</H2>
   
-  <P>First, a warning: <em>Creating a new Submission Step requires some Java knowledge, 
+  <P>First, a brief warning: <em>Creating a new Submission Step requires some Java knowledge, 
   and is therefore recommended to be undertaken by a Java programmer whenever possible</em></P>
   
   <P>That being said, at a higher level, creating a new Submission Step
@@ -686,51 +634,38 @@
   <ol>
   	<li>(<strong>Required</strong>) Create a new Step Processing class
   		<ul>
-  		<li><strong>For JSP-UI only:</strong> If you need to create a step which <em>only</em> 
-		works with the JSP UI, 
-		then your step processing class <strong>must</strong> implement
-		the interface <code>org.dspace.app.webui.submit.JSPStep</code>
-		<strong>AND</strong> extend the abstract
-  		<code>org.dspace.submit.AbstractProcessingStep</code> class.</li>
-  		<li><strong>For XML-UI only:</strong> If you wish to create a step which <em>only</em> 
-		works with the Manakin UI, you just need to extend and
-  		implement all necessary methods within the abstract
-  		<code>org.dspace.submit.AbstractProcessingStep</code> class.</li>
-		<li><strong>Both JSP-UI and XML-UI:</strong> If you wish to create a step which works
-		with either interface, you just need to create two classes:
-			<ol>
-				<li>First, a generic processing class which extends the
-				<code>org.dspace.submit.AbstractProcessingStep</code> class, which
-				will perform the backend processing for <strong>both</strong> the
-				JSP-UI and the XML-UI.
-				</li>
-				<li>Second, you need to create a JSP-specific processing class
-				which will implement the interface 
-				<code>org.dspace.app.webui.submit.JSPStep</code>, and extends the
-				generic processing class you just created in #1 above.</li>
-			</ol>
-  		</li>
+  		<li>This class <strong>must</strong> extend the abstract
+  		<code>org.dspace.submit.AbstractProcessingStep</code> class and
+  		implement all methods defined by that abstract class.</li>
+  		<li>This class should be built in such a way that it can process the
+  		input gathered from <em>either</em> the XML-UI or JSP-UI interface.</li>
   		</ul>
   	</li>
-  	<li>(<em>For JSP UI Steps only</em>) Create the JSPs to display
-  	the user interface (<em>only necessary if your step requires user interaction</em>).
+  	<li>(<em>For steps using JSP-UI</em>) Create the JSPs to display
+  	the user interface.  Create a new JSP-UI "binding" class to initialize
+  	and call these JSPs.</li>
   		<ul>
-  		<li>Any JSPs created should be loaded by the Step Processing
-  		class by using one of the showJSP() method</li>
+  		<li>Your JSP-UI "binding" class must extend the abstract class <code>org.dspace.app.webui.submit.JSPStep</code>
+  		and implement all methods defined there.  It's recommended to use one
+  		of the classes in <code>org.dspace.app.webui.submit.step.*</code> as a reference.</li>
+  		<li>Any JSPs created should be loaded by calling the showJSP() method of
+  		the <code>org.dspace.app.webui.submit.JSPStepManager</code> class</li>
   		<li>If this step gathers information to be reviewed, you must
   		also create a Review JSP which will display a read-only view of
-  		all data gathered during this step.  You will find examples
+  		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 <code>review-<em>[step]</em>.jsp</code>) in the
   		<code><em>[dspace-source]</em>/jsp/submit</code> directory.</li>
   		</ul>
  	</li>
- 	<li>(<em>For XML UI Steps only</em>)  Create a Step Transformer
- 	which will generate the DRI XML which Manakin requires
- 	(<em>only necessary if your step requires user interaction</em>).
+ 	<li>(<em>For steps using XML-UI</em>)  Create an XML-UI "binding" Step Transformer
+ 	which will generate the DRI XML which Manakin requires.
   		<ul>
   		<li>The Step Transformer must extend and implement
-  		all necessary methods within the abstract
-  		<code>org.dspace.app.xmlui.submission.AbstractSubmissionStep</code> class.</li>
+  		all necessary methods within the abstract class 
+  		<code>org.dspace.app.xmlui.submission.AbstractSubmissionStep</code></li>
+  		<li>It is useful to use the existing classes in 
+  		<code>org.dspace.app.xmlui.submission.submit.*</code> as references</li>
   		</ul>
  	</li>
   	<li>(<strong>Required</strong>) Add a valid Step Definition to the <code>item-submission.xml</code> configuration file.
@@ -747,6 +682,37 @@
   	</li>
  </ol>
   
+  <a name="createStep" id="createStep"></a>
+  <H3>Creating a Non-Interactive Step</H3>
+  
+  <p>
+  Non-interactive steps are ones that have no user interface and only perform backend processing.
+  You may find a need to create non-interactive steps which perform further processing of previously entered information.
+  </p>
+  
+  <p>To create a non-interactive step, do the following:
+  <ol>
+  	<li>Create the required Step Processing class, which extends the abstract
+  		<code>org.dspace.submit.AbstractProcessingStep</code> class.  In this class
+  		add any processing which this step will perform.</li>
+    <li>Add your non-interactive step to your <code>item-submission.xml</code> at
+        the place where you wish this step to be called during the submission process.
+        For example, if you want it to be called <em>immediately after</em> the
+        existing 'Upload File' step, then place its configuration immediately after
+        the configuration for that 'Upload File' step.  The configuration should look
+  		similar to the following:<pre><code>&lt;step&gt;
+   &lt;processing-class&gt;org.dspace.submit.step.MyNonInteractveStep&lt;/processing-class&gt;
+   &lt;workflow-editable&gt;false&lt;/workflow-editable&gt;
+&lt;/step&gt;</code></pre>
+  	</li>
+  </ol>
+  </p>
+  <p>
+  Note: Non-interactive steps will not appear in the Progress Bar!  Therefore,
+  	your submitters will not even know they are there.  However, because they are not
+  	visible to your users, you should make sure that your non-interactive step does not
+  	take a large amount of time to finish its processing and return control to the next step 
+  	(otherwise there will be a visible time delay in the user interface).</p>
  
   <HR>
 

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfig.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfig.java	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfig.java	2008-01-08 17:53:25 UTC (rev 2491)
@@ -48,7 +48,7 @@
 /**
  * Class representing a single Item Submission config definition, organized into
  * steps. This class represents the structure of a single 'submission-process'
- * node in the item-submission-[UI Name].xml configuration file.
+ * node in the item-submission.xml configuration file.
  * 
  * @see org.dspace.app.util.SubmissionConfigReader
  * @see org.dspace.app.util.SubmissionStepConfig
@@ -73,7 +73,7 @@
 
     /**
      * Constructs a new Submission Configuration object, based on the XML
-     * configuration file (item-submission-[UI Name].xml)
+     * configuration file (item-submission.xml)
      * 
      * @param submissionName
      *            the submission process name

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfigReader.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfigReader.java	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfigReader.java	2008-01-08 17:53:25 UTC (rev 2491)
@@ -56,7 +56,7 @@
 
 /**
  * Item Submission configuration generator for DSpace. Reads and parses the
- * installed submission process configuration file, item-submission-[UI name].xml, from
+ * installed submission process configuration file, item-submission.xml, from
  * the configuration directory. This submission process definiton details the
  * ordering of the steps (and number of steps) that occur during the Item
  * Submission Process. There may be multiple Item Submission processes defined,
@@ -96,9 +96,6 @@
     private String configDir = ConfigurationManager.getProperty("dspace.dir")
             + File.separator + "config" + File.separator;
             
-    /** Name of the User Interface which this Submission Configuration corresponds to */
-    private String UIName;
-    
     /**
      * Hashmap which stores which submission process configuration is used by
      * which collection, computed from the item submission config file
@@ -125,28 +122,13 @@
     private SubmissionConfig lastSubmissionConfig = null;
 
     /**
-     * Default Constructor - PRIVATE
+     * Load Submission Configuration from the
+     * item-submission.xml configuration file 
      */
-    private SubmissionConfigReader()
+    public SubmissionConfigReader() throws ServletException
     {
+        buildInputs(configDir + SUBMIT_DEF_FILE_PREFIX + SUBMIT_DEF_FILE_SUFFIX);
     }
-    
-    /**
-     * Load Submission Configuration for a specific user interface(UI).
-     * The submission configuration file name is formatted as follows:
-     * item-submission-UIName.xml
-     * <P>
-     * E.g. for a value of "XMLUI", uses the config file named
-     * item-submission-XMLUI.xml
-     * 
-     * @param UIName
-     * 			the name of the UI to load the Submission configuration for
-     */
-    public SubmissionConfigReader(String UIName) throws ServletException
-    {
-        this.UIName = UIName;
-        buildInputs(configDir + SUBMIT_DEF_FILE_PREFIX + "-" + UIName + SUBMIT_DEF_FILE_SUFFIX);
-    }
 
     /**
      * Parse an XML encoded item submission configuration file.
@@ -218,7 +200,7 @@
         if (submitName == null)
         {
             throw new ServletException(
-                    "No item submission process configuration designated as 'default' in 'submission-map' section of 'item-submission-" + getUIName() + ".xml'.");
+                    "No item submission process configuration designated as 'default' in 'submission-map' section of 'item-submission.xml'.");
         }
 
         log.debug("Loading submission process config named '" + submitName
@@ -242,7 +224,7 @@
         {
             throw new ServletException(
                     "Missing the Item Submission process config '" + submitName
-                            + "' (or unable to load) from 'item-submission-" + getUIName() + ".xml'.");
+                            + "' (or unable to load) from 'item-submission.xml'.");
         }
 
         log.debug("Submission process config '" + submitName
@@ -332,16 +314,16 @@
         if (!foundMap)
         {
             throw new ServletException(
-                    "No collection to item submission map ('submission-map') found in 'item-submission-" + getUIName() + ".xml'");
+                    "No collection to item submission map ('submission-map') found in 'item-submission.xml'");
         }
         if (!foundStepDefs)
         {
-            throw new ServletException("No 'step-definitions' section found in 'item-submission-" + getUIName() + ".xml'");
+            throw new ServletException("No 'step-definitions' section found in 'item-submission.xml'");
         }
         if (!foundSubmitDefs)
         {
             throw new ServletException(
-                    "No 'submission-definitions' section found in 'item-submission-" + getUIName() + ".xml'");
+                    "No 'submission-definitions' section found in 'item-submission.xml'");
         }
     }
 
@@ -366,17 +348,17 @@
                 if (id == null)
                 {
                     throw new SAXException(
-                            "name-map element is missing collection-handle attribute in 'item-submission-" + getUIName() + ".xml'");
+                            "name-map element is missing collection-handle attribute in 'item-submission.xml'");
                 }
                 if (value == null)
                 {
                     throw new SAXException(
-                            "name-map element is missing submission-name attribute in 'item-submission-" + getUIName() + ".xml'");
+                            "name-map element is missing submission-name attribute in 'item-submission.xml'");
                 }
                 if (content != null && content.length() > 0)
                 {
                     throw new SAXException(
-                            "name-map element has content in 'item-submission-" + getUIName() + ".xml', it should be empty.");
+                            "name-map element has content in 'item-submission.xml', it should be empty.");
                 }
                 collectionToSubmissionConfig.put(id, value);
             } // ignore any child node that isn't a "name-map"
@@ -410,12 +392,12 @@
                 if (stepID == null)
                 {
                     throw new SAXException(
-                            "step element has no 'id' attribute in 'item-submission-" + getUIName() + ".xml', which is required in the 'step-definitions' section");
+                            "step element has no 'id' attribute in 'item-submission.xml', which is required in the 'step-definitions' section");
                 }
                 else if (stepDefns.containsKey(stepID))
                 {
                     throw new SAXException(
-                            "There are two step elements with the id '" + stepID + "' in 'item-submission-" + getUIName() + ".xml'");
+                            "There are two step elements with the id '" + stepID + "' in 'item-submission.xml'");
                 }
 
                 HashMap stepInfo = processStepChildNodes("step-definition", nd);
@@ -428,7 +410,7 @@
         if (stepDefns.size() < 1)
         {
             throw new ServletException(
-                    "step-definition section has no steps! A step with id='collection' is required in 'item-submission-" + getUIName() + ".xml'!");
+                    "step-definition section has no steps! A step with id='collection' is required in 'item-submission.xml'!");
         }
 
         // Sanity check to see that the required "collection" step is defined
@@ -437,7 +419,7 @@
             throw new ServletException(
                     "The step-definition section is REQUIRED to have a step with id='"
                             + SubmissionStepConfig.SELECT_COLLECTION_STEP
-                            + "' in 'item-submission-" + getUIName() + ".xml'!  This step is used to ensure that a new item submission is assigned to a collection.");
+                            + "' in 'item-submission.xml'!  This step is used to ensure that a new item submission is assigned to a collection.");
         }
 
         // Sanity check to see that the required "complete" step is defined
@@ -446,7 +428,7 @@
             throw new ServletException(
                     "The step-definition section is REQUIRED to have a step with id='"
                             + SubmissionStepConfig.COMPLETE_STEP
-                            + "' in 'item-submission-" + getUIName() + ".xml'!  This step is used to perform all processing necessary at the completion of the submission (e.g. starting workflow).");
+                            + "' in 'item-submission.xml'!  This step is used to perform all processing necessary at the completion of the submission (e.g. starting workflow).");
         }
     }
 
@@ -482,13 +464,13 @@
                 if (submitName == null)
                 {
                     throw new SAXException(
-                            "'submission-process' element has no 'name' attribute in 'item-submission-" + getUIName() + ".xml'");
+                            "'submission-process' element has no 'name' attribute in 'item-submission.xml'");
                 }
                 else if (submitNames.contains(submitName))
                 {
                     throw new SAXException(
                             "There are two 'submission-process' elements with the name '"
-                                    + submitName + "' in 'item-submission-" + getUIName() + ".xml'.");
+                                    + submitName + "' in 'item-submission.xml'.");
                 }
                 submitNames.add(submitName);
 
@@ -530,7 +512,7 @@
                                                 + submitName
                                                 + " contains a step with id="
                                                 + stepID
-                                                + ".  There is no step with this 'id' defined in the 'step-definition' section of 'item-submission-" + getUIName() + ".xml'.");
+                                                + ".  There is no step with this 'id' defined in the 'step-definition' section of 'item-submission.xml'.");
                             }
 
                             // Ignore all children of a step element with an
@@ -554,7 +536,7 @@
                 {
                     throw new ServletException(
                             "Item Submission process config named "
-                                    + submitName + " has no steps defined in 'item-submission-" + getUIName() + ".xml'");
+                                    + submitName + " has no steps defined in 'item-submission.xml'");
                 }
 
                 // ALL Item Submission processes MUST BEGIN with selecting a
@@ -579,7 +561,7 @@
         if (numSubmitProcesses == 0)
         {
             throw new ServletException(
-                    "No 'submission-process' elements/definitions found in 'item-submission-" + getUIName() + ".xml'");
+                    "No 'submission-process' elements/definitions found in 'item-submission.xml'");
         }
     }
 
@@ -627,7 +609,7 @@
         {
             String msg = "Required field " + missing
                     + " missing in a 'step' in the " + configSection
-                    + " of the item submission configuration file ('item-submission-" + getUIName() + ".xml')";
+                    + " of the item submission configuration file ('item-submission.xml')";
             throw new SAXException(msg);
         }
 
@@ -706,12 +688,4 @@
         // Didn't find a text node
         return null;
     }
-
-	public String getUIName() {
-		return UIName;
-	}
-
-	private void setUIName(String name) {
-		UIName = name;
-	}
 }

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionInfo.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionInfo.java	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionInfo.java	2008-01-08 17:53:25 UTC (rev 2491)
@@ -127,11 +127,7 @@
      * for a new submission.
      * 
      * @param request
-     *            The HTTP Servlet Request object
-     * @param briefUIName
-     *            The brief name of the User Interface to 
-     *            load the Submission Configuration and Information for
-     *            (e.g. "jspui" or "xmlui")           
+     *            The HTTP Servlet Request object          
      * @param subItem
      *            The in-progress submission we are loading information for
      * 
@@ -140,19 +136,16 @@
      * @throws ServletException
      *             if an error occurs
      */
-    public static SubmissionInfo load(HttpServletRequest request,
-    		String briefUIName, InProgressSubmission subItem) throws ServletException
+    public static SubmissionInfo load(HttpServletRequest request, InProgressSubmission subItem) throws ServletException
     {
         boolean forceReload = false;
     	SubmissionInfo subInfo = new SubmissionInfo();
         
         // load SubmissionConfigReader only the first time
         // or if we're using a different UI now.
-        if (submissionConfigReader == null || 
-        		submissionConfigReader.getUIName() == null ||
-        		!submissionConfigReader.getUIName().equals(briefUIName))
+        if (submissionConfigReader == null)
         {
-            submissionConfigReader = new SubmissionConfigReader(briefUIName);
+            submissionConfigReader = new SubmissionConfigReader();
             forceReload=true;
         }
 
@@ -223,7 +216,7 @@
 
     /**
      * Causes the SubmissionConfig to be completely reloaded from the XML
-     * configuration file (item-submission-[UI Name].xml).
+     * configuration file (item-submission.xml).
      * <P>
      * Note: This also reloads the progress bar info, since the progress bar
      * depends entirely on the submission process (and its steps).

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionStepConfig.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionStepConfig.java	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/util/SubmissionStepConfig.java	2008-01-08 17:53:25 UTC (rev 2491)
@@ -48,7 +48,7 @@
  * Class representing configuration for a single step within an Item Submission
  * Process. In other words, this is a single step in the SubmissionConfig class.
  * This class represents the structure of a single 'step' node in the
- * item-submission-[UI Name].xml configuration file.
+ * item-submission.xml configuration file.
  * 
  * @see org.dspace.app.util.SubmissionConfigReader
  * @see org.dspace.app.util.SubmissionConfig
@@ -79,19 +79,22 @@
 
     /** the name of the java processing class for this step */
     private String processingClassName = null;
-
-    /** the review-jsp for this step */
-    private String reviewJSP = null;
-
+   
     /** whether or not this step is editable during workflow (default=true) */
     private boolean workflowEditable = true;
 
+    /** 
+     * The full name of the JSP-UI binding class for this step. This field is
+     * ONLY used by the JSP-UI.
+     **/
+    private String jspBindingClassName = null;
+
     /**
      * The full name of the Manakin XML-UI Transformer class which will generate
      * the necessary DRI for displaying this class in Manakin. This field is
      * ONLY used by the Manakin XML-UI.
      */
-    private String xmlUIClassName = null;
+    private String xmlBindingClassName = null;
 
     /** The number of this step in the current SubmissionConfig */
     private int number = -1;
@@ -119,8 +122,8 @@
         id = (String) stepMap.get("id");
         heading = (String) stepMap.get("heading");
         processingClassName = (String) stepMap.get("processing-class");
-        reviewJSP = (String) stepMap.get("review-jsp");
-        xmlUIClassName = (String) stepMap.get("xml-ui-class");
+        jspBindingClassName = (String) stepMap.get("jspui-binding");
+        xmlBindingClassName = (String) stepMap.get("xmlui-binding");
 
         String wfEditString = (String) stepMap.get("workflow-editable");
         if (wfEditString != null && wfEditString.length() > 0)
@@ -156,9 +159,8 @@
     /**
      * Get the class which handles all processing for this step.
      * <p>
-     * This class must extend either the org.dspace.submit.SubmissionStep class
-     * (for JSP UI) or org.dspace.submit.AbstractProcessingStep class (for
-     * Manakin XML UI).
+     * This class must extend the org.dspace.submit.AbstractProcessingStep class,
+     * and provide processing for BOTH the JSP-UI and XML-UI
      * 
      * @return the class's full class path (e.g.
      *         "org.dspace.submit.step.MySampleStep")
@@ -169,35 +171,37 @@
     }
 
     /**
-     * Get the review jsp for this step. The "review jsp" is a JSP page which
-     * will load all the user's answers given for this step to allow the user to
-     * review his/her answers.
+     * Retrieve the full class name of the Manakin Transformer which will
+     * generate this step's DRI, for display in Manakin XML-UI.
+     * <P>
+     * This class must extend the
+     * org.dspace.app.xmlui.aspect.submission.StepTransformer class.
+     * <P>
+     * This property is only used by the Manakin XML-UI, and therefore is not
+     * relevant if you are using the JSP-UI.
      * 
-     * This "review jsp" is used by the "Verify" step to allow the user to
-     * verify/review all of his/her answers.
-     * 
-     * @return the JSPs full path
+     * @return the full java class name of the Transformer to use for this step
      */
-    public String getReviewJSP()
+    public String getXMLUIClassName()
     {
-        return reviewJSP;
+        return xmlBindingClassName;
     }
-
+    
     /**
-     * Retrieve the full class name of the Manakin Transformer which will
-     * generate this step's DRI, for display in Manakin XML-UI.
+     * Retrieve the full class name of the JSP-UI "binding" class which will
+     * initialize and call the necessary JSPs for display in the JSP-UI
      * <P>
      * This class must extend the
-     * org.dspace.app.xmlui.submit.step.SubmissionStep class.
+     * org.dspace.app.webui.submit.JSPStep class.
      * <P>
-     * This property is only used by the Manakin XML-UI, and therefore is not
-     * relevant if you are using JSPs.
+     * This property is only used by the JSP-UI, and therefore is not
+     * relevant if you are using the XML-UI (aka. Manakin).
      * 
-     * @return the full java class name of the Transformer for this class
+     * @return the full java class name of the JSPStep to use for this step
      */
-    public String getXMLUIClassName()
+    public String getJSPUIClassName()
     {
-        return xmlUIClassName;
+        return jspBindingClassName;
     }
 
     /**

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/AbstractProcessingStep.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/AbstractProcessingStep.java	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/AbstractProcessingStep.java	2008-01-08 17:53:25 UTC (rev 2491)
@@ -125,6 +125,9 @@
 
     /** List of all user interface fields which had errors during processing * */
     private List errorFields = null;
+    
+    private static String ERROR_FIELDS_ATTRIBUTE = "dspace.submit.error_fields";
+    
 
     /**
      * Do any processing of the information input by the user, and/or perform
@@ -159,47 +162,84 @@
      * step processing. This list is for usage in generating the appropriate
      * error message(s) in the UI.
      * <P>
-     * The list of fields which had errors should be set by the step's
+     * The list of fields which had errors should be set by the AbstractProcessingStep's
      * doProcessing() method, so that it can be accessed later by whatever UI is
      * generated.
      * 
+     * @param request
+     *            current servlet request object
      * @return List of error fields (as Strings)
      */
-    public final List getErrorFields()
+    public static final List getErrorFields(HttpServletRequest request)
     {
-        return this.errorFields;
+        return (List) request.getAttribute(ERROR_FIELDS_ATTRIBUTE);
     }
+    
+    /**
+     * Sets th list of all UI fields which had errors that occurred during the
+     * step processing. This list is for usage in generating the appropriate
+     * error message(s) in the UI.
+     * <P>
+     * The list of fields which had errors should be set by the AbstractProcessingStep's
+     * doProcessing() method, so that it can be accessed later by whatever UI is
+     * generated.
+     * 
+     * @param request
+     *            current servlet request object
+     * @param errorFields
+     *            List of all fields (as Strings) which had errors
+     */
+    private static final void setErrorFields(HttpServletRequest request, List errorFields)
+    {
+        if(errorFields==null)
+            request.removeAttribute(ERROR_FIELDS_ATTRIBUTE);
+        else
+            request.setAttribute(ERROR_FIELDS_ATTRIBUTE, errorFields);
+    }
 
     /**
-     * Add a single UI field to the internal list of all error fields (which can
+     * Add a single UI field to the list of all error fields (which can
      * later be retrieved using getErrorFields())
      * <P>
-     * The list of fields which had errors should be set by the step's
+     * The list of fields which had errors should be set by the AbstractProcessingStep's
      * doProcessing() method, so that it can be accessed later by whatever UI is
      * generated.
      * 
      * @param fieldName
      *            the name of the field which had an error
      */
-    protected final void addErrorField(String fieldName)
+    protected static final void addErrorField(HttpServletRequest request, String fieldName)
     {
-        if (this.errorFields == null)
+        //get current list
+        List errorFields = getErrorFields(request);
+        
+        if (errorFields == null)
         {
-            this.errorFields = new ArrayList();
+            errorFields = new ArrayList();
         }
 
-        this.errorFields.add(fieldName);
+        //add this field
+        errorFields.add(fieldName);
+        
+        //save updated list
+        setErrorFields(request, errorFields);
     }
 
     /**
      * Clears the list of all fields that errored out during the previous step's
      * processing.
      * 
+     * @param request
+     *        current servlet request object
+     * 
      */
-    protected final void clearErrorFields()
+    protected static final void clearErrorFields(HttpServletRequest request)
     {
-        if (this.errorFields != null)
-            this.errorFields.clear();
+        //get current list
+        List errorFields = getErrorFields(request);
+        
+        if (errorFields != null)
+            setErrorFields(request,null);
     }
 
     /**

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/DescribeStep.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/DescribeStep.java	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/DescribeStep.java	2008-01-08 17:53:25 UTC (rev 2491)
@@ -106,12 +106,8 @@
     /** Constructor */
     public DescribeStep() throws ServletException
     {
-        // load inputsReader only the first time
-        if (inputsReader == null)
-        {
-            // read configurable submissions forms data
-            inputsReader = new DCInputsReader();
-        }
+        //load the DCInputsReader
+        getInputsReader();
     }
 
    
@@ -268,7 +264,7 @@
 
         // Step 3:
         // Check to see if any fields are missing
-        clearErrorFields();
+        clearErrorFields(request);
         for (int i = 0; i < inputs.length; i++)
         {
             DCValue[] values = item.getMetadata(inputs[i].getSchema(),
@@ -277,7 +273,7 @@
             if (inputs[i].isRequired() && values.length == 0)
             {
                 // since this field is missing add to list of error fields
-                addErrorField(getFieldName(inputs[i]));
+                addErrorField(request, getFieldName(inputs[i]));
             }
         }
 
@@ -294,7 +290,7 @@
             return STATUS_MORE_INPUT_REQUESTED;
         }
         // if one or more fields errored out, return
-        else if (getErrorFields() != null && getErrorFields().size() > 0)
+        else if (getErrorFields(request) != null && getErrorFields(request).size() > 0)
         {
             return STATUS_MISSING_REQUIRED_FIELDS;
         }
@@ -353,8 +349,15 @@
      * 
      * @return the current DCInputsReader
      */
-    public static DCInputsReader getInputsReader()
+    public static DCInputsReader getInputsReader() throws ServletException
     {
+        // load inputsReader only the first time
+        if (inputsReader == null)
+        {
+            // read configurable submissions forms data
+            inputsReader = new DCInputsReader();
+        }
+        
         return inputsReader;
     }
 

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/InitialQuestionsStep.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/InitialQuestionsStep.java	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/InitialQuestionsStep.java	2008-01-08 17:53:25 UTC (rev 2491)
@@ -232,6 +232,11 @@
             // to inform the user and make sure that's OK, before saving!
             if (willRemoveTitles || willRemoveDate || willRemoveFiles)
             {
+                //save what we will need to prune to request (for UI to process)
+                request.setAttribute("will.remove.titles", new Boolean(willRemoveTitles));
+                request.setAttribute("will.remove.date", new Boolean(willRemoveDate));
+                request.setAttribute("will.remove.files", new Boolean(willRemoveFiles));
+                
                 return STATUS_VERIFY_PRUNE; // we will need to do pruning!
             }
         }

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/UploadStep.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/UploadStep.java	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/submit/step/UploadStep.java	2008-01-08 17:53:25 UTC (rev 2491)
@@ -59,6 +59,7 @@
 import org.dspace.content.FormatIdentifier;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.dspace.core.ConfigurationManager;
 import org.dspace.submit.AbstractProcessingStep;
 
 /**
@@ -465,8 +466,8 @@
         Bitstream b = null;
  
         //NOTE: File should already be uploaded. 
-        //Manakin does this automatically.
-        //For JSP-UI, the JSPUploadStep.doProcessing() does the actual upload
+        //Manakin does this automatically via Cocoon.
+        //For JSP-UI, the SubmissionController.uploadFiles() does the actual upload
 
         Enumeration attNames = request.getAttributeNames();
         

Modified: branches/dspace-1_5_x/dspace-api/src/main/resources/Messages.properties
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/resources/Messages.properties	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace-api/src/main/resources/Messages.properties	2008-01-08 17:53:25 UTC (rev 2491)
@@ -855,6 +855,7 @@
 jsp.submit.no-theses.title                                      = Theses Not Accepted in DSpace
 jsp.submit.progressbar.complete                                 = Complete
 jsp.submit.progressbar.describe                                 = Describe
+jsp.submit.progressbar.initial-questions                        = Describe
 jsp.submit.progressbar.license                                  = License
 jsp.submit.progressbar.select                                   = Select
 jsp.submit.progressbar.upload                                   = Upload

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/MyDSpaceServlet.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/MyDSpaceServlet.java	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/MyDSpaceServlet.java	2008-01-08 17:53:25 UTC (rev 2491)
@@ -553,7 +553,7 @@
             // Load the Submission Process for the collection this WSI is
             // associated with
             Collection c = wsi.getCollection();
-            SubmissionConfigReader subConfigReader = new SubmissionConfigReader(SubmissionController.UI_NAME);
+            SubmissionConfigReader subConfigReader = new SubmissionConfigReader();
             SubmissionConfig subConfig = subConfigReader.getSubmissionConfig(c
                     .getHandle(), false);
 

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/SubmissionController.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/SubmissionController.java	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/SubmissionController.java	2008-01-08 17:53:25 UTC (rev 2491)
@@ -39,8 +39,13 @@
  */
 package org.dspace.app.webui.servlet;
 
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.sql.SQLException;
+import java.util.Enumeration;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -50,6 +55,7 @@
 
 import org.dspace.app.util.SubmissionInfo;
 import org.dspace.app.util.SubmissionStepConfig;
+import org.dspace.app.util.Util;
 import org.dspace.app.webui.submit.JSPStepManager;
 import org.dspace.app.webui.util.FileUploadRequest;
 import org.dspace.app.webui.util.JSPManager;
@@ -62,6 +68,7 @@
 import org.dspace.core.LogManager;
 import org.dspace.workflow.WorkflowItem;
 import org.dspace.submit.AbstractProcessingStep;
+import org.dspace.submit.step.UploadStep;
 
 /**
  * Submission Manager servlet for DSpace. Handles the initial submission of
@@ -124,9 +131,6 @@
     /** First step after "select collection" */
     public static int FIRST_STEP = 1;
     
-    /** "Name" of the JSP User Interface - Used to load SubmissionInfo **/
-    public static String UI_NAME = "JSPUI";
-
     /** path to the JSP shown once the submission is completed */
     private static String COMPLETE_JSP = "/submit/complete.jsp";
 
@@ -170,7 +174,7 @@
                         .parseInt(workspaceID));
 
                 //load submission information
-                SubmissionInfo si = SubmissionInfo.load(request, UI_NAME, wi);
+                SubmissionInfo si = SubmissionInfo.load(request, wi);
                 
                 //TD: Special case - If a user is resuming a submission
                 //where the submission process now has less steps, then
@@ -214,7 +218,7 @@
                         .parseInt(workflowID));
 
                 //load submission information
-                SubmissionInfo si = SubmissionInfo.load(request, UI_NAME, wi);
+                SubmissionInfo si = SubmissionInfo.load(request, wi);
                 
                 //For workflows, first step is step #0 
                 //(since Select Collection is already filtered out)
@@ -254,6 +258,9 @@
                 && (contentType.indexOf("multipart/form-data") != -1))
         {
             request = wrapMultipartRequest(request);
+            
+            //also, upload any files and save their contents to Request (for later processing by UploadStep)
+            uploadFiles(context, request);
         }
         
         // Reload submission info from request parameters
@@ -394,7 +401,7 @@
         try
         {
             
-            JSPStepManager stepManager = JSPStepManager.loadStep(currentStepConfig.getProcessingClassName());
+            JSPStepManager stepManager = JSPStepManager.loadStep(currentStepConfig);
            
             //tell the step class to do its processing
             boolean stepFinished = stepManager.processStep(context, request, response, subInfo);   
@@ -482,20 +489,7 @@
             else
             {
                 // The Submission is COMPLETE!!
-                /*
-                log.info(LogManager.getHeader(context, "submission_complete",
-                        "Completed submission with id="
-                                + subInfo.getSubmissionItem().getID()));
-    
-                // save that user has reached last step
-                userHasReached(subInfo, currentStepNum + 1);
-    
-                // Start the workflow
-                WorkflowManager.start(context, (WorkspaceItem)subInfo.getSubmissionItem());
-    
-                // commit changes to database & close context
-                context.complete();
-                */
+               
                 // save our current Submission information into the Request object
                 saveSubmissionInfo(request, subInfo);
     
@@ -905,19 +899,19 @@
             {
                 int workflowID = UIUtil.getIntParameter(request, "workflow_id");
                 
-                info = SubmissionInfo.load(request, UI_NAME, WorkflowItem.find(context, workflowID));
+                info = SubmissionInfo.load(request, WorkflowItem.find(context, workflowID));
             }
             else if(request.getParameter("workspace_item_id") != null)
             {
                 int workspaceID = UIUtil.getIntParameter(request,
                         "workspace_item_id");
                 
-                info = SubmissionInfo.load(request, UI_NAME, WorkspaceItem.find(context, workspaceID));
+                info = SubmissionInfo.load(request, WorkspaceItem.find(context, workspaceID));
             }
             else
             {
                 //by default, initialize Submission Info with no item
-                info = SubmissionInfo.load(request, UI_NAME, null);
+                info = SubmissionInfo.load(request, null);
             }
             
             // We must have a submission object if after the first step,
@@ -1297,4 +1291,70 @@
             throw new ServletException(e);
         }
     }
+    
+    
+    /**
+     * Upload any files found on the Request, and save them back as 
+     * Request attributes, for further processing by the appropriate user interface.
+     * 
+     * @param context
+     *            current DSpace context
+     * @param request
+     *            current servlet request object
+     */
+    public void uploadFiles(Context context, HttpServletRequest request)
+            throws ServletException
+    {
+        FileUploadRequest wrapper = null;
+        String filePath = null;
+        InputStream fileInputStream = null;
+
+        try
+        {
+            // if we already have a FileUploadRequest, use it
+            if (Class.forName("org.dspace.app.webui.util.FileUploadRequest")
+                    .isInstance(request))
+            {
+                wrapper = (FileUploadRequest) request;
+            }
+            else
+            {
+                // Wrap multipart request to get the submission info
+                wrapper = new FileUploadRequest(request);
+            }
+            
+            Enumeration fileParams = wrapper.getFileParameterNames();
+            while(fileParams.hasMoreElements())
+            {
+                String fileName = (String) fileParams.nextElement();
+                
+                File temp = wrapper.getFile(fileName);
+                
+                //if file exists and has a size greater than zero
+                if (temp != null && temp.length() > 0)
+                {
+                    // Read the temp file into an inputstream
+                    fileInputStream = new BufferedInputStream(
+                            new FileInputStream(temp));
+
+                    filePath = wrapper.getFilesystemName(fileName);
+                
+                    // cleanup our temp file
+                    temp.delete();
+                    
+                    //save this file's info to request (for UploadStep class)
+                    request.setAttribute(fileName + "-path", filePath);
+                    request.setAttribute(fileName + "-inputstream", fileInputStream);
+                    request.setAttribute(fileName + "-description", wrapper.getParameter("description"));
+                }         
+            }
+        }
+        catch (Exception e)
+        {
+            // Problem with uploading
+            log.warn(LogManager.getHeader(context, "upload_error", ""), e);
+            throw new ServletException(e);
+        }
+    }
+    
 }

Modified: branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/JSPStep.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/JSPStep.java	2008-01-08 12:18:53 UTC (rev 2490)
+++ branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/submit/JSPStep.java	2008-01-08 17:53:25 UTC (rev 2491)
@@ -60,10 +60,10 @@
 import org.dspace.submit.AbstractProcessingStep;
 
 /**
- * Interface for DSpace Submission Steps which use the JSP UI.
+ * Abstract 'binding' class for DSpace Submission Steps which use the JSP-UI.
  * <P>
  * These methods revolve around the following: (1) pre-processing of data to
- * prepare for display, (2) displaying data on JSP, and (3) processing of any
+ * prepare for display, (2) displaying the JSP, and (3) post-processing of any
  * user input (or alternatively backend processing, for non-interactive steps).
  * <P>
  * For the JSP UI, the job of this class is to maintain the context of where the
@@ -78,7 +78,7 @@
  * specified will be displayed</li>
  * <li>If showJSP() was not specified from doPreProcessing(), then the
  * doProcessing() method is called an the step completes immediately</li>
- * <li>Call doProcessing() method after the user returns from the JSP, in order
+ * <li>Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order
  * to process the user input</li>
  * <li>Call doPostProcessing() method to determine if more user interaction is
  * required, and if further JSPs need to be called.</li>
@@ -96,7 +96,7 @@
  * @author Tim Donohue
  * @version $Revision$
  */
-public interface JSPStep 
+public abstract class JSPStep 
 {
     /**
      * Value to return from doPreProcessing to specify not to load any JSP Page
@@ -127,7 +127,7 @@
      * @param subInfo
      *            submission info object
      */
-    public void doPreProcessing(Context context, HttpServletRequest request,
+    public abstract void doPreProcessing(Context context, HttpServletRequest request,
             HttpServletResponse response, SubmissionInfo subInfo)
             throws ServletException, IOException, SQLException,
             AuthorizeException;
@@ -155,8 +155,29 @@
      * @param status
      *            any status/errors reported by doProcessing() method
      */
-    public void doPostProcessing(Context context, HttpServletRequest request,
+    public abstract void doPostProcessing(Context context, HttpServletRequest request,
             HttpServletResponse response, SubmissionInfo subInfo, int status)
             throws ServletException, IOException, SQLException,
             AuthorizeException;
+    
+    
+    /**
+     * Return the URL path (e.g. /submit/review-metadata.jsp) of the JSP
+     * which will review the information that was gathered in this Step.
+     * <P>
+     * This Review JSP is loaded by the 'Verify' Step, in order to dynamically
+     * generate a submission verification page consisting of the information
+     * gathered in all the enabled submission steps.
+     * 
+     * @param context
+     *            current DSpace context
+     * @param request
+     *            current servlet request object
+     * @param response
+     *            current servlet response object

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2508
          http://dspace.svn.sourceforge.net/dspace/?rev=2508&view=rev
Author:   grahamtriggs
Date:     2008-01-10 06:03:36 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
First part of search update - reduce search size, add in fields for sorting content, lessen dependency on handles

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseEngine.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseInfo.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowserScope.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/content/ItemComparator.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSAnalyzer.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSIndexer.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSQuery.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/QueryArgs.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/QueryResults.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/components/RecentSubmissionsManager.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/AbstractBrowserServlet.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/SimpleSearchServlet.java
    branches/dspace-1_5_x/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/admin/ItemMapServlet.java
    branches/dspace-1_5_x/dspace-jspui/src/main/webapp/browse/full.jsp
    branches/dspace-1_5_x/dspace-jspui/src/main/webapp/layout/navbar-admin.jsp
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/WithdrawnItems.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceFeedGenerator.java

Added Paths:
-----------
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/AbstractTextFilterOFD.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/OrderFormatAuthor.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/OrderFormatDelegate.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/OrderFormatText.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/OrderFormatTitle.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/OrderFormatTitleMarc21.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/SortException.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/SortOption.java

Removed Paths:
-------------
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/AbstractTextFilterBOD.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrder.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderAuthor.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderDelegate.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderText.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderTitle.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderTitleMarc21.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/SortOption.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-01-10 14:03:36 UTC (rev 2508)
@@ -474,7 +474,7 @@
 # webui.browse.index.<n> = <index name> : item : <sort option name> : (asc | desc)
 #
 # sort option name: this is the sorting to be applied to the display. It must match the
-#                   name given to one of the webui.browse.sort-option entries given below.
+#                   name given to one of the webui.itemlist.sort-option entries given below.
 # 
 #   The final part of the configuration is optional, and specifies the default ordering
 #   for the index - whether it is ASCending (the default, and best for text indexes), or
@@ -499,13 +499,13 @@
 
 # Set the options for what can be sorted by
 #
-# Sort options will be available when browsing a list of items (i.e. only in
-# "full" mode, not "single" mode).  You can define an arbitrary number of fields
+# Sort options will be available when browsing a list of items (i.e. an 'item' browse,
+# or search results).  You can define an arbitrary number of fields
 # to sort on, irrespective of which fields you display using webui.itemlist.columns
 #
 # the format is:
 #
-# webui.browse.sort-option.<n> = <option name> : \
+# webui.itemlist.sort-option.<n> = <option name> : \
 #									<schema prefix>.<element>[.<qualifier>|.*] : \
 #									(date | text | ...) : (show | hide)
 #
@@ -518,9 +518,9 @@
 # you need to define a specific date sort for use by the recent items lists,
 # but otherwise don't want users to choose that option.
 #
-webui.browse.sort-option.1 = title:dc.title:title
-webui.browse.sort-option.2 = dateissued:dc.date.issued:date
-webui.browse.sort-option.3 = dateaccessioned:dc.date.accessioned:date
+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
 
 # Set the options for the size (number of characters) of the fields stored in the database.  
 # 
@@ -550,9 +550,9 @@
 # 
 # The default datatypes (and delegates) are:
 #
-# author = org.dspace.browse.BrowseOrderAuthor
-# title  = org.dspace.browse.BrowseOrderTitle
-# text   = org.dspace.browse.BrowseOrderText
+# author = org.dspace.sort.OrderFormatAuthor
+# title  = org.dspace.sort.OrderFormatTitle
+# text   = org.dspace.sort.OrderFormatText
 #
 # If you redefine a default datatype here, the configuration will be used in preference
 # to the default, however, if you do not explicitly redefine a datatype, then the
@@ -560,8 +560,8 @@
 #
 # Uncomment the configuration below to use the multi-lingual MARC 21 title ordering.
 #
-#plugin.named.org.dspace.browse.BrowseOrderDelegate= \
-#	org.dspace.browse.BrowseOrderTitleMarc21=title
+#plugin.named.org.dspace.sort.OrderFormatDelegate= \
+#	org.dspace.sort.OrderFormatTitleMarc21=title
 
 ## Set the options for how authors are displayed in the browse listing
 

Deleted: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/AbstractTextFilterBOD.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/AbstractTextFilterBOD.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/AbstractTextFilterBOD.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -1,121 +0,0 @@
-/*
- * AbstractTextFilterBOD.java
- *
- * Version: $Revision: 1.0 $
- *
- * Date: $Date: 2007/03/02 11:22:13 $
- *
- * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
- * Institute of Technology.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of the Hewlett-Packard Company nor the name of the
- * Massachusetts Institute of Technology nor the names of their
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-
-package org.dspace.browse;
-
-import org.apache.log4j.Logger;
-import org.dspace.text.filter.TextFilter;
-
-/**
- * Helper class for creating order delegates.
- *
- * To configure the filters create a subclass and, in an object initializer,
- * create an array of classes that implement TextFilter:
- * 
- * class MyLocaleDelegate extends AbstractTextFilterBOD {
- *   {
- *      filters = new TextFilter[] { new LocaleOrderingFilter(); }
- *   }
- * }
- * 
- * The order they are in the array, is the order that they are executed.
- * (this may be important for some filters - read their documentation!)
- * 
- * Example configurations that could be used:
- * { new DecomposeDiactritics(), new StripDiacritics(), new LowerCaseAndTrim() }
- *    - Decompose and then strip the diacritics, lowercase and trim the string.
- *    
- * { new MARC21InitialArticleWord(), new DecomposeDiactritics(), new LowerCaseTrim() }
- *    - Parse the initial article words based on the Library of Congress list of
- *      definite/indefinite article words, decompose diacritics, and lowercase/trim.
- *
- * { new LowerCaseTrim(), new LocaleOrderingFilter() }
- *    - Lowercase the string, then make a locale dependent sort text
- *      (note that the sort text is not human readable)
- * 
- * @author Graham Triggs
- */
-public abstract class AbstractTextFilterBOD implements BrowseOrderDelegate
-{
-	private final static Logger log = Logger.getLogger(AbstractTextFilterBOD.class);
-	
-	// Initialised in subclass in an object initializer
-	protected TextFilter[] filters;
-
-	/**
-	 * Prepare the appropriate sort string for the given value in the
-	 * given language.  Languate should be supplied with the ISO-6390-1
-	 * or ISO-639-2 standards.  For example "en" or "eng".
-	 * 
-	 * @param	value	the string value
-	 * @param	language	the language to interpret in
-	 */
-	public String makeSortString(String value, String language)
-	{
-		if (filters == null)
-		{
-			// Log an error if the class is not configured correctly
-			log.error("No filters defined for " + this.getClass().getName());
-		}
-		else
-		{
-			// Normalize language into a two or three character code
-	        if (language != null)
-	        {
-	            if (language.length() > 2 && language.charAt(2) == '_')
-	                language = language.substring(0,2);
-
-	            if (language.length() > 3)
-	                language = language.substring(0,3);
-	        }
-
-	        // Iterate through filters, applying each in turn
-	        for (int idx = 0; idx < filters.length; idx++)
-	        {
-	            if (language != null)
-	                value = filters[idx].filter(value, language);
-	            else
-	                value = filters[idx].filter(value);
-	        }
-		}
-		
-        return value;
-    }
-}

Copied: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/AbstractTextFilterOFD.java (from rev 2488, branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/AbstractTextFilterBOD.java)
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/AbstractTextFilterOFD.java	                        (rev 0)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/AbstractTextFilterOFD.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -0,0 +1,122 @@
+/*
+ * AbstractTextFilterOFD.java
+ *
+ * Version: $Revision: 1.0 $
+ *
+ * Date: $Date: 2007/03/02 11:22:13 $
+ *
+ * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+
+package org.dspace.browse;
+
+import org.apache.log4j.Logger;
+import org.dspace.text.filter.TextFilter;
+import org.dspace.sort.OrderFormatDelegate;
+
+/**
+ * Helper class for creating order delegates.
+ *
+ * To configure the filters create a subclass and, in an object initializer,
+ * create an array of classes that implement TextFilter:
+ * 
+ * class MyLocaleDelegate extends AbstractTextFilterOFD {
+ *   {
+ *      filters = new TextFilter[] { new LocaleOrderingFilter(); }
+ *   }
+ * }
+ * 
+ * The order they are in the array, is the order that they are executed.
+ * (this may be important for some filters - read their documentation!)
+ * 
+ * Example configurations that could be used:
+ * { new DecomposeDiactritics(), new StripDiacritics(), new LowerCaseAndTrim() }
+ *    - Decompose and then strip the diacritics, lowercase and trim the string.
+ *    
+ * { new MARC21InitialArticleWord(), new DecomposeDiactritics(), new LowerCaseTrim() }
+ *    - Parse the initial article words based on the Library of Congress list of
+ *      definite/indefinite article words, decompose diacritics, and lowercase/trim.
+ *
+ * { new LowerCaseTrim(), new LocaleOrderingFilter() }
+ *    - Lowercase the string, then make a locale dependent sort text
+ *      (note that the sort text is not human readable)
+ * 
+ * @author Graham Triggs
+ */
+public abstract class AbstractTextFilterOFD implements OrderFormatDelegate
+{
+	private final static Logger log = Logger.getLogger(AbstractTextFilterOFD.class);
+	
+	// Initialised in subclass in an object initializer
+	protected TextFilter[] filters;
+
+	/**
+	 * Prepare the appropriate sort string for the given value in the
+	 * given language.  Languate should be supplied with the ISO-6390-1
+	 * or ISO-639-2 standards.  For example "en" or "eng".
+	 * 
+	 * @param	value	the string value
+	 * @param	language	the language to interpret in
+	 */
+	public String makeSortString(String value, String language)
+	{
+		if (filters == null)
+		{
+			// Log an error if the class is not configured correctly
+			log.error("No filters defined for " + this.getClass().getName());
+		}
+		else
+		{
+			// Normalize language into a two or three character code
+	        if (language != null)
+	        {
+	            if (language.length() > 2 && language.charAt(2) == '_')
+	                language = language.substring(0,2);
+
+	            if (language.length() > 3)
+	                language = language.substring(0,3);
+	        }
+
+	        // Iterate through filters, applying each in turn
+	        for (int idx = 0; idx < filters.length; idx++)
+	        {
+	            if (language != null)
+	                value = filters[idx].filter(value, language);
+	            else
+	                value = filters[idx].filter(value);
+	        }
+		}
+		
+        return value;
+    }
+}

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseEngine.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseEngine.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseEngine.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -49,6 +49,8 @@
 import org.dspace.content.Community;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
+import org.dspace.sort.SortOption;
+import org.dspace.sort.OrderFormat;
 
 /**
  * This class does most of the actual grunt work of preparing a browse
@@ -285,7 +287,7 @@
 				rawValue = value;
 				
 				// make sure the incoming value is normalised
-                value = BrowseOrder.makeSortString(value, scope.getFilterValueLang(),
+                value = OrderFormat.makeSortString(value, scope.getFilterValueLang(),
                             scope.getBrowseIndex().getDataType());
 				
 				// set the values in the Browse Query
@@ -737,12 +739,12 @@
         if (scope.hasJumpToValue())
         {
             // Normalize it based on the specified language as appropriate for this index
-            return BrowseOrder.makeSortString(scope.getJumpToValue(), scope.setJumpToValueLang(), scope.getBrowseIndex().getDataType());
+            return OrderFormat.makeSortString(scope.getJumpToValue(), scope.setJumpToValueLang(), scope.getBrowseIndex().getDataType());
         }
         else if (scope.hasStartsWith())
         {
             // Scope has a starts with, so normalize that instead
-            return BrowseOrder.makeSortString(scope.getStartsWith(), null, scope.getBrowseIndex().getDataType());
+            return OrderFormat.makeSortString(scope.getStartsWith(), null, scope.getBrowseIndex().getDataType());
         }
         
         // No focus value on the scope (ie. focus by id), so just return the passed focus value

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -41,12 +41,13 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.dspace.core.ConfigurationManager;
+import org.dspace.sort.SortOption;
+import org.dspace.sort.SortException;
 
 /**
  * This class holds all the information about a specifically configured 
@@ -113,7 +114,7 @@
             displayType = "item";
             sortOption = SortOption.getDefaultSortOption();
         }
-        catch (BrowseException be)
+        catch (SortException se)
         {
             // FIXME Exception handling
         }
@@ -140,83 +141,90 @@
     private BrowseIndex(String definition, int number)
     	throws BrowseException
     {
-        boolean valid = true;
-        this.defaultOrder = SortOption.ASCENDING;
-        this.number = number;
-        
-        String rx = "(\\w+):(\\w+):([\\w\\.\\*,]+):?(\\w*):?(\\w*)";
-        Pattern pattern = Pattern.compile(rx);
-        Matcher matcher = pattern.matcher(definition);
-        
-        if (matcher.matches())
+        try
         {
-            name = matcher.group(1);
-            displayType = matcher.group(2);
-            
-            if (isMetadataIndex())
-            {
-                metadataAll = matcher.group(3);
-                datatype = matcher.group(4);
+            boolean valid = true;
+            this.defaultOrder = SortOption.ASCENDING;
+            this.number = number;
 
-                if (metadataAll != null)
-                    metadata = metadataAll.split(",");
+            String rx = "(\\w+):(\\w+):([\\w\\.\\*,]+):?(\\w*):?(\\w*)";
+            Pattern pattern = Pattern.compile(rx);
+            Matcher matcher = pattern.matcher(definition);
 
-                if (metadata == null || metadata.length == 0)
-                    valid = false;
-                
-                if (datatype == null || datatype.equals(""))
-                    valid = false;
+            if (matcher.matches())
+            {
+                name = matcher.group(1);
+                displayType = matcher.group(2);
 
-                // If an optional ordering configuration is supplied,
-                // set the defaultOrder appropriately (asc or desc)
-                if (matcher.groupCount() > 4)
+                if (isMetadataIndex())
                 {
-                    String order = matcher.group(5);
-                    if (SortOption.DESCENDING.equalsIgnoreCase(order))
-                        this.defaultOrder = SortOption.DESCENDING;
-                }
+                    metadataAll = matcher.group(3);
+                    datatype = matcher.group(4);
 
-                tableBaseName = makeTableBaseName(number);
-            }
-            else if (isItemIndex())
-            {
-                String sortName = matcher.group(3);
+                    if (metadataAll != null)
+                        metadata = metadataAll.split(",");
 
-                for (SortOption so : SortOption.getSortOptions())
+                    if (metadata == null || metadata.length == 0)
+                        valid = false;
+
+                    if (datatype == null || datatype.equals(""))
+                        valid = false;
+
+                    // If an optional ordering configuration is supplied,
+                    // set the defaultOrder appropriately (asc or desc)
+                    if (matcher.groupCount() > 4)
+                    {
+                        String order = matcher.group(5);
+                        if (SortOption.DESCENDING.equalsIgnoreCase(order))
+                            this.defaultOrder = SortOption.DESCENDING;
+                    }
+
+                    tableBaseName = makeTableBaseName(number);
+                }
+                else if (isItemIndex())
                 {
-                    if (so.getName().equals(sortName))
-                        sortOption = so;
-                }
+                    String sortName = matcher.group(3);
 
-                if (sortOption == null)
-                    valid = false;
+                    for (SortOption so : SortOption.getSortOptions())
+                    {
+                        if (so.getName().equals(sortName))
+                            sortOption = so;
+                    }
 
-                // If an optional ordering configuration is supplied,
-                // set the defaultOrder appropriately (asc or desc)
-                if (matcher.groupCount() > 3)
+                    if (sortOption == null)
+                        valid = false;
+
+                    // If an optional ordering configuration is supplied,
+                    // set the defaultOrder appropriately (asc or desc)
+                    if (matcher.groupCount() > 3)
+                    {
+                        String order = matcher.group(4);
+                        if (SortOption.DESCENDING.equalsIgnoreCase(order))
+                            this.defaultOrder = SortOption.DESCENDING;
+                    }
+
+                    tableBaseName = getItemBrowseIndex().tableBaseName;
+                }
+                else
                 {
-                    String order = matcher.group(4);
-                    if (SortOption.DESCENDING.equalsIgnoreCase(order))
-                        this.defaultOrder = SortOption.DESCENDING;
+                    valid = false;
                 }
-
-                tableBaseName = getItemBrowseIndex().tableBaseName;
             }
             else
             {
                 valid = false;
             }
+
+            if (!valid)
+            {
+                throw new BrowseException("Browse Index configuration is not valid: webui.browse.index." +
+                        number + " = " + definition);
+            }
         }
-        else
+        catch (SortException se)
         {
-            valid = false;
+            throw new BrowseException("Error in SortOptions", se);
         }
-        
-        if (!valid)
-        {
-            throw new BrowseException("Browse Index configuration is not valid: webui.browse.index." + 
-                    number + " = " + definition);
-        }
     }
 
     /**

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseInfo.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseInfo.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseInfo.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -40,7 +40,6 @@
 package org.dspace.browse;
 
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -51,6 +50,7 @@
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.dspace.sort.SortOption;
 
 /**
  * The results of a Browse, including all the contextual information about

Deleted: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrder.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrder.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrder.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -1,142 +0,0 @@
-/*
- * BrowseOrder.java
- *
- * Version: $Revision: 1.0 $
- *
- * Date: $Date: 2007/03/02 11:22:13 $
- *
- * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
- * Institute of Technology.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of the Hewlett-Packard Company nor the name of the
- * Massachusetts Institute of Technology nor the names of their
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-
-package org.dspace.browse;
-
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-import org.dspace.core.PluginManager;
-
-/**
- * Class implementing static helpers for anywhere that interacts with the sort columns
- * (ie. ItemsByAuthor.sort_author, ItemsByTitle.sort_title)
- *
- * This class maps index 'types' to delegates that implement the sort string creation
- * 
- * Types can be defined or configured using the plugin manager:
- * 
- * plugin.named.org.dspace.browse.BrowseOrderDelegate=
- * 		org.dspace.browse.BrowseOrderTitleMarc21=title
- * 		org.dspace.browse.BrowseOrderAuthor=author
- * 
- * The following standard types have been defined by default, but can be reconfigured
- * via the plugin manager:
- * 
- * author	= org.dspace.browse.BrowseOrderAuthor
- * title	= org.dspace.browse.BrowseOrderTitle
- * text 	= org.dspace.browse.BrowseOrderText
- * 
- * IMPORTANT - If you change any of the orderings, you need to rebuild the browse sort columns
- * (ie. run 'index-all', or 'dsrun org.dspace.browse.InitializeBrowse')
- * 
- * @author Graham Triggs
- * @version $Revision: 1.0 $
- */
-public class BrowseOrder
-{
-	private final static Logger log = LogManager.getLogger(BrowseOrder.class);
-
-	public final static String AUTHOR = "author";
-	public final static String TITLE  = "title";
-	public final static String TEXT   = "text";
-	
-	// Array of all available order delegates - avoids excessive calls to plugin manager
-	private final static String[] delegates = PluginManager.getAllPluginNames(BrowseOrderDelegate.class);
-
-    private final static BrowseOrderDelegate authorDelegate = new BrowseOrderAuthor();
-    private final static BrowseOrderDelegate titleDelegate  = new BrowseOrderTitle();
-    private final static BrowseOrderDelegate textDelegate   = new BrowseOrderText();
-    
-    /**
-     * Generate a sort string for the given DC metadata
-     */
-    public static String makeSortString(String value, String language, String type)
-    {
-    	BrowseOrderDelegate delegate = null;
-    	
-    	// If a named index has been supplied
-    	if (type != null && type.length() > 0)
-    	{
-    		// Use a delegate if one is configured
-        	if ((delegate = BrowseOrder.getDelegate(type)) != null)
-        	{
-        		return delegate.makeSortString(value, language);
-        	}
-    	}
-    	
-      	// No delegates found, so apply defaults
-    	if (type.equalsIgnoreCase(BrowseOrder.AUTHOR) && authorDelegate != null)
-    	{
-    		return authorDelegate.makeSortString(value, language);
-    	}
-
-    	if (type.equalsIgnoreCase(BrowseOrder.TITLE) && titleDelegate != null)
-    	{
-    		return titleDelegate.makeSortString(value, language);
-    	}
-
-    	if (type.equalsIgnoreCase(BrowseOrder.TEXT) && textDelegate != null)
-    	{
-    		return textDelegate.makeSortString(value, language);
-    	}
-    	
-    	return value;
-    }
-
-    /**
-     * Retrieve the named delegate
-     */
-    private static BrowseOrderDelegate getDelegate(String name)
-    {
-   		if (name != null && name.length() > 0)
-   		{
-   			// Check the cached array of names to see if the delegate has been configured
-	   		for (int idx = 0; idx < delegates.length; idx++)
-	   		{
-	   			if (delegates[idx].equals(name))
-	   			{
-	   				return (BrowseOrderDelegate)PluginManager.getNamedPlugin(BrowseOrderDelegate.class, name);
-	   			}
-	   		}
-   		}
-   		
-    	return null;
-    }
-}

Deleted: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderAuthor.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderAuthor.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderAuthor.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -1,58 +0,0 @@
-/*
- * BrowseOrderAuthor.java
- *
- * Version: $Revision: 1.0 $
- *
- * Date: $Date: 2007/03/02 11:22:13 $
- *
- * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
- * Institute of Technology.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of the Hewlett-Packard Company nor the name of the
- * Massachusetts Institute of Technology nor the names of their
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-
-package org.dspace.browse;
-
-import org.dspace.text.filter.DecomposeDiactritics;
-import org.dspace.text.filter.LowerCaseAndTrim;
-import org.dspace.text.filter.TextFilter;
-
-/**
- * Standard author ordering delegate implementation
- * 
- * @author Graham Triggs
- */
-public class BrowseOrderAuthor extends AbstractTextFilterBOD
-{
-	{
-		filters = new TextFilter[] { new DecomposeDiactritics(),
-				                     new LowerCaseAndTrim() };
-	}
-}

Deleted: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderDelegate.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderDelegate.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderDelegate.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -1,59 +0,0 @@
-/*
- * BrowseOrderDelegate.java
- *
- * Version: $Revision: 1.0 $
- *
- * Date: $Date: 2007/03/02 11:22:13 $
- *
- * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
- * Institute of Technology.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of the Hewlett-Packard Company nor the name of the
- * Massachusetts Institute of Technology nor the names of their
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-
-package org.dspace.browse;
-
-/**
- * Interface for browse order delegates
- * 
- * @author Graham Triggs
- */
-public interface BrowseOrderDelegate
-{
-	/**
-	 * Prepare the appropriate sort string for the given value in the
-	 * given language.  Languate should be supplied with the ISO-6390-1
-	 * or ISO-639-2 standards.  For example "en" or "eng".
-	 * 
-	 * @param	value	the string value
-	 * @param	language	the language to interpret in
-	 */
-    public String makeSortString(String value, String language);
-}

Deleted: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderText.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderText.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderText.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -1,58 +0,0 @@
-/*
- * BrowseOrderText.java
- *
- * Version: $Revision: 1.0 $
- *
- * Date: $Date: 2007/03/02 11:22:13 $
- *
- * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
- * Institute of Technology.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of the Hewlett-Packard Company nor the name of the
- * Massachusetts Institute of Technology nor the names of their
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-
-package org.dspace.browse;
-
-import org.dspace.text.filter.DecomposeDiactritics;
-import org.dspace.text.filter.LowerCaseAndTrim;
-import org.dspace.text.filter.TextFilter;
-
-/**
- * Standard text ordering delegate implementation
- * 
- * @author Graham Triggs
- */
-public class BrowseOrderText extends AbstractTextFilterBOD
-{
-	{
-		filters = new TextFilter[] { new DecomposeDiactritics(),
-				                     new LowerCaseAndTrim() };
-	}
-}

Deleted: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderTitle.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderTitle.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderTitle.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -1,60 +0,0 @@
-/*
- * BrowseOrderTitle.java
- *
- * Version: $Revision: 1.0 $
- *
- * Date: $Date: 2007/03/02 11:22:13 $
- *
- * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
- * Institute of Technology.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of the Hewlett-Packard Company nor the name of the
- * Massachusetts Institute of Technology nor the names of their
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-
-package org.dspace.browse;
-
-import org.dspace.text.filter.DecomposeDiactritics;
-import org.dspace.text.filter.LowerCaseAndTrim;
-import org.dspace.text.filter.StandardInitialArticleWord;
-import org.dspace.text.filter.TextFilter;
-
-/**
- * Standard title ordering delegate implementation
- * 
- * @author Graham Triggs
- */
-public class BrowseOrderTitle extends AbstractTextFilterBOD
-{
-	{
-		filters = new TextFilter[] { new StandardInitialArticleWord(),
-									 new DecomposeDiactritics(),
-									 new LowerCaseAndTrim() };
-	}
-}

Deleted: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderTitleMarc21.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderTitleMarc21.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderTitleMarc21.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -1,58 +0,0 @@
-/*
- * BrowseOrderTitleMarc21.java
- *
- * Version: $Revision: 1.0 $
- *
- * Date: $Date: 2007/03/02 11:22:13 $
- *
- * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
- * Institute of Technology.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of the Hewlett-Packard Company nor the name of the
- * Massachusetts Institute of Technology nor the names of their
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-
-package org.dspace.browse;
-
-import org.dspace.text.filter.*;
-
-/**
- * MARC 21 title ordering delegate implementation
- * 
- * @author Graham Triggs
- */
-public class BrowseOrderTitleMarc21 extends AbstractTextFilterBOD
-{
-	{
-		filters = new TextFilter[] { new MARC21InitialArticleWord(),
-                                     new DecomposeDiactritics(),
-                                     new StripLeadingNonAlphaNum(),
-									 new LowerCaseAndTrim() };
-	}
-}

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowserScope.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowserScope.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowserScope.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -39,6 +39,8 @@
 import org.dspace.content.Community;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
+import org.dspace.sort.SortOption;
+import org.dspace.sort.SortException;
 import org.apache.log4j.Logger;
 
 /**
@@ -404,53 +406,60 @@
 	public SortOption getSortOption()
 		throws BrowseException
 	{
-	    // If a sortOption hasn't been set, work out the default
-		if (sortOption == null)
-		{
-		    // We need a browse index first though
-			if (browseIndex != null)
-			{
-			    // If a sorting hasn't been specified, and it's a metadata browse
-				if (sortBy <= 0 && browseIndex.isMetadataIndex())
-				{
-				    // Create a dummy sortOption for the metadata sort
-					String dataType = browseIndex.getDataType();
-					String type = ("date".equals(dataType) ? "date" : "text");
-                    sortOption = new SortOption(0, browseIndex.getName(), browseIndex.getMetadata(0), type);
-				}
-				else
-				{
-				    // If a sorting hasn't been specified
-	                if (sortBy <= 0)
-	                {
-	                    // Get the sort option from the index
-	                    sortOption = browseIndex.getSortOption();
-	                    
-	                    if (sortOption == null)
-	                    {
-	                        // No sort option, so default to the first one defined in the config
-	                        for (SortOption so : SortOption.getSortOptions())
-	                        {
-	                            sortOption = so;
-	                            break;
-	                        }
-	                    }
-	                }
-					else
-					{
-					    // A sorting has been specified, so get it from the configured sort columns
-                        for (SortOption so : SortOption.getSortOptions())
+        try
+        {
+            // If a sortOption hasn't been set, work out the default
+            if (sortOption == null)
+            {
+                // We need a browse index first though
+                if (browseIndex != null)
+                {
+                    // If a sorting hasn't been specified, and it's a metadata browse
+                    if (sortBy <= 0 && browseIndex.isMetadataIndex())
+                    {
+                        // Create a dummy sortOption for the metadata sort
+                        String dataType = browseIndex.getDataType();
+                        String type = ("date".equals(dataType) ? "date" : "text");
+                        sortOption = new SortOption(0, browseIndex.getName(), browseIndex.getMetadata(0), type);
+                    }
+                    else
+                    {
+                        // If a sorting hasn't been specified
+                        if (sortBy <= 0)
                         {
-                            if (so.getNumber() == sortBy)
-                                sortOption = so;
+                            // Get the sort option from the index
+                            sortOption = browseIndex.getSortOption();
+
+                            if (sortOption == null)
+                            {
+                                // No sort option, so default to the first one defined in the config
+                                for (SortOption so : SortOption.getSortOptions())
+                                {
+                                    sortOption = so;
+                                    break;
+                                }
+                            }
                         }
-					}
-				}
-			}
-		}
-		
-		return sortOption;
-	}
+                        else
+                        {
+                            // A sorting has been specified, so get it from the configured sort columns
+                            for (SortOption so : SortOption.getSortOptions())
+                            {
+                                if (so.getNumber() == sortBy)
+                                    sortOption = so;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return sortOption;
+        }
+        catch (SortException se)
+        {
+            throw new BrowseException("Error in SortOptions", se);
+        }
+    }
 	
 	/**
 	 * @return Returns the startsWith.

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -54,6 +54,9 @@
 import org.dspace.content.DCValue;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.dspace.sort.SortOption;
+import org.dspace.sort.SortException;
+import org.dspace.sort.OrderFormat;
 
 /**
  * Tool to create Browse indexes.  This class is used from the command line to
@@ -433,7 +436,7 @@
                                 for (int x = 0; x < values.length; x++)
                                 {
                                     // get the normalised version of the value
-                                    String nVal = BrowseOrder.makeSortString(values[x].value, values[x].language, bis[i].getDataType());
+                                    String nVal = OrderFormat.makeSortString(values[x].value, values[x].language, bis[i].getDataType());
 
                                     Map sortMap = getSortValues(item, itemMDMap);
 
@@ -469,51 +472,59 @@
     private Map<Integer, String> getSortValues(ItemMetadataProxy item, Map itemMDMap)
             throws BrowseException, SQLException
     {
-        // now obtain the sort order values that we will use
-        Map<Integer, String> sortMap = new HashMap<Integer, String>();
-        for (SortOption so : SortOption.getSortOptions())
+        try
         {
-            Integer key = new Integer(so.getNumber());
-            String metadata = so.getMetadata();
-            
-            // If we've already used the metadata for this Item
-            // it will be cached in the map
-            DCValue value = null;
-            
-            if (itemMDMap != null)
-                value = (DCValue) itemMDMap.get(metadata);
-            
-            // We haven't used this metadata before, so grab it from the item
-            if (value == null)
+            // now obtain the sort order values that we will use
+            Map<Integer, String> sortMap = new HashMap<Integer, String>();
+            for (SortOption so : SortOption.getSortOptions())
             {
-                String[] somd = so.getMdBits();
-                DCValue[] dcv = item.getMetadata(somd[0], somd[1], somd[2], Item.ANY);
-                
-                if (dcv == null)
+                Integer key = new Integer(so.getNumber());
+                String metadata = so.getMetadata();
+
+                // If we've already used the metadata for this Item
+                // it will be cached in the map
+                DCValue value = null;
+
+                if (itemMDMap != null)
+                    value = (DCValue) itemMDMap.get(metadata);
+
+                // We haven't used this metadata before, so grab it from the item
+                if (value == null)
                 {
-                    continue;
+                    String[] somd = so.getMdBits();
+                    DCValue[] dcv = item.getMetadata(somd[0], somd[1], somd[2], Item.ANY);
+
+                    if (dcv == null)
+                    {
+                        continue;
+                    }
+
+                    // we only use the first dc value
+                    if (dcv.length > 0)
+                    {
+                        // Set it as the current metadata value to use
+                        // and add it to the map
+                        value = dcv[0];
+
+                        if (itemMDMap != null)
+                            itemMDMap.put(metadata, dcv[0]);
+                    }
                 }
-                
-                // we only use the first dc value
-                if (dcv.length > 0)
+
+                // normalise the values as we insert into the sort map
+                if (value != null && value.value != null)
                 {
-                    // Set it as the current metadata value to use
-                    // and add it to the map
-                    value = dcv[0];
-                    
-                    if (itemMDMap != null)
-                        itemMDMap.put(metadata, dcv[0]);
+                    String nValue = OrderFormat.makeSortString(value.value, value.language, so.getType());
+                    sortMap.put(key, nValue);
                 }
             }
             
-            // normalise the values as we insert into the sort map
-            if (value != null && value.value != null)
-            {
-                String nValue = BrowseOrder.makeSortString(value.value, value.language, so.getType());
-                sortMap.put(key, nValue);
-            }
+            return sortMap;
         }
-        return sortMap;
+        catch (SortException se)
+        {
+            throw new BrowseException("Error in SortOptions", se);
+        }
     }
     
     /**
@@ -696,27 +707,34 @@
 	private void prepTables()
     	throws BrowseException
     {
-    	// first, erase the existing indexes
-    	clearDatabase();
-    	
-    	createItemTables();
-    	
-    	// for each current browse index, make all the relevant tables
-    	for (int i = 0; i < bis.length; i++)
+        try
         {
-    		createTables(bis[i]);
-    		
-    		// prepare some CLI output
-    		StringBuffer logMe = new StringBuffer();
-    		for (SortOption so : SortOption.getSortOptions())
-    		{
-    			logMe.append(" " + so.getMetadata() + " ");
-    		}
-    		
-    		output.message("Creating browse index " + bis[i].getName() + 
-    				": index by " + bis[i].getMetadata() + 
-    				" sortable by: " + logMe.toString());
+            // first, erase the existing indexes
+            clearDatabase();
+
+            createItemTables();
+
+            // for each current browse index, make all the relevant tables
+            for (int i = 0; i < bis.length; i++)
+            {
+                createTables(bis[i]);
+
+                // prepare some CLI output
+                StringBuffer logMe = new StringBuffer();
+                for (SortOption so : SortOption.getSortOptions())
+                {
+                    logMe.append(" " + so.getMetadata() + " ");
+                }
+
+                output.message("Creating browse index " + bis[i].getName() +
+                        ": index by " + bis[i].getMetadata() +
+                        " sortable by: " + logMe.toString());
+            }
         }
+        catch (SortException se)
+        {
+            throw new BrowseException("Error in SortOptions", se);
+        }
     }
     
 	/**
@@ -884,6 +902,10 @@
                 context.commit();
             }
         }
+        catch (SortException se)
+        {
+            throw new BrowseException("Error in SortOptions", se);
+        }
         catch (SQLException e)
         {
             log.error("caught exception: ", e);
@@ -994,6 +1016,10 @@
 				context.commit();
 			}
 		}
+        catch (SortException se)
+        {
+            throw new BrowseException("Error in SortOptions", se);
+        }
 		catch (SQLException e)
 		{
 			log.error("caught exception: ", e);

Deleted: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/SortOption.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/SortOption.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/SortOption.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -1,376 +0,0 @@
-/*
- * SortOption.java
- *
- * Copyright (c) 2002-2007, Hewlett-Packard Company and Massachusetts
- * Institute of Technology.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of the Hewlett-Packard Company nor the name of the
- * Massachusetts Institute of Technology nor the names of their
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- */
-package org.dspace.browse;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.dspace.core.ConfigurationManager;
-
-/**
- * Class to mediate with the sort configuration
- * 
- * @author Richard Jones
- *
- */
-public class SortOption
-{
-    public static final String ASCENDING  = "ASC";
-    public static final String DESCENDING = "DESC";
-
-    /** the sort configuration number */
-	private int number;
-	
-	/** the name of the sort */
-	private String name;
-	
-	/** the metadata field to sort on */
-	private String metadata;
-	
-	/** the type of data we are sorting by */
-	private String type;
-	
-	/** the metadata broken down into bits for convenience */
-	private String[] mdBits;
-
-    /** should the sort option be visible for user selection */
-    private boolean visible;
-
-    /** the sort options available for this index */
-    private static Set<SortOption> sortOptionsSet = null;
-    private static Map<Integer, SortOption> sortOptionsMap = null;
-	
-	/**
-	 * Construct a new SortOption object with the given parameters
-	 * 
-	 * @param number
-	 * @param name
-	 * @param md
-	 * @param type
-	 * @throws BrowseException
-	 */
-	public SortOption(int number, String name, String md, String type)
-		throws BrowseException
-	{
-		this.name = name;
-		this.type = type;
-		this.metadata = md;
-		this.number = number;
-        this.visible = true;
-        generateMdBits();
-	}
-
-	/**
-	 * Construct a new SortOption object using the definition from the configuration
-	 * 
-	 * @param number
-	 * @param definition
-	 * @throws BrowseException
-	 */
-	public SortOption(int number, String definition)
-		throws BrowseException
-	{
-		this.number = number;
-		
-		String rx = "(\\w+):([\\w\\.\\*]+):(\\w+):?(\\w*)";
-        Pattern pattern = Pattern.compile(rx);
-        Matcher matcher = pattern.matcher(definition);
-        
-        if (!matcher.matches())
-        {
-            throw new BrowseException("Sort Order configuration is not valid: webui.browse.sort-order." + 
-                    number + " = " + definition);
-        }
-        
-        name = matcher.group(1);
-        metadata = matcher.group(2);
-        type = matcher.group(3);
-
-        // If the option is configured to be hidden, then set the visible flag to false
-        // otherwise, flag it as visible (true)
-        if (matcher.groupCount() > 3 && "hide".equalsIgnoreCase(matcher.group(4)))
-            visible = false;
-        else
-            visible = true;
-
-        generateMdBits();
-	}
-
-    /**
-	 * @return Returns the metadata.
-	 */
-	public String getMetadata()
-	{
-		return metadata;
-	}
-
-	/**
-	 * @param metadata The metadata to set.
-	 */
-	public void setMetadata(String metadata)
-	{
-		this.metadata = metadata;
-	}
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * @param name The name to set.
-	 */
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-
-	/**
-	 * @return Returns the type.
-	 */
-	public String getType()
-	{
-		return type;
-	}
-
-	/**
-	 * @param type The type to set.
-	 */
-	public void setType(String type)
-	{
-		this.type = type;
-	}
-
-	/**
-	 * @return Returns the number.
-	 */
-	public int getNumber()
-	{
-		return number;
-	}
-
-	/**
-	 * @param number The number to set.
-	 */
-	public void setNumber(int number)
-	{
-		this.number = number;
-	}
-
-    /**
-     * Should this sort option be made visible in the UI
-     * @return true if visible, false otherwise
-     */
-    public boolean isVisible()
-    {
-        return visible;
-    }
-
-    /**
-	 * @return	a 3 element array of the metadata bits
-	 */
-	public String[] getMdBits()
-    {
-    	return mdBits;
-    }
-    
-	/**
-	 * Tell the class to generate the metadata bits
-	 * 
-	 * @throws BrowseException
-	 */
-    public void generateMdBits()
-    	throws BrowseException
-    {
-    	try
-    	{
-    		mdBits = interpretField(metadata, null);
-    	}
-    	catch(IOException e)
-    	{
-    		throw new BrowseException(e);
-    	}
-    }
-    
-    /**
-     * Take a string representation of a metadata field, and return it as an array.
-     * This is just a convenient utility method to basically break the metadata 
-     * representation up by its delimiter (.), and stick it in an array, inserting
-     * the value of the init parameter when there is no metadata field part.
-     * 
-     * @param mfield	the string representation of the metadata
-     * @param init	the default value of the array elements
-     * @return	a three element array with schema, element and qualifier respectively
-     */
-    public String[] interpretField(String mfield, String init)
-    	throws IOException
-    {
-    	StringTokenizer sta = new StringTokenizer(mfield, ".");
-    	String[] field = {init, init, init};
-    	
-    	int i = 0;
-    	while (sta.hasMoreTokens())
-    	{
-    		field[i++] = sta.nextToken();
-    	}
-    	
-    	// error checks to make sure we have at least a schema and qualifier for both
-    	if (field[0] == null || field[1] == null)
-    	{
-    		throw new IOException("at least a schema and element be " +
-    				"specified in configuration.  You supplied: " + mfield);
-    	}
-    	
-    	return field;
-    }
-    
-    /**
-     * Is this a date field
-     * 
-     * @return
-     */
-    public boolean isDate()
-    {
-    	if (type != null)
-    	{
-    		if ("date".equals(type))
-    		{
-    			return true;
-    		}
-    	}
-    	return false;
-    }
-    
-    /**
-     * Is the default sort option
-     * 
-     * @return
-     */
-    public boolean isDefault()
-    {
-    	if (number == 0)
-    	{
-    		return true;
-    	}
-    	return false;
-    }
-
-    /**
-     * @return	a map of the configured sort options
-     */
-    public static Map<Integer, SortOption> getSortOptionsMap() throws BrowseException
-    {
-        if (SortOption.sortOptionsMap != null)
-            return SortOption.sortOptionsMap;
-        
-        SortOption.sortOptionsMap = new HashMap<Integer, SortOption>();
-        synchronized (SortOption.sortOptionsMap)
-        {
-            for (SortOption so : SortOption.getSortOptions())
-            {
-                SortOption.sortOptionsMap.put(new Integer(so.getNumber()), so);
-            }
-        }
-        
-    	return SortOption.sortOptionsMap;
-    }
-
-    /**
-     * Return all the configured sort options
-     * @return
-     * @throws BrowseException
-     */
-    public static Set<SortOption> getSortOptions() throws BrowseException
-    {
-        if (SortOption.sortOptionsSet != null)
-            return SortOption.sortOptionsSet;
-        
-        SortOption.sortOptionsSet = new HashSet<SortOption>();
-        synchronized (SortOption.sortOptionsSet)
-        {
-            int idx = 1;
-            String option;
-
-            while ( ((option = ConfigurationManager.getProperty("webui.browse.sort-option." + idx))) != null)
-            {
-                SortOption so = new SortOption(idx, option);
-                SortOption.sortOptionsSet.add(so);
-                idx++;
-            }
-        }
-
-        return SortOption.sortOptionsSet;
-    }
-    
-    /**
-     * Get the defined sort option by number (.1, .2, etc)
-     * @param number
-     * @return
-     * @throws BrowseException
-     */
-    public static SortOption getSortOption(int number) throws BrowseException
-    {
-        for (SortOption so : SortOption.getSortOptions())
-        {
-            if (so.getNumber() == number)
-                return so;
-        }
-        
-        return null;
-    }
-    
-    /**
-     * Get the default sort option - initially, just the first one defined
-     * @return
-     * @throws BrowseException
-     */
-    public static SortOption getDefaultSortOption() throws BrowseException
-    {
-        for (SortOption so : getSortOptions())
-            return so;
-        
-        return null;
-    }
-}

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/content/ItemComparator.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/content/ItemComparator.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/content/ItemComparator.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -45,7 +45,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.dspace.browse.BrowseOrder;
+import org.dspace.sort.OrderFormat;
 
 /**
  * Compare two Items by their DCValues.
@@ -256,6 +256,6 @@
             return value.value;
         }
 
-        return BrowseOrder.makeSortString(value.value, value.language, BrowseOrder.TITLE);
+        return OrderFormat.makeSortString(value.value, value.language, OrderFormat.TITLE);
     }
 }

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSAnalyzer.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSAnalyzer.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSAnalyzer.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -48,6 +48,7 @@
 import org.apache.lucene.analysis.StopFilter;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.standard.StandardFilter;
+import org.dspace.core.ConfigurationManager;
 
 /**
  * Custom Lucene Analyzer that combines the standard filter, lowercase filter,
@@ -94,4 +95,14 @@
 
         return result;
     }
+
+    public int getPositionIncrementGap(String fieldName)
+    {
+        // If it is the default field, or bounded fields is turned off in the config, return the default value
+        if ("default".equalsIgnoreCase(fieldName) || !ConfigurationManager.getBooleanProperty("search.boundedfields", false))
+            return super.getPositionIncrementGap(fieldName);
+
+        // Not the default field, and we want bounded fields, so return an large gap increment
+        return 10;
+    }
 }

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSIndexer.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSIndexer.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSIndexer.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -47,16 +47,22 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Calendar;
+import java.util.TimeZone;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.PosixParser;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
+import org.apache.lucene.document.DateTools;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.Term;
@@ -75,6 +81,8 @@
 import org.dspace.core.Email;
 import org.dspace.core.LogManager;
 import org.dspace.handle.HandleManager;
+import org.dspace.sort.SortOption;
+import org.dspace.sort.OrderFormat;
 
 /**
  * DSIndexer contains the methods that index Items and their metadata,
@@ -111,6 +119,20 @@
         String schema;
         String element;
         String qualifier = null;
+        String type = "text";
+
+        IndexConfig()
+        {
+        }
+
+        IndexConfig(String indexName, String schema, String element, String qualifier, String type)
+        {
+            this.indexName = indexName;
+            this.schema = schema;
+            this.element = element;
+            this.qualifier = qualifier;
+            this.type = type;
+        }
     }
     
     private static String index_directory = ConfigurationManager.getProperty("search.dir");
@@ -121,9 +143,23 @@
     /** The analyzer for this DSpace instance */
     private static Analyzer analyzer = null;
 
-    // Static initialisation of index configuration /
-    private static IndexConfig[] indexConfigArr = new IndexConfig[0];
-    
+    /** Static initialisation of index configuration */
+    /** Includes backwards compatible default configuration */
+    private static IndexConfig[] indexConfigArr = new IndexConfig[]
+    {
+        new IndexConfig("author",     "dc", "contributor", Item.ANY,          "text") ,
+        new IndexConfig("author",     "dc", "creator",     Item.ANY,          "text"),
+        new IndexConfig("author",     "dc", "description", "statementofresponsibility", "text"),
+        new IndexConfig("title",      "dc", "title",       Item.ANY,          "text"),
+        new IndexConfig("keyword",    "dc", "subject",     Item.ANY,          "text"),
+        new IndexConfig("abstract",   "dc", "description", "abstract",        "text"),
+        new IndexConfig("abstract",   "dc", "description", "tableofcontents", "text"),
+        new IndexConfig("series",     "dc", "relation",    "ispartofseries",  "text"),
+        new IndexConfig("mimetype",   "dc", "format",      "mimetype",        "text"),
+        new IndexConfig("sponsor",    "dc", "description", "sponsorship",     "text"),
+        new IndexConfig("identifier", "dc", "identifier",  Item.ANY,          "text")
+    };
+
     static {
     	
     	// calculate maxfieldlength
@@ -133,7 +169,7 @@
         }
     	
         // read in indexes from the config
-        ArrayList indexConfigList = new ArrayList();
+        ArrayList<String> indexConfigList = new ArrayList<String>();
 
         // read in search.index.1, search.index.2....
         for (int i = 1; ConfigurationManager.getProperty("search.index." + i) != null; i++)
@@ -148,7 +184,7 @@
             for (int i = 0; i < indexConfigList.size(); i++)
             {
                 indexConfigArr[i] = new IndexConfig();
-                String index = (String) indexConfigList.get(i);
+                String index = indexConfigList.get(i);
     
                 String[] configLine = index.split(":");
                 
@@ -172,6 +208,11 @@
                     throw new RuntimeException(
                             "Malformed configuration line: search.index." + i);
                 }
+
+                if (configLine.length > 2)
+                {
+                    indexConfigArr[i].type = configLine[2];
+                }
             }
         }
         
@@ -246,7 +287,7 @@
                 Item item = (Item)dso;
                 if (item.isArchived() && !item.isWithdrawn())
                 {
-                    if(requiresIndexing(handle, ((Item)dso).getLastModified()) || force)
+                    if (requiresIndexing(handle, ((Item)dso).getLastModified()) || force)
                     {
                         Document doc = buildDocument(context, (Item) dso);
 
@@ -696,7 +737,7 @@
 	 * to determine if the index is stale.
 	 * 
 	 * @param handle
-	 * @param dso
+	 * @param lastModified
 	 * @return
 	 * @throws SQLException
 	 * @throws IOException
@@ -810,17 +851,17 @@
     throws SQLException, IOException
     {
         // Create Lucene Document
-        Document doc = buildDocument(Constants.COMMUNITY, community.getHandle(), null);
+        Document doc = buildDocument(Constants.COMMUNITY, community.getID(), community.getHandle(), null);
 
         // and populate it
         String name = community.getMetadata("name");
         
-        if(name != null)
+        if (name != null)
         {
-        	doc.add(new Field("name", name, Field.Store.YES, Field.Index.TOKENIZED));
-        	doc.add(new Field("default", name, Field.Store.YES, Field.Index.TOKENIZED));
+        	doc.add(new Field("name", name, Field.Store.NO, Field.Index.TOKENIZED));
+        	doc.add(new Field("default", name, Field.Store.NO, Field.Index.TOKENIZED));
         }
-        
+
         return doc;
     }
 
@@ -839,15 +880,15 @@
         String location_text = buildCollectionLocationString(context, collection);
 
         // Create Lucene Document
-        Document doc = buildDocument(Constants.COLLECTION, collection.getHandle(), location_text);
+        Document doc = buildDocument(Constants.COLLECTION, collection.getID(), collection.getHandle(), location_text);
 
         // and populate it
         String name = collection.getMetadata("name");
         
-        if(name != null)
+        if (name != null)
         {
-        	doc.add(new Field("name", name, Field.Store.YES, Field.Index.TOKENIZED));
-        	doc.add(new Field("default", name, Field.Store.YES, Field.Index.TOKENIZED));
+        	doc.add(new Field("name", name, Field.Store.NO, Field.Index.TOKENIZED));
+        	doc.add(new Field("default", name, Field.Store.NO, Field.Index.TOKENIZED));
         }
         
         return doc;
@@ -866,7 +907,6 @@
     private static Document buildDocument(Context context, Item item) 
     throws SQLException, IOException
     {
-    
     	String handle = item.getHandle();
     	
     	if(handle == null)
@@ -877,7 +917,7 @@
     	// get the location string (for searching by collection & community)
         String location = buildItemLocationString(context, item);
 
-        Document doc = buildDocument(Constants.ITEM, handle, location);
+        Document doc = buildDocument(Constants.ITEM, item.getID(), handle, location);
 
         log.debug("Building Item: " + handle);
 
@@ -902,131 +942,70 @@
                     mydc = item.getMetadata(indexConfigArr[i].schema, indexConfigArr[i].element, indexConfigArr[i].qualifier, Item.ANY);
                 }
 
-                // put them all from an array of strings to one string for
-                // writing out pack all of the arrays of DCValues into plain
-                // text strings for the indexer
-                String content_text = "";
-
                 for (j = 0; j < mydc.length; j++)
                 {
-                    content_text = new String(content_text + mydc[j].value + " ");
+                    if (!StringUtils.isEmpty(mydc[j].value))
+                    {
+                        if ("timestamp".equalsIgnoreCase(indexConfigArr[i].type))
+                        {
+                            Date d = toDate(mydc[j].value);
+                            if (d != null)
+                            {
+                                doc.add( new Field(indexConfigArr[i].indexName,
+                                                   DateTools.dateToString(d, DateTools.Resolution.SECOND),
+                                                   Field.Store.NO,
+                                                   Field.Index.TOKENIZED));
+                            }
+                        }
+                        else if ("date".equalsIgnoreCase(indexConfigArr[i].type))
+                        {
+                            Date d = toDate(mydc[j].value);
+                            if (d != null)
+                            {
+                                doc.add( new Field(indexConfigArr[i].indexName,
+                                                   DateTools.dateToString(d, DateTools.Resolution.DAY),
+                                                   Field.Store.NO,
+                                                   Field.Index.TOKENIZED));
+                            }
+                        }
+                        else
+                        {
+                            // TODO: use a delegate to allow custom 'types' to be used to reformat the field
+                            doc.add( new Field(indexConfigArr[i].indexName,
+                                               mydc[j].value,
+                                               Field.Store.NO,
+                                               Field.Index.TOKENIZED));
+                        }
+                        
+                        doc.add( new Field("default", mydc[j].value, Field.Store.NO, Field.Index.TOKENIZED));
+                    }
                 }
+            }
+        }
 
-                // arranges content with fields in ArrayLists with same index to
-                // put
-                // into hash later
-                k = fields.indexOf(indexConfigArr[i].indexName);
+        log.debug("  Added Metadata");
 
-                if (k < 0)
+        try
+        {
+            // Now get the configured sort options, and add those as untokenized fields
+            // Note that we will use the sort order delegates to normalise the values written
+            for (SortOption so : SortOption.getSortOptions())
+            {
+                String[] somd = so.getMdBits();
+                DCValue[] dcv = item.getMetadata(somd[0], somd[1], somd[2], Item.ANY);
+                if (dcv.length > 0)
                 {
-                    fields.add(indexConfigArr[i].indexName);
-                    content.add(content_text);
+                    String value = OrderFormat.makeSortString(dcv[0].value, dcv[0].language, so.getType());
+                    doc.add( new Field("sort_" + so.getName(), value, Field.Store.NO, Field.Index.UN_TOKENIZED) );
                 }
-                else
-                {
-                    content_text = new String(content_text
-                            + (String) content.get(k) + " ");
-                    content.set(k, content_text);
-                }
             }
-
-            // build the hash
-            for (int i = 0; i < fields.size(); i++)
-            {
-            
-            	doc.add(
-            		new Field(
-                                    (String) fields.get(i),
-            			(String) content.get(i),
-            			Field.Store.YES, Field.Index.TOKENIZED
-                    ));
-    
-            	doc.add(new Field("default", (String) content.get(i), Field.Store.YES, Field.Index.TOKENIZED));
-            }
         }
-        else
-        // if no search indexes found in cfg file, for backward compatibility
+        catch (Exception e)
         {
-            // extract metadata (ANY is wildcard from Item class)
-            DCValue[] authors = item.getDC("contributor", Item.ANY, Item.ANY);
-            for (j = 0; j < authors.length; j++)
-            {
-            	doc.add(new Field("author", authors[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            	doc.add(new Field("default", authors[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            }
-
-            DCValue[] creators = item.getDC("creator", Item.ANY, Item.ANY);
-            for (j = 0; j < creators.length; j++) //also authors
-            {
-                doc.add(new Field("author", creators[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-                doc.add(new Field("default", creators[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            }
-
-            DCValue[] sors = item.getDC("description", "statementofresponsibility", Item.ANY);
-            for (j = 0; j < sors.length; j++) //also authors
-            {
-                doc.add(new Field("author", sors[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-                doc.add(new Field("default", sors[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            }
-
-            DCValue[] titles = item.getDC("title", Item.ANY, Item.ANY);
-            for (j = 0; j < titles.length; j++)
-            {
-            	doc.add(new Field("title", titles[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            	doc.add(new Field("default", titles[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            }
-
-            DCValue[] keywords = item.getDC("subject", Item.ANY, Item.ANY);
-            for (j = 0; j < keywords.length; j++)
-            {
-            	doc.add(new Field("keyword", keywords[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            	doc.add(new Field("default", keywords[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            }
-
-            DCValue[] abstracts = item.getDC("description", "abstract", Item.ANY);
-            for (j = 0; j < abstracts.length; j++)
-            {
-            	doc.add(new Field("abstract", abstracts[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            	doc.add(new Field("default", abstracts[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            }
-
-            DCValue[] tocs = item.getDC("description", "tableofcontents", Item.ANY);
-            for (j = 0; j < tocs.length; j++)
-            {
-            	doc.add(new Field("abstract", tocs[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            	doc.add(new Field("default", tocs[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            }
-
-            DCValue[] series = item.getDC("relation", "ispartofseries", Item.ANY);
-            for (j = 0; j < series.length; j++)
-            {
-            	doc.add(new Field("series", series[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            	doc.add(new Field("default", series[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            }
-
-            DCValue[] mimetypes = item.getDC("format", "mimetype", Item.ANY);
-            for (j = 0; j < mimetypes.length; j++)
-            {
-            	doc.add(new Field("mimetype", mimetypes[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            	doc.add(new Field("default", mimetypes[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            }
-
-            DCValue[] sponsors = item.getDC("description", "sponsorship", Item.ANY);
-            for (j = 0; j < sponsors.length; j++)
-            {
-            	doc.add(new Field("sponsor", sponsors[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            	doc.add(new Field("default", sponsors[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            }
-
-            DCValue[] identifiers = item.getDC("identifier", Item.ANY, Item.ANY);
-            for (j = 0; j < identifiers.length; j++)
-            {
-            	doc.add(new Field("identifier", identifiers[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            	doc.add(new Field("default", identifiers[j].value, Field.Store.YES, Field.Index.TOKENIZED));
-            }
+            log.error(e.getMessage(),e);
         }
 
-        log.debug("  Added Metadata");
+        log.debug("  Added Sorting");
 
         try
         {
@@ -1077,11 +1056,11 @@
      * Create Lucene document with all the shared fields initialized.
      * 
      * @param type Type of DSpace Object
-     * @param handle
-     * @param location
-     * @return
+     * @param id
+     *@param handle
+     * @param location @return
      */
-    private static Document buildDocument(int type, String handle, String location)
+    private static Document buildDocument(int type, int id, String handle, String location)
     {
         Document doc = new Document();
 
@@ -1089,10 +1068,14 @@
         // (not tokenized, but it is indexed)
         doc.add(new Field(LAST_INDEXED_FIELD, Long.toString(System.currentTimeMillis()), Field.Store.YES, Field.Index.UN_TOKENIZED));
 
-        
+        // KEPT FOR BACKWARDS COMPATIBILITY
         // do location, type, handle first
         doc.add(new Field("type", Integer.toString(type), Field.Store.YES, Field.Index.NO));
 
+        // New fields to weaken the dependence on handles, and allow for faster list display
+        doc.add(new Field("search.resourcetype", Integer.toString(type), Field.Store.YES, Field.Index.NO));
+        doc.add(new Field("search.resourceid",   Integer.toString(id),   Field.Store.YES, Field.Index.NO));
+
         // want to be able to search for handle, so use keyword
         // (not tokenized, but it is indexed)
         if (handle != null)
@@ -1105,17 +1088,72 @@
             doc.add(new Field("handle", handle, Field.Store.YES, Field.Index.UN_TOKENIZED));
 
             // add to full text index
-            doc.add(new Field("default", handle, Field.Store.YES, Field.Index.TOKENIZED));
+            doc.add(new Field("default", handle, Field.Store.NO, Field.Index.TOKENIZED));
         }
 
         if(location != null)
         {
-            doc.add(new Field("location", location, Field.Store.YES, Field.Index.TOKENIZED));
-    	    doc.add(new Field("default", location, Field.Store.YES, Field.Index.TOKENIZED));
+            doc.add(new Field("location", location, Field.Store.NO, Field.Index.TOKENIZED));
+    	    doc.add(new Field("default", location, Field.Store.NO, Field.Index.TOKENIZED));
         }
 
         return doc;
     }
 
+    /**
+     * Helper function to retrieve a date using a best guess of the potential date encodings on a field
+     *  
+     * @param t
+     * @return
+     */
+    private static Date toDate(String t)
+    {
+        SimpleDateFormat[] dfArr;
 
+        // Choose the likely date formats based on string length
+        switch (t.length())
+        {
+            case 4:
+                dfArr = new SimpleDateFormat[] { new SimpleDateFormat("yyyy") };
+                break;
+            case 6:
+                dfArr = new SimpleDateFormat[] { new SimpleDateFormat("yyyyMM") };
+                break;
+            case 7:
+                dfArr = new SimpleDateFormat[] { new SimpleDateFormat("yyyy-MM") };
+                break;
+            case 8:
+                dfArr = new SimpleDateFormat[] { new SimpleDateFormat("yyyyMMdd"), new SimpleDateFormat("yyyy MMM") };
+                break;
+            case 10:
+                dfArr = new SimpleDateFormat[] { new SimpleDateFormat("yyyy-MM-dd") };
+                break;
+            case 11:
+                dfArr = new SimpleDateFormat[] { new SimpleDateFormat("yyyy MMM dd") };
+                break;
+            case 20:
+                dfArr = new SimpleDateFormat[] { new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'") };
+                break;
+            default:
+                dfArr = new SimpleDateFormat[] { new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") };
+                break;
+        }
+
+
+        for (SimpleDateFormat df : dfArr)
+        {
+            try
+            {
+                // Parse the date
+                df.setCalendar(Calendar.getInstance(TimeZone.getTimeZone("UTC")));
+                return df.parse(t);
+            }
+            catch (ParseException pe)
+            {
+                log.error("Unable to parse date format", pe);
+            }
+        }
+        
+        return null;
+    }
 }

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSQuery.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSQuery.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSQuery.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -40,7 +40,6 @@
 package org.dspace.search;
 
 import java.io.IOException;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -56,6 +55,8 @@
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.Searcher;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.SortField;
 import org.apache.oro.text.perl.Perl5Util;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
@@ -63,6 +64,7 @@
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
+import org.dspace.sort.SortOption;
 
 // issues
 // need to filter query string for security
@@ -123,10 +125,12 @@
         String querystring = args.getQuery();
         QueryResults qr = new QueryResults();
         List hitHandles = new ArrayList();
-        List hitTypes = new ArrayList();
+        List hitIds     = new ArrayList();
+        List hitTypes   = new ArrayList();
 
         // set up the QueryResults object
         qr.setHitHandles(hitHandles);
+        qr.setHitIds(hitIds);
         qr.setHitTypes(hitTypes);
         qr.setStart(args.getStart());
         qr.setPageSize(args.getPageSize());
@@ -159,8 +163,18 @@
             }
             
             Query myquery = qp.parse(querystring);
-            Hits hits = searcher.search(myquery);
+            Hits hits = null;
 
+            if (args.getSortOption() == null)
+            {
+                hits = searcher.search(myquery, new Sort(new SortField[] { new SortField("type"), SortField.FIELD_SCORE }));
+            }
+            else
+            {
+                SortField[] sortFields = new SortField[] { new SortField("type"), new SortField("sort_" + args.getSortOption().getName(), SortOption.DESCENDING.equals(args.getSortOrder())), SortField.FIELD_SCORE };
+                hits = searcher.search(myquery, new Sort(sortFields));
+            }
+            
             // set total number of hits
             qr.setHitCount(hits.length());
 
@@ -181,52 +195,47 @@
                 {
                     Document d = hits.doc(i);
 
+                    String resourceId   = d.get("search.resourceid");
+                    String resourceType = d.get("search.resourcetype");
+
                     String handleText = d.get("handle");
-                    String handletype = d.get("type");
+                    String handleType = d.get("type");
 
-                    hitHandles.add(handleText);
+                    switch (Integer.parseInt( resourceType != null ? resourceType : handleType))
+                    {
+                        case Constants.ITEM:
+                            hitTypes.add(new Integer(Constants.ITEM));
+                            break;
 
-                    if (handletype.equals("" + Constants.ITEM))
-                    {
-                        hitTypes.add(new Integer(Constants.ITEM));
+                        case Constants.COLLECTION:
+                            hitTypes.add(new Integer(Constants.COLLECTION));
+                            break;
+
+                        case Constants.COMMUNITY:
+                            hitTypes.add(new Integer(Constants.COMMUNITY));
+                            break;
                     }
-                    else if (handletype.equals("" + Constants.COLLECTION))
-                    {
-                        hitTypes.add(new Integer(Constants.COLLECTION));
-                    }
-                    else if (handletype.equals("" + Constants.COMMUNITY))
-                    {
-                        hitTypes.add(new Integer(Constants.COMMUNITY));
-                    }
-                    else
-                    {
-                        // error! unknown type!
-                    }
+
+                    hitHandles.add( handleText );
+                    hitIds.add( resourceId == null ? null: Integer.parseInt(resourceId) );
                 }
             }
         }
         catch (NumberFormatException e)
         {
-            log
-                    .warn(LogManager.getHeader(c, "Number format exception", ""
-                            + e));
-
+            log.warn(LogManager.getHeader(c, "Number format exception", "" + e));
             qr.setErrorMsg("Number format exception");
         }
         catch (ParseException e)
         {
             // a parse exception - log and return null results
             log.warn(LogManager.getHeader(c, "Invalid search string", "" + e));
-
             qr.setErrorMsg("Invalid search string");
         }
         catch (TokenMgrError tme)
         {
             // Similar to parse exception
-            log
-                    .warn(LogManager.getHeader(c, "Invalid search string", ""
-                            + tme));
-
+            log.warn(LogManager.getHeader(c, "Invalid search string", "" + tme));
             qr.setErrorMsg("Invalid search string");
         }
         catch(BooleanQuery.TooManyClauses e)
@@ -387,6 +396,25 @@
         }
     }
 
+    /**
+     * Close any IndexSearcher that is currently open.
+     */
+    public static void close()
+    {
+        if (searcher != null)
+        {
+            try
+            {
+                searcher.close();
+                searcher = null;
+            }
+            catch (IOException ioe)
+            {
+                log.error("DSQuery: Unable to close open IndexSearcher", ioe);
+            }
+        }
+    }
+    
     public static void main(String[] args)
     {
         if (args.length > 0)

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/QueryArgs.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/QueryArgs.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/QueryArgs.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -47,6 +47,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.dspace.core.Constants;
+import org.dspace.sort.SortOption;
 
 import org.apache.oro.text.perl.Perl5Util;
 
@@ -64,6 +65,10 @@
 
     private int pageSize = 10;
 
+    private SortOption sortOption = null;
+
+    private String sortOrder = SortOption.ASCENDING;
+
     /**
      * set the query string
      * 
@@ -128,6 +133,26 @@
         return pageSize;
     }
 
+    public SortOption getSortOption()
+    {
+        return sortOption;
+    }
+
+    public void setSortOption(SortOption sortOption)
+    {
+        this.sortOption = sortOption;
+    }
+
+    public String getSortOrder()
+    {
+        return sortOrder;
+    }
+
+    public void setSortOrder(String sortOrder)
+    {
+        this.sortOrder = sortOrder;
+    }
+
     /**
      * Builds an advanced-query description string.
      *

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/QueryResults.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/QueryResults.java	2008-01-10 10:20:48 UTC (rev 2507)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/QueryResults.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -56,8 +56,8 @@
     private List hitHandles; // handles of content (items, collections,
                              // communities)
 
-    private List hitTypes; // Integers from Constants defng types of
-                           // corresponding handles
+    private List hitTypes; // Resource type - from Constants
+    private List hitIds;   // Resource ids 
 
     private String errorMsg; //error string, if there is one
 
@@ -112,6 +112,18 @@
         return hitHandles;
     }
 
+    /** set the List of ids corresponding to hits */
+    public void setHitIds(List myHits)
+    {
+        hitIds = myHits;
+    }
+
+    /** get the List of handles corresponding to hits */
+    public List getHitIds()
+    {
+        return hitIds;
+    }
+
     /** set the List of types corresponding to handles */
     public void setHitTypes(List newTypes)
     {

Copied: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java (from rev 2488, branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrder.java)
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java	                        (rev 0)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java	2008-01-10 14:03:36 UTC (rev 2508)
@@ -0,0 +1,146 @@
+/*
+ * OrderFormat.java
+ *
+ * Version: $Revision: 1.0 $
+ *
+ * Date: $Date: 2007/03/02 11:22:13 $
+ *
+ * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+
+package org.dspace.sort;
+
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.dspace.core.PluginManager;
+import org.dspace.sort.OrderFormatDelegate;
+import org.dspace.sort.OrderFormatAuthor;
+import org.dspace.sort.OrderFormatTitle;
+import org.dspace.sort.OrderFormatText;
+
+/**
+ * Class implementing static helpers for anywhere that interacts with the sort columns
+ * (ie. ItemsByAuthor.sort_author, ItemsByTitle.sort_title)
+ *
+ * This class maps index 'types' to delegates that implement the sort string creation
+ * 
+ * Types can be defined or configured using the plugin manager:
+ * 
+ * plugin.named.org.dspace.sort.OrderFormatDelegate=
+ * 		org.dspace.sort.OrderFormatTitleMarc21=title
+ * 		org.dspace.sort.OrderFormatAuthor=author
+ * 
+ * The following standard types have been defined by default, but can be reconfigured
+ * via the plugin manager:
+ * 
+ * author	= org.dspace.sort.OrderFormatAuthor
+ * title	= org.dspace.sort.OrderFormatTitle
+ * text 	= org.dspace.sort.OrderFormatText
+ * 
+ * IMPORTANT - If you change any of the orderings, you need to rebuild the browse sort columns
+ * (ie. run 'index-all', or 'dsrun org.dspace.browse.InitializeBrowse')
+ * 
+ * @author Graham Triggs
+ * @version $Revision: 1.0 $
+ */
+public class OrderFormat
+{
+	private final static Logger log = LogManager.getLogger(OrderFormat.class);
+
+	public final static String AUTHOR = "author";
+	public final static String TITLE  = "title";
+	public final static String TEXT   = "text";
+	
+	// Array of all available order delegates - avoids excessive calls to plugin manager
+	private final static String[] delegates = PluginManager.getAllPluginNames(OrderFormatDelegate.class);
+
+    private final static OrderFormatDelegate authorDelegate = new OrderFormatAuthor();
+    private final static OrderFormatDelegate titleDelegate  = new OrderFormatTitle();
+    private final static OrderFormatDelegate textDelegate   = new OrderFormatText();
+    
+    /**
+     * Generate a sort string for the given DC metadata
+     */
+    public static String makeSortString(String value, String language, String type)
+    {
+    	OrderFormatDelegate delegate = null;
+    	
+    	// If a named index has been supplied
+    	if (type != null && type.length() > 0)
+    	{
+    		// Use a delegate if one is configured
+        	if ((delegate = OrderFormat.getDelegate(type)) != null)
+        	{
+        		return delegate.makeSortString(value, language);
+        	}
+    	}
+    	
+      	// No delegates found, so apply defaults
+    	if (type.equalsIgnoreCase(OrderFormat.AUTHOR) && authorDelegate != null)
+    	{
+    		return authorDelegate.makeSortString(value, language);
+    	}
+
+    	if (type.equalsIgnoreCase(OrderFormat.TITLE) && titleDelegate != null)
+    	{
+    		return titleDelegate.makeSortString(value, language);
+    	}
+
+    	if (type.equalsIgnoreCase(OrderFormat.TEXT) && textDelegate != null)
+    	{
+    		return textDelegate.makeSortString(value, language);
+    	}
+    	
+    	return value;
+    }
+
+    /**
+     * Retrieve the named delegate
+     */
+    private static OrderFormatDelegate getDelegate(String name)
+    {
+   		if (name != null && name.length() > 0)
+   		{
+   			// Check the cached array of names to see if the delegate has been configured
+	   		for (int idx = 0; idx < delegates.length; idx++)
+	   		{
+	   			if (delegates[idx].equals(name))
+	   			{
+	   				return (OrderFormatDelegate)PluginManager.getNamedPlugin(OrderFormatDelegate.class, name);
+	   			}
+	   		}
+   		}
+   		
+    	return null;
+    }
+}

Copied: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/sort/OrderFormatAuthor.java (from rev 2488, branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/browse/BrowseOrderAuthor.java)
===================================================================

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2529
          http://dspace.svn.sourceforge.net/dspace/?rev=2529&view=rev
Author:   grahamtriggs
Date:     2008-01-15 05:49:52 -0800 (Tue, 15 Jan 2008)

Log Message:
-----------
Fix problem with DatabaseManager retrieving column information if the database contains multiple schemas

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-01-15 13:37:06 UTC (rev 2528)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-01-15 13:49:52 UTC (rev 2529)
@@ -41,6 +41,11 @@
 #db.username = dspace
 #db.password = dspace
 
+# Schema name - if your database contains multiple schemas, you can avoid problems with
+# retrieving the definitions of duplicate object names by specifying
+# the schema name here that is used for DSpace by uncommenting the following entry
+# db.schema =
+
 # Connection pool parameters
 
 # Maximum number of DB connections in pool

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java	2008-01-15 13:37:06 UTC (rev 2528)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java	2008-01-15 13:49:52 UTC (rev 2529)
@@ -1345,6 +1345,7 @@
 
         try
         {
+            String schema = ConfigurationManager.getProperty("db.schema");
             connection = getConnection();
 
             DatabaseMetaData metadata = connection.getMetaData();
@@ -1354,13 +1355,13 @@
             String tname = (table.length() >= max) ? table
                     .substring(0, max - 1) : table;
 
-            ResultSet pkcolumns = metadata.getPrimaryKeys(null, null, tname);
+            ResultSet pkcolumns = metadata.getPrimaryKeys(null, schema, tname);
             Set pks = new HashSet();
 
             while (pkcolumns.next())
                 pks.add(pkcolumns.getString(4));
 
-            ResultSet columns = metadata.getColumns(null, null, tname, null);
+            ResultSet columns = metadata.getColumns(null, schema, tname, null);
 
             while (columns.next())
             {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2567
          http://dspace.svn.sourceforge.net/dspace/?rev=2567&view=rev
Author:   grahamtriggs
Date:     2008-01-25 08:06:40 -0800 (Fri, 25 Jan 2008)

Log Message:
-----------
Minor corrections following the generalisation of sort ordering

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/InitialArticleWord.java
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/MARC21InitialArticleWord.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-01-23 15:57:42 UTC (rev 2566)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-01-25 16:06:40 UTC (rev 2567)
@@ -523,6 +523,7 @@
 # you need to define a specific date sort for use by the recent items lists,
 # but otherwise don't want users to choose that option.
 #
+55
 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
@@ -550,7 +551,7 @@
 
 # Set the options for how the indexes are sorted
 #
-# All sort normalisations are carried out by the BrowseOrderDelegate.
+# All sort normalisations are carried out by the OrderFormatDelegate.
 # The plugin manager can be used to specify your own delegates for each datatype.
 # 
 # The default datatypes (and delegates) are:

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/InitialArticleWord.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/InitialArticleWord.java	2008-01-23 15:57:42 UTC (rev 2566)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/InitialArticleWord.java	2008-01-25 16:06:40 UTC (rev 2567)
@@ -50,11 +50,11 @@
 public abstract class InitialArticleWord implements TextFilter
 {
     /**
-     * When no language is passed, just return the string
+     * When no language is passed, use null and let implementation decide what to do
      */
     public String filter(String str)
     {
-        return str;
+        return filter(str, null);
     }
     
     /**

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/MARC21InitialArticleWord.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/MARC21InitialArticleWord.java	2008-01-23 15:57:42 UTC (rev 2566)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/text/filter/MARC21InitialArticleWord.java	2008-01-25 16:06:40 UTC (rev 2567)
@@ -48,6 +48,9 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
+import org.dspace.core.ConfigurationManager;
+
 /**
  * Implements MARC 21 standards to disregard initial
  * definite or indefinite article in sorting.
@@ -76,8 +79,8 @@
     protected String[] getArticleWords(String lang)
     {
         // No language - no words
-        if (lang == null)
-            return null;
+        if (StringUtils.isEmpty(lang))
+            return defaultWords;
 
         Language l = Language.getLanguage(lang);
         
@@ -97,6 +100,8 @@
     // Mapping of IANA codes to article word lists
     private static Map ianaArticleMap = new HashMap();
 
+    private static String[] defaultWords = null;
+
     // Static initialisation - convert word -> languages map 
     // into language -> words map
     static
@@ -300,6 +305,45 @@
             // Add language/article entry to map
             ianaArticleMap.put(lang.IANA, new MARC21InitialArticleWord.ArticlesForLang(lang, words));
         }
+
+        // Setup default stop words for null languages
+        String defaultLangs = ConfigurationManager.getProperty("marc21wordfilter.defaultlang");
+        if (!StringUtils.isEmpty(defaultLangs))
+        {
+            String[] langArr = defaultLangs.split("[, ]+");
+            if (langArr != null && langArr.length > 0)
+            {
+                int wordCount = 0;
+                ArticlesForLang[] afl = new ArticlesForLang[langArr.length];
+
+                for (int idx = 0; idx < afl.length; idx++)
+                {
+                    Language l = Language.getLanguage(langArr[idx]);
+                    if (l != null && ianaArticleMap.containsKey(l.IANA))
+                    {
+                        afl[idx] = (ArticlesForLang)ianaArticleMap.get(l.IANA);
+                        if (afl[idx] != null)
+                        {
+                            wordCount += afl[idx].words.length;
+                        }
+                    }
+                }
+
+                if (wordCount > 0)
+                {
+                    int destPos = 0;
+                    defaultWords = new String[wordCount];
+                    for (int idx = 0; idx < afl.length; idx++)
+                    {
+                        if (afl[idx] != null)
+                        {
+                            System.arraycopy(afl[idx].words, 0, defaultWords, destPos, afl[idx].words.length);
+                            destPos += afl[idx].words.length;
+                        }
+                    }
+                }
+            }
+        }
     }
 
     // Wrapper class for inserting word arrays into a map


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2584
          http://dspace.svn.sourceforge.net/dspace/?rev=2584&view=rev
Author:   mdiggory
Date:     2008-01-29 15:43:58 -0800 (Tue, 29 Jan 2008)

Log Message:
-----------
Importing the changes from the binary build prototype (mis-named). Provides example overlays where customization can occur.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/pom.xml
    branches/dspace-1_5_x/dspace/src/assemble/assembly.xml

Added Paths:
-----------
    branches/dspace-1_5_x/dspace/modules/
    branches/dspace-1_5_x/dspace/modules/dspace-jspui/
    branches/dspace-1_5_x/dspace/modules/dspace-jspui/pom.xml
    branches/dspace-1_5_x/dspace/modules/dspace-jspui/src/
    branches/dspace-1_5_x/dspace/modules/dspace-jspui/src/main/
    branches/dspace-1_5_x/dspace/modules/dspace-jspui/src/main/webapp/
    branches/dspace-1_5_x/dspace/modules/dspace-lni/
    branches/dspace-1_5_x/dspace/modules/dspace-lni/pom.xml
    branches/dspace-1_5_x/dspace/modules/dspace-lni/src/
    branches/dspace-1_5_x/dspace/modules/dspace-lni/src/main/
    branches/dspace-1_5_x/dspace/modules/dspace-lni/src/main/webapp/
    branches/dspace-1_5_x/dspace/modules/dspace-oai/
    branches/dspace-1_5_x/dspace/modules/dspace-oai/pom.xml
    branches/dspace-1_5_x/dspace/modules/dspace-oai/src/
    branches/dspace-1_5_x/dspace/modules/dspace-oai/src/main/
    branches/dspace-1_5_x/dspace/modules/dspace-oai/src/main/webapp/
    branches/dspace-1_5_x/dspace/modules/dspace-xmlui/
    branches/dspace-1_5_x/dspace/modules/dspace-xmlui/pom.xml
    branches/dspace-1_5_x/dspace/modules/dspace-xmlui/src/
    branches/dspace-1_5_x/dspace/modules/dspace-xmlui/src/main/
    branches/dspace-1_5_x/dspace/modules/dspace-xmlui/src/main/webapp/
    branches/dspace-1_5_x/dspace/modules/pom.xml

Removed Paths:
-------------
    branches/dspace-1_5_x/dspace/src/assemble/assembly-release.xml

Added: branches/dspace-1_5_x/dspace/modules/dspace-jspui/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/modules/dspace-jspui/pom.xml	                        (rev 0)
+++ branches/dspace-1_5_x/dspace/modules/dspace-jspui/pom.xml	2008-01-29 23:43:58 UTC (rev 2584)
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.dspace.modules</groupId>
+	<artifactId>dspace-jspui</artifactId>
+	<packaging>war</packaging>
+	<name>DSpace JSPUI :: Web Application</name>
+	<url>http://www.dspace.org</url>
+	<description>DSpace JSPUI :: Overlay</description>
+
+	<parent>
+		<groupId>org.dspace</groupId>
+		<artifactId>modules</artifactId>
+		<version>1.5-SNAPSHOT</version>
+	</parent>
+
+	<profiles>
+
+		<!-- 
+			This profile is used by all children such that
+			when activated a dspace.config configuration
+			file location passed on the commandline 
+			(-Ddspace.config=...) can be passed through 
+			to be used as a filter source by projects for 
+			tasks such as updating the ${dspace.dir} in
+			web.xml etc.
+			
+			When activated, the child project will inherit
+			the configuration.
+		-->
+		<profile>
+			<activation>
+				<property>
+					<name>dspace.config</name>
+				</property>
+			</activation>
+			<build>
+				<filters>
+					<filter>${dspace.config}</filter>
+				</filters>
+			</build>
+		</profile>
+
+		<profile>
+			<id>postgres-support</id>
+			<activation>
+				<property>
+					<name>!db.name</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>oracle-support</id>
+			<activation>
+				<property>
+					<name>db.name</name>
+					<value>oracle</value>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>com.oracle</groupId>
+					<artifactId>ojdbc14</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+
+	</profiles>
+
+	<repositories>
+		<repository>
+			<id>maven.dspace.org-snapshot</id>
+			<name>DSpace Maven Snapshot Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<scm>
+		<connection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/dspace-jspui
+		</connection>
+		<developerConnection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/dspace-jspui
+		</developerConnection>
+		<url>
+			http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace/modules/dspace-jspui
+		</url>
+	</scm>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.0</version>
+				<configuration>
+					<archiveClasses>false</archiveClasses>
+					<webResources>
+						<resource>
+							<filtering>true</filtering>
+							<directory>
+								${basedir}/src/main/webapp
+							</directory>
+							<includes>
+								<include>WEB-INF/web.xml</include>
+							</includes>
+						</resource>
+					</webResources>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>prepare-package</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-jspui-webapp</artifactId>
+			<version>${pom.version}</version>
+			<type>war</type>
+			<classifier>skinny</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-jspui-api</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>language-packs</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.3</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>taglibs</groupId>
+			<artifactId>standard</artifactId>
+			<version>1.1.2</version>
+		</dependency>
+	</dependencies>
+
+</project>
+


Property changes on: branches/dspace-1_5_x/dspace/modules/dspace-jspui/pom.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: branches/dspace-1_5_x/dspace/modules/dspace-lni/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/modules/dspace-lni/pom.xml	                        (rev 0)
+++ branches/dspace-1_5_x/dspace/modules/dspace-lni/pom.xml	2008-01-29 23:43:58 UTC (rev 2584)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.dspace.modules</groupId>
+	<artifactId>dspace-lni</artifactId>
+	<packaging>war</packaging>
+	<name>DSpace LNI :: Web Application Overlay</name>
+	<description>
+		DSpace Lightweight Network Interface Webapplication
+	</description>
+	<url>http://projects.dspace.org/dspace-lni/dspace-lni-webapp</url>
+
+	<parent>
+		<groupId>org.dspace</groupId>
+		<artifactId>modules</artifactId>
+		<version>1.5-SNAPSHOT</version>
+	</parent>
+
+	<repositories>
+		<repository>
+			<id>maven.dspace.org/snapshot</id>
+			<name>DSpace Maven Snapshot Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>maven.dspace.org/snapshot</id>
+			<name>DSpace Maven Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<scm>
+		<connection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-webapp
+		</connection>
+		<developerConnection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-webapp
+		</developerConnection>
+		<url>
+			http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-webapp
+		</url>
+	</scm>
+
+	<build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archiveClasses>false</archiveClasses>
+					<webResources>
+						<resource>
+							<filtering>true</filtering>
+							<directory>
+								${basedir}/src/main/webapp
+							</directory>
+							<includes>
+								<include>WEB-INF/web.xml</include>
+							</includes>
+						</resource>
+					</webResources>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>prepare-package</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+		</plugins>
+	</build>
+
+	<profiles>
+		<!-- 
+			when activated a dspace.config configuration
+			file location passed on the commandline 
+			(-Ddspace.config=...) can be passed through 
+			to be used as a filter source by projects for 
+			tasks such as updating the ${dspace.dir} in
+			web.xml etc.
+		-->
+		<profile>
+			<activation>
+				<property>
+					<name>dspace.config</name>
+				</property>
+			</activation>
+			<build>
+				<filters>
+					<filter>${dspace.config}</filter>
+				</filters>
+			</build>
+		</profile>
+		<profile>
+			<id>postgres-support</id>
+			<activation>
+				<property>
+					<name>!db.name</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>oracle-support</id>
+			<activation>
+				<property>
+					<name>db.name</name>
+					<value>oracle</value>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>com.oracle</groupId>
+					<artifactId>ojdbc14</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-lni-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-lni-webapp</artifactId>
+			<version>${pom.version}</version>
+			<classifier>skinny</classifier>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+</project>
\ No newline at end of file


Property changes on: branches/dspace-1_5_x/dspace/modules/dspace-lni/pom.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: branches/dspace-1_5_x/dspace/modules/dspace-oai/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/modules/dspace-oai/pom.xml	                        (rev 0)
+++ branches/dspace-1_5_x/dspace/modules/dspace-oai/pom.xml	2008-01-29 23:43:58 UTC (rev 2584)
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.dspace.modules</groupId>
+	<artifactId>dspace-oai</artifactId>
+	<packaging>war</packaging>
+	<name>DSpace OAI :: Web Application Overlay</name>
+	<description>DSpace OAI Service Provider</description>
+	<url>http://projects.dspace.org/dspace-oai</url>
+
+	<!-- 
+		A Parent POM that Maven inherits DSpace Default 
+		POM atrributes from. 
+	-->
+	<parent>
+		<groupId>org.dspace</groupId>
+		<artifactId>modules</artifactId>
+		<version>1.5-SNAPSHOT</version>
+	</parent>
+
+	<repositories>
+		<repository>
+			<id>maven.dspace.org/snapshot</id>
+			<name>DSpace Maven Snapshot Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>maven.dspace.org/snapshot</id>
+			<name>DSpace Maven Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<!-- 
+		The Subversion repository location is used by Continuum to update against
+		when changes have occured, this spawns a new build cycle and releases snapshots
+		into the snapshot repository below.
+	-->
+	<scm>
+		<connection>
+			scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-oai
+		</connection>
+		<developerConnection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-oai
+		</developerConnection>
+		<url>
+			http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-oai
+		</url>
+	</scm>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archiveClasses>false</archiveClasses>
+					<webResources>
+						<resource>
+							<filtering>true</filtering>
+							<directory>
+								${basedir}/src/main/webapp
+							</directory>
+							<includes>
+								<include>WEB-INF/web.xml</include>
+							</includes>
+						</resource>
+					</webResources>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>prepare-package</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<profiles>
+		<!-- 
+			when activated a dspace.config configuration
+			file location passed on the commandline 
+			(-Ddspace.config=...) can be passed through 
+			to be used as a filter source by projects for 
+			tasks such as updating the ${dspace.dir} in
+			web.xml etc.
+		-->
+		<profile>
+			<activation>
+				<property>
+					<name>dspace.config</name>
+				</property>
+			</activation>
+			<build>
+				<filters>
+					<filter>${dspace.config}</filter>
+				</filters>
+			</build>
+		</profile>
+		<profile>
+			<id>postgres-support</id>
+			<activation>
+				<property>
+					<name>!db.name</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>oracle-support</id>
+			<activation>
+				<property>
+					<name>db.name</name>
+					<value>oracle</value>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>com.oracle</groupId>
+					<artifactId>ojdbc14</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>language-packs</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-oai-api</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-oai-webapp</artifactId>
+			<version>${pom.version}</version>
+			<type>war</type>
+			<classifier>skinny</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>oaicat</artifactId>
+			<version>1.5.48</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+</project>


Property changes on: branches/dspace-1_5_x/dspace/modules/dspace-oai/pom.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: branches/dspace-1_5_x/dspace/modules/dspace-xmlui/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/modules/dspace-xmlui/pom.xml	                        (rev 0)
+++ branches/dspace-1_5_x/dspace/modules/dspace-xmlui/pom.xml	2008-01-29 23:43:58 UTC (rev 2584)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.dspace.modules</groupId>
+	<artifactId>dspace-xmlui</artifactId>
+	<packaging>war</packaging>
+	<name>DSpace XMLUI (Manakin) :: Web Application Overlay</name>
+	<url>http://projects.dspace.org/dspace-xmlui</url>
+	<description>
+		DSpace/Manakin XML UI Based Webapplication using the Cocoon and
+		Wing frameworks
+	</description>
+
+	<parent>
+		<groupId>org.dspace</groupId>
+		<artifactId>modules</artifactId>
+		<version>1.5-SNAPSHOT</version>
+	</parent>
+
+	<repositories>
+		<repository>
+			<id>maven.dspace.org/snapshot</id>
+			<name>DSpace Maven Snapshot Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>maven.dspace.org/snapshot</id>
+			<name>DSpace Maven Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<scm>
+		<connection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-xmlui
+		</connection>
+		<developerConnection>
+			scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-xmlui
+		</developerConnection>
+		<url>
+			http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-xmlui
+		</url>
+	</scm>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archiveClasses>false</archiveClasses>
+					<webResources>
+						<resource>
+							<filtering>true</filtering>
+							<directory>
+								${basedir}/src/main/webapp
+							</directory>
+							<includes>
+								<include>WEB-INF/web.xml</include>
+							</includes>
+						</resource>
+					</webResources>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>prepare-package</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+		</plugins>
+	</build>
+
+	<profiles>
+		<!-- 
+			when activated a dspace.config configuration
+			file location passed on the commandline 
+			(-Ddspace.config=...) can be passed through 
+			to be used as a filter source by projects for 
+			tasks such as updating the ${dspace.dir} in
+			web.xml etc.
+		-->
+		<profile>
+			<activation>
+				<property>
+					<name>dspace.config</name>
+				</property>
+			</activation>
+			<build>
+				<filters>
+					<filter>${dspace.config}</filter>
+				</filters>
+			</build>
+		</profile>
+		<profile>
+			<id>postgres-support</id>
+			<activation>
+				<property>
+					<name>!db.name</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>oracle-support</id>
+			<activation>
+				<property>
+					<name>db.name</name>
+					<value>oracle</value>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>com.oracle</groupId>
+					<artifactId>ojdbc14</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
+	<dependencies>
+		<!-- DSpace XMLUI Webapp -->
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-xmlui-webapp</artifactId>
+			<version>${project.version}</version>
+			<classifier>skinny</classifier>
+			<type>war</type>
+		</dependency>
+
+		<!-- DSpace XMLUI API -->
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-xmlui-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+	</dependencies>
+
+</project>
+


Property changes on: branches/dspace-1_5_x/dspace/modules/dspace-xmlui/pom.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: branches/dspace-1_5_x/dspace/modules/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/modules/pom.xml	                        (rev 0)
+++ branches/dspace-1_5_x/dspace/modules/pom.xml	2008-01-29 23:43:58 UTC (rev 2584)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.dspace</groupId>
+	<artifactId>modules</artifactId>
+	<packaging>pom</packaging>
+	<name>DSpace Addon Modules</name>
+	<url>http://www.dspace.org</url>
+	<description>DSpace Addon Modules</description>
+
+	<parent>
+		<groupId>org.dspace</groupId>
+		<artifactId>dspace-parent</artifactId>
+		<version>1.5-SNAPSHOT</version>
+	</parent>
+
+	<repositories>
+		<repository>
+			<id>maven.dspace.org-snapshot</id>
+			<name>DSpace Maven Snapshot Repository</name>
+			<url>http://maven.dspace.org/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<modules>
+		<module>dspace-xmlui</module>
+		<module>dspace-lni</module>
+		<module>dspace-oai</module>
+		<module>dspace-jspui</module>
+	</modules>
+	
+</project>
+


Property changes on: branches/dspace-1_5_x/dspace/modules/pom.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: branches/dspace-1_5_x/dspace/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/pom.xml	2008-01-29 14:28:53 UTC (rev 2583)
+++ branches/dspace-1_5_x/dspace/pom.xml	2008-01-29 23:43:58 UTC (rev 2584)
@@ -422,8 +422,24 @@
             </dependency>
          </dependencies>
       </profile>
+      
+      <!-- 
+         Builds Overlay Modules for DSpace
+      -->
+      <profile>
+         <id>modules</id>
+         <activation>
+            <file>
+               <exists>modules/pom.xml</exists>
+            </file>
+         </activation>
+         <modules>
+            <module>modules</module>
+         </modules>
+      </profile>
+      
    </profiles>
-
+	
    <build>
       <plugins>
          <!--  overall project assembly -->
@@ -446,14 +462,15 @@
       </plugins>
    </build>
 
-   <dependencies>
-      <dependency>
-         <groupId>org.dspace</groupId>
-         <artifactId>dspace-api</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.dspace</groupId>
-         <artifactId>language-packs</artifactId>
-      </dependency>
-   </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>dspace-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.dspace</groupId>
+			<artifactId>language-packs</artifactId>
+		</dependency>
+	</dependencies>
+	
 </project>

Deleted: branches/dspace-1_5_x/dspace/src/assemble/assembly-release.xml
===================================================================
--- branches/dspace-1_5_x/dspace/src/assemble/assembly-release.xml	2008-01-29 14:28:53 UTC (rev 2583)
+++ branches/dspace-1_5_x/dspace/src/assemble/assembly-release.xml	2008-01-29 23:43:58 UTC (rev 2584)
@@ -1,75 +0,0 @@
-<assembly>
-  <id>bin</id>
-  <formats>
-  	<format>zip</format>
-    <format>tar.gz</format>
-    <format>tar.bz2</format>
-  </formats>
-  <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>${artifactId}-${version}</baseDirectory>
-  <fileSets>
-    <fileSet>
-      <includes>
-        <include>bin/**</include>
-        <include>config/**</include>
-        <include>docs/**</include>
-        <include>etc/**</include>
-        <include>build.xml</include>
-        <include>LICENSE*</include>
-        <include>CHANGES</include>
-        <include>KNOWN_BUGS</include>
-        <include>README</include>
-      </includes>
-      <excludes>
-         <exclude>src</exclude>
-         <exclude>config/dspace.cfg</exclude>
-      </excludes>
-    </fileSet>
-  </fileSets>
-
-  <files>
-    <file>
-      <source>config/dspace.cfg</source>
-      <outputDirectory>config</outputDirectory>
-      <filtered>true</filtered>
-    </file>
-  </files>
-  
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
-      <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <excludes>
-        <exclude>junit:junit</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-  
-  <moduleSets>
-    <moduleSet>
-      <includes>
-        <include>*:jar</include>
-      </includes>
-      <binaries>
-        <includeDependencies>true</includeDependencies>
-        <outputDirectory>lib</outputDirectory>
-        <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-        <unpack>false</unpack>
-      </binaries>
-    </moduleSet>
-    <moduleSet>
-      <includes>
-        <include>*:war</include>
-      </includes>
-      <binaries>
-      	<includeDependencies>false</includeDependencies>
-        <outputDirectory>webapps</outputDirectory>
-        <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-        <unpack>false</unpack>
-      </binaries>
-    </moduleSet>
-  </moduleSets>
-  
-</assembly>
\ No newline at end of file

Modified: branches/dspace-1_5_x/dspace/src/assemble/assembly.xml
===================================================================
--- branches/dspace-1_5_x/dspace/src/assemble/assembly.xml	2008-01-29 14:28:53 UTC (rev 2583)
+++ branches/dspace-1_5_x/dspace/src/assemble/assembly.xml	2008-01-29 23:43:58 UTC (rev 2584)
@@ -1,84 +1,74 @@
-<assembly>
-   <formats>
-      <format>dir</format>
-   </formats>
-   <includeBaseDirectory>false</includeBaseDirectory>
- 
-   <fileSets> 
-      <fileSet>
-         <directory>src/main/config</directory>
-         <outputDirectory>.</outputDirectory>
-         <includes>
-            <include>build.xml</include>
-         </includes>
-      </fileSet>
-      <fileSet>
-         <outputDirectory>.</outputDirectory>
-         <includes>
-            <include>bin/**</include>
-            <include>config/**</include>
-            <include>docs/**</include>
-            <include>etc/**</include>
-            <include>build.xml</include>
-            <include>LICENSE*</include>
-            <include>CHANGES</include>
-            <include>KNOWN_BUGS</include>
-            <include>README</include>
-         </includes>
-         <excludes>
-            <exclude>src</exclude>
-            <exclude>config/dspace.cfg</exclude>
-         </excludes>
-      </fileSet>
-   </fileSets>
+<assembly xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+	<id>build</id>
+	<formats>
+		<format>dir</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
 
-   <files>
-     <file>
-       <source>config/dspace.cfg</source>
-       <outputDirectory>config</outputDirectory>
-       <filtered>true</filtered>
-     </file>
-   </files>
+	<fileSets>
+		<fileSet>
+			<directory>src/main/config</directory>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>build.xml</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<outputDirectory>.</outputDirectory>
+			<includes>
+				<include>bin/**</include>
+				<include>config/**</include>
+				<include>docs/**</include>
+				<include>etc/**</include>
+				<include>build.xml</include>
+				<include>LICENSE*</include>
+				<include>CHANGES</include>
+				<include>KNOWN_BUGS</include>
+				<include>README</include>
+			</includes>
+			<excludes>
+				<exclude>src</exclude>
+				<exclude>config/dspace.cfg</exclude>
+			</excludes>
+		</fileSet>
+	</fileSets>
 
-   <dependencySets>
-      <dependencySet>
-         <outputDirectory>lib</outputDirectory>
-         <unpack>false</unpack>
-         <scope>runtime</scope>
-      </dependencySet>
-   </dependencySets>
+	<files>
+		<file>
+			<source>config/dspace.cfg</source>
+			<outputDirectory>config</outputDirectory>
+			<filtered>true</filtered>
+		</file>
+	</files>
 
-   <moduleSets>
-      <moduleSet>
-         <includes>
-            <include>*:jar</include>
-         </includes>
-         <excludes>
-            <exclude>org.dspace:dspace-jspui-api</exclude>
-            <exclude>org.dspace:dspace-oai-api</exclude>
-         	<exclude>org.dspace:dspace-xmlui-api</exclude>
-         	<exclude>org.dspace:dspace-xmlui-wing</exclude>
-         	<exclude>org.dspace:dspace-lni-core</exclude>
-         </excludes>
-         <binaries>
-            <includeDependencies>true</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-         </binaries>
-      </moduleSet>
-      <moduleSet>
-         <includes>
-            <include>*:war</include>
-         </includes>
-         <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>webapps</outputDirectory>
-            <outputFileNameMapping>
-               ${artifactId}
-            </outputFileNameMapping>
-            <unpack>true</unpack>
-         </binaries>
-      </moduleSet>
-   </moduleSets>
+	<dependencySets>
+		<dependencySet>
+			<excludes>
+				<exclude>*:war:*</exclude>
+			</excludes>
+			<outputDirectory>lib</outputDirectory>
+		</dependencySet>
+	</dependencySets>
 
-</assembly>
\ No newline at end of file
+	<moduleSets>
+		<moduleSet>
+			<includes>
+				<include>*:war:*</include>
+			</includes>
+			<excludes>
+				<exclude>org.dspace:dspace-xmlui-webapp</exclude>
+				<exclude>org.dspace:dspace-lni-webapp</exclude>
+				<exclude>org.dspace:dspace-jspui-webapp</exclude>
+				<exclude>org.dspace:dspace-oai-webapp</exclude>
+			</excludes>
+			<binaries>
+				<includeDependencies>false</includeDependencies>
+				<outputDirectory>webapps</outputDirectory>
+				<unpack>true</unpack>
+			</binaries>
+		</moduleSet>
+	</moduleSets>
+
+</assembly>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2636
          http://dspace.svn.sourceforge.net/dspace/?rev=2636&view=rev
Author:   ScottPhillips
Date:     2008-02-11 10:20:01 -0800 (Mon, 11 Feb 2008)

Log Message:
-----------
(ScottPhillips) Added a switch to enable the themepath parameter to an HTTP request directing which theme to load. This can be turned on via the xmlui.themes.allowoverrides configuration parameter which defaults to off.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/configure.html
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/ThemeMatcher.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/DSpaceObjectManager.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-02-11 16:31:27 UTC (rev 2635)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-02-11 18:20:01 UTC (rev 2636)
@@ -1037,13 +1037,21 @@
 ### XMLUI (aka manakin) configuration ###
 # These are XML UI specific configuration items that apply only to Manakin
 # user interface.
-#
 
 # Force all authenticated connections to use SSL, only non-authenticated 
 # connections are allowed over plain http. If set to true, then you need to 
 # ensure that the 'dspace.hostname' parameter is set to the correctly.
 #xmlui.force.ssl = true
 
+# Allow the user to override which theme is used to display a particular page. 
+# When submitting a request add the HTTP parameter "themepath" which corresponds 
+# to a particular theme, that specified theme will be used instead of the any 
+# other configured theme. Note that this is a potential security hole allowing 
+# execution of unintended code on the server, this option is only for development 
+# and debugging it should be turned off for any production repository. The default 
+# value unless otherwise specified is "false"
+#xmlui.theme.allowoverrides = false
+
 # On the community-list page should all the metadata about a community/collection
 # be available to the theme. This parameter defaults to true, but if you are
 # experiencing performance problems on the community-list page you should experiment
@@ -1059,7 +1067,6 @@
 # the website for a period of time.
 #xmlui.community-list.cache = 12 hours
 
-
 # Optionally you may configure Manakin to take advantage of metadata stored as a 
 # bitstream. These metadata files should be inside the "METADATA" bundle and named 
 # either MODS.xml or METS.xml. If either of the following options are turned on then 

Modified: branches/dspace-1_5_x/dspace/docs/configure.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/configure.html	2008-02-11 16:31:27 UTC (rev 2635)
+++ branches/dspace-1_5_x/dspace/docs/configure.html	2008-02-11 18:20:01 UTC (rev 2636)
@@ -801,13 +801,14 @@
   <table>
     <tbody>
       <tr>
-        <th>Property</th>
+        <th width="300px">Property</th>
 
         <th>Example Values</th>
 
         <th>Notes</th>
       </tr>
 
+
       <tr>
         <td><code>xmlui.force.ssl</code></td>
 
@@ -816,6 +817,13 @@
         <td>Force all authenticated connections to use SSL, only non-authenticated connections are allowed over plain http. If set to true, then you need to ensure that the 'dspace.hostname' parameter is set to the correctly.</td>
       </tr>
    
+      <tr>
+        <td><code>xmlui.theme.allowoverrides</code></td>
+
+        <td><code>false</code></td>
+
+        <td>If set to true, then allow the user to override which theme is used to display a particular page. When submitting a request add the HTTP parameter "themepath" which corresponds to a particular theme, that specified theme will be used instead of the any other configured theme. Note that this is a potential security hole allowing execution of unintended code on the server, this option is only for development and debugging it should be turned off for any production repository. The default value unless otherwise specified is "false"</td>
+      </tr>
    
       <tr>
         <td><code>xmlui.community-list.render.full</code></td>

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/ThemeMatcher.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/ThemeMatcher.java	2008-02-11 16:31:27 UTC (rev 2635)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/ThemeMatcher.java	2008-02-11 18:20:01 UTC (rev 2636)
@@ -56,6 +56,7 @@
 import org.dspace.app.xmlui.configuration.Theme;
 import org.dspace.app.xmlui.utils.HandleUtil;
 import org.dspace.content.DSpaceObject;
+import org.dspace.core.ConfigurationManager;
 
 /**
  * This class determines the correct Aspect to use. This is determined by the
@@ -96,6 +97,50 @@
 			String uri = request.getSitemapURI();
 			DSpaceObject dso = HandleUtil.obtainHandle(objectModel);
 
+			
+			// Allow the user to override the theme configuration
+			if (ConfigurationManager.getBooleanProperty("xmlui.theme.allowoverrides",false))
+			{
+				String themePathOverride  = request.getParameter("themepath");
+				if (themePathOverride != null && themePathOverride.length() > 0)
+				{
+					// Allowing the user to specify the theme path is a security risk because it 
+					// allows the user to direct which sitemap is executed next. An attacker could 
+					// use this in combination with another attack execute code on the server. 
+					// Ultimately this option should not be turned on in a production system and 
+					// only used in development. However lets do some simple sanity checks to 
+					// protect us a little even when under development.
+					
+					// Allow: allow all letters and numbers plus periods (but not consecutive), 
+					// dashes, underscores, and forward slashes 
+					if (!themePathOverride.matches("^[a-zA-V0-9][a-zA-Z0-9/_\\-]*/?$")) {
+						
+						throw new IllegalArgumentException("The user specified theme path, \""+themePathOverride+"\", may be " +
+								"an exploit attempt. To use this feature please limit your theme paths to only letters " +
+								"(a-Z), numbers(0-9), dashes(-), underscores (_), and trailing forward slashes (/).");
+					}
+					
+					// The user is selecting to override a theme, ignore any set
+					// rules to apply and use the one specified.
+					String themeNameOverride = request.getParameter("themename");
+					String themeIdOverride = request.getParameter("themeid");
+					
+					if (themeNameOverride == null || themeNameOverride.length() == 0)
+						themeNameOverride = "User specified theme";
+					
+					getLogger().debug("User as specified to override theme selection with theme "+
+							"(name=\""+themeNameOverride+"\", path=\""+themePathOverride+"\", id=\""+themeIdOverride+"\")");
+					
+					Map<String, String> result = new HashMap<String, String>();
+					result.put("themeName", themeNameOverride);
+					result.put("theme", themePathOverride);
+					result.put("themeID", themeIdOverride);
+					
+					return result;
+				}
+			}
+			
+			
 			List<Theme> rules = XMLUIConfiguration.getThemeRules();
 			getLogger().debug("Checking if URL=" + uri + " matches any theme rules.");
 			for (Theme rule : rules) {

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/DSpaceObjectManager.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/DSpaceObjectManager.java	2008-02-11 16:31:27 UTC (rev 2635)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/DSpaceObjectManager.java	2008-02-11 18:20:01 UTC (rev 2636)
@@ -123,7 +123,7 @@
 			else
 			{
 				// No handle then refrence it by an internal ID.
-				if (dso instanceof Item)
+				if (dso instanceof Item || dso instanceof BrowseItem)
 		    	{
 		    		return "/metadata/internal/item/" + dso.getID() + "/mets.xml";
 		    	}
@@ -147,7 +147,7 @@
 	 */
 	public String getObjectType(Object object) throws WingException 
 	{
-		if (object instanceof Item)
+		if (object instanceof Item || object instanceof BrowseItem)
     	{
     		return "DSpace Item";
     	}
@@ -182,7 +182,7 @@
 	
 	/**
 	 * For the DSpace implementation we just return a hash of one entry which contains
-	 * a refrence to this repository's metadata.
+	 * a reference to this repository's metadata.
 	 */
 	public HashMap<String,String> getAllManagedRepositories() throws WingException
 	{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2698
          http://dspace.svn.sourceforge.net/dspace/?rev=2698&view=rev
Author:   ScottPhillips
Date:     2008-02-20 12:50:09 -0800 (Wed, 20 Feb 2008)

Log Message:
-----------
(Scott Phillips) SF#1895858 - unable to send feedback email.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSIndexer.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-02-20 19:03:17 UTC (rev 2697)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-02-20 20:50:09 UTC (rev 2698)
@@ -1013,6 +1013,10 @@
 event.dispatcher.default.class = org.dspace.event.BasicDispatcher
 event.dispatcher.default.consumers = search, browse, eperson
 
+# The noindex dispatcher will not create search or browse indexs (usefull for batch item imports) 
+event.dispatcher.noindex.class = org.dspace.event.BasicDispatcher
+event.dispatcher.noindex.consumers = 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:Bundle+Add|Remove

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSIndexer.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSIndexer.java	2008-02-20 19:03:17 UTC (rev 2697)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/search/DSIndexer.java	2008-02-20 20:50:09 UTC (rev 2698)
@@ -48,6 +48,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Calendar;
+import java.util.Locale;
 import java.util.TimeZone;
 import java.text.SimpleDateFormat;
 import java.text.ParseException;
@@ -79,6 +80,7 @@
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.Email;
+import org.dspace.core.I18nUtil;
 import org.dspace.core.LogManager;
 import org.dspace.handle.HandleManager;
 import org.dspace.sort.SortOption;
@@ -704,7 +706,7 @@
 					.getProperty("alert.recipient");
 
 			if (recipient != null) {
-				Email email = ConfigurationManager.getEmail("internal_error");
+				Email email = ConfigurationManager.getEmail(I18nUtil.getEmailFilename(Locale.getDefault(), "internal_error"));
 				email.addRecipient(recipient);
 				email.addArgument(ConfigurationManager
 						.getProperty("dspace.url"));

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java	2008-02-20 19:03:17 UTC (rev 2697)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/SendFeedbackAction.java	2008-02-20 20:50:09 UTC (rev 2698)
@@ -53,6 +53,7 @@
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.Email;
+import org.dspace.core.I18nUtil;
 import org.dspace.eperson.EPerson;
 
 /**
@@ -108,7 +109,7 @@
         }
         
         // All data is there, send the email
-        Email email = ConfigurationManager.getEmail("feedback");
+        Email email = ConfigurationManager.getEmail(I18nUtil.getEmailFilename(context.getCurrentLocale(), "feedback"));
         email.addRecipient(ConfigurationManager
                 .getProperty("feedback.recipient"));
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2703
          http://dspace.svn.sourceforge.net/dspace/?rev=2703&view=rev
Author:   tdonohue
Date:     2008-02-20 14:46:41 -0800 (Wed, 20 Feb 2008)

Log Message:
-----------
Fixed bug SF#1897293 - Submission field Series/Report No. is ignored. 

Changed the dc.relation.ispartofseries (Series/Report field) to the "series" input-type in input-forms.xml.  Added documentation around the "series" input type (which was strangely missing).  A few other small fixes to get JSP-UI & XML-UI to work the same for series.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/input-forms.xml
    branches/dspace-1_5_x/dspace/docs/submission.html
    branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/submit/edit-metadata.jsp
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/DescribeStep.java

Modified: branches/dspace-1_5_x/dspace/config/input-forms.xml
===================================================================
--- branches/dspace-1_5_x/dspace/config/input-forms.xml	2008-02-20 22:08:55 UTC (rev 2702)
+++ branches/dspace-1_5_x/dspace/config/input-forms.xml	2008-02-20 22:46:41 UTC (rev 2703)
@@ -112,7 +112,7 @@
          <dc-qualifier>ispartofseries</dc-qualifier>
          <repeatable>true</repeatable>
          <label>Series/Report No.</label>
-         <input-type>twobox</input-type>
+         <input-type>series</input-type>
          <hint>Enter the series and number assigned to this item by your community.</hint>
          <required></required>
        </field>

Modified: branches/dspace-1_5_x/dspace/docs/submission.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/submission.html	2008-02-20 22:08:55 UTC (rev 2702)
+++ branches/dspace-1_5_x/dspace/docs/submission.html	2008-02-20 22:46:41 UTC (rev 2703)
@@ -465,19 +465,22 @@
       <UL>
         <LI><STRONG>onebox</STRONG> -- A single text-entry box.</LI>
 
-        <LI><STRONG>twobox</STRONG> -- A pair of simple text-entry boxes, used for <EM>repeatable</EM> values such as the DC <CODE>subject</CODE> item.</LI>
+        <LI><STRONG>twobox</STRONG> -- A pair of simple text-entry boxes, used for <EM>repeatable</EM> values such as the DC <CODE>subject</CODE> item.
+        <em>Note:</em> The 'twobox' input type is rendered the same as a 'onebox' in the XML-UI, but both allow for ease of adding multiple values.</LI>
 
         <LI><STRONG>textarea</STRONG> -- Large block of text that can be entered on multiple lines, e.g. for an abstract.</LI>
 
-        <LI><STRONG>name</STRONG> -- Personal name, with separate fields for family name and first name.</LI>
+        <LI><STRONG>name</STRONG> -- Personal name, with separate fields for family name and first name. When saved they are appended in the format 'LastName, FirstName'</LI>
 
-        <LI><STRONG>date</STRONG> -- Calendar date. when required, demands that at least the year be entered.</LI>
+        <LI><STRONG>date</STRONG> -- Calendar date. When required, demands that at least the year be entered.</LI>
 
-        <LI><STRONG>dropdown</STRONG> -- Choose value(s) from a "drop-down" menu list. <STRONG>Note:</STRONG> You must also include a value for the <CODE>value-pairs-name</CODE> attribute to specify a list of menu entries, from which to choose, for this item. Use this to make a choice from a restricted set of options, such as for the <CODE>language</CODE> item.</LI>
+		<LI><STRONG>series</STRONG> -- Series/Report name and number.  Separate fields are provided for series name and series number, but they are appended (with a semicolon between) when saved.</LI>
 
+        <LI><STRONG>dropdown</STRONG> -- Choose value(s) from a "drop-down" menu list. <STRONG>Note:</STRONG> You must also include a value for the <CODE>value-pairs-name</CODE> attribute to specify a list of menu entries from which to choose. Use this to make a choice from a restricted set of options, such as for the <CODE>language</CODE> item.</LI>
+
         <LI><STRONG>qualdrop_value</STRONG> -- Enter a "qualified value", which includes <EM>both</EM> a qualifier from a drop-down menu and a free-text value. Used to enter items like alternate identifers and codes for a submitted item, e.g. the DC <CODE>identifier</CODE> field. <STRONG>Note:</STRONG> As for the <CODE>dropdown</CODE> type, you must include the <CODE>value-pairs-name</CODE> attribute to specify a menu choice list.</LI>
       
-      	<LI><STRONG>list</STRONG> -- Choose value(s) from a checkbox or radio button list. If the <CODE>repeatable</CODE> attribute is set to <CODE>true</CODE>, a list of checkboxes is displayed.  If the <CODE>repeatable</CODE> attribute is set to <CODE>false</CODE>, a list of radio buttons is displayed. <STRONG>Note:</STRONG> You must also include a value for the <CODE>value-pairs-name</CODE> attribute to specify a list of values, from which to choose, for this item.</LI>
+      	<LI><STRONG>list</STRONG> -- Choose value(s) from a checkbox or radio button list. If the <CODE>repeatable</CODE> attribute is set to <CODE>true</CODE>, a list of checkboxes is displayed.  If the <CODE>repeatable</CODE> attribute is set to <CODE>false</CODE>, a list of radio buttons is displayed. <STRONG>Note:</STRONG> You must also include a value for the <CODE>value-pairs-name</CODE> attribute to specify a list of values from which to choose.</LI>
       </UL>
     </DD>
 

Modified: branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/submit/edit-metadata.jsp
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/submit/edit-metadata.jsp	2008-02-20 22:08:55 UTC (rev 2702)
+++ branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/submit/edit-metadata.jsp	2008-02-20 22:46:41 UTC (rev 2703)
@@ -348,7 +348,23 @@
       int fieldCount = defaults.length + fieldCountIncr;
       StringBuffer sb = new StringBuffer();
       org.dspace.content.DCSeriesNumber sn;
+      StringBuffer headers = new StringBuffer();
 
+      //Width hints used here to affect whole table 
+      headers.append("<tr><td width=\"40%\">&nbsp;</td>")
+          .append("<td class=\"submitFormDateLabel\" width=\"5%\">")
+//          .append("Series Name</td>")
+			 .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.seriesname"))
+          .append("</td>")
+          .append("<td class=\"submitFormDateLabel\" width=\"5%\">")
+//          .append("Report or Paper No.</td>")
+			 .append(LocaleSupport.getLocalizedMessage(pageContext, "jsp.submit.edit-metadata.paperno"))
+          .append("</td>")
+          .append("<td width=\"40%\">&nbsp;</td>")
+          .append("</tr>");
+      out.write(headers.toString());
+      
+      
       if (fieldCount == 0)
          fieldCount = 1;
 

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/DescribeStep.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/DescribeStep.java	2008-02-20 22:08:55 UTC (rev 2702)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/DescribeStep.java	2008-02-20 22:46:41 UTC (rev 2703)
@@ -224,18 +224,9 @@
 			}
 			else if (inputType.equals("twobox"))
 			{
-				// FIXME: this probably shouldn't be needed
-				if ("ispartofseries".equals(qualifier))
-				{
-					// Ispartofseries should be series and not two-boxes.
-					renderSeriesField(form,fieldName,dcInput,dcValues);
-				}
-				else
-				{
-					// We don't have a twobox field, instead it's just a
-					// one box field that the theme can render in two columns.
-					renderOneboxField(form, fieldName, dcInput, dcValues);
-				}
+				// We don't have a twobox field, instead it's just a
+				// one box field that the theme can render in two columns.
+				renderOneboxField(form, fieldName, dcInput, dcValues);
 			}
 			else if (inputType.equals("qualdrop_value"))
 			{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2748
          http://dspace.svn.sourceforge.net/dspace/?rev=2748&view=rev
Author:   ScottPhillips
Date:     2008-02-27 22:58:30 -0800 (Wed, 27 Feb 2008)

Log Message:
-----------
(Scott Phillips) Removed hardcoding of the bundle list out into the dspace.cfg parameter.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/configure.html
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/item/AddBitstreamForm.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-02-28 06:28:08 UTC (rev 2747)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-02-28 06:58:30 UTC (rev 2748)
@@ -1055,6 +1055,12 @@
 # value unless otherwise specified is "false"
 #xmlui.theme.allowoverrides = false
 
+# Determine which bundles administrators and collection administrators may upload 
+# into an existing item through the administrative interface. If the user does not
+# have the appropriate privileges (add & write) on the bundle then that bundle will
+# not be shown to the user as an option.
+#xmlui.bundle.upload = ORIGINAL, METADATA, THUMBNAIL, LICENSE, CC_LICENSE
+
 # On the community-list page should all the metadata about a community/collection
 # be available to the theme. This parameter defaults to true, but if you are
 # experiencing performance problems on the community-list page you should experiment

Modified: branches/dspace-1_5_x/dspace/docs/configure.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/configure.html	2008-02-28 06:28:08 UTC (rev 2747)
+++ branches/dspace-1_5_x/dspace/docs/configure.html	2008-02-28 06:58:30 UTC (rev 2748)
@@ -837,6 +837,13 @@
         <td>If set to true, then allow the user to override which theme is used to display a particular page. When submitting a request add the HTTP parameter "themepath" which corresponds to a particular theme, that specified theme will be used instead of the any other configured theme. Note that this is a potential security hole allowing execution of unintended code on the server, this option is only for development and debugging it should be turned off for any production repository. The default value unless otherwise specified is "false"</td>
       </tr>
    
+   	
+   	  <tr>
+   	  	<td><code>xmlui.bundle.upload</code></td>
+   	  	<td><code>ORIGINAL, METADATA, THUMBNAIL, LICENSE, CC_LICENSE</code>
+   	  	<td>Determine which bundles administrators and collection administrators may upload into an existing item through the administrative interface. If the user does not have the appropriate privileges (add & write) on the bundle then that bundle will not be shown to the user as an option. </td>   	  </tr>
+   
+   
       <tr>
         <td><code>xmlui.community-list.render.full</code></td>
 

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/item/AddBitstreamForm.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/item/AddBitstreamForm.java	2008-02-28 06:28:08 UTC (rev 2747)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/item/AddBitstreamForm.java	2008-02-28 06:58:30 UTC (rev 2748)
@@ -41,8 +41,17 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Map;
 
-import org.dspace.app.xmlui.aspect.submission.AbstractStep;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.flow.FlowHelper;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.SourceResolver;
+import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
+import org.dspace.app.xmlui.utils.ContextUtil;
 import org.dspace.app.xmlui.utils.UIException;
 import org.dspace.app.xmlui.wing.Message;
 import org.dspace.app.xmlui.wing.WingException;
@@ -58,6 +67,7 @@
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.AuthorizeManager;
 import org.dspace.content.Bundle;
+import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.xml.sax.SAXException;
 
@@ -69,7 +79,7 @@
  * 
  * @author Scott Phillips
  */
-public class AddBitstreamForm extends AbstractStep
+public class AddBitstreamForm extends AbstractDSpaceTransformer
 {
 	
 	/** Language strings */
@@ -81,11 +91,6 @@
 	private static final Message T_trail = message("xmlui.administrative.item.AddBitstreamForm.trail");
 	private static final Message T_head1 = message("xmlui.administrative.item.AddBitstreamForm.head1");
 	private static final Message T_bundle_label = message("xmlui.administrative.item.AddBitstreamForm.bundle_label");
-	private static final Message T_bundle_original = message("xmlui.administrative.item.AddBitstreamForm.bundle_original");
-	private static final Message T_bundle_metadata = message("xmlui.administrative.item.AddBitstreamForm.bundle_metadata");
-	private static final Message T_bundle_thumbnail = message("xmlui.administrative.item.AddBitstreamForm.bundle_thumbnail");
-	private static final Message T_bundle_license = message("xmlui.administrative.item.AddBitstreamForm.bundle_license");
-	private static final Message T_bundle_cc_license = message("xmlui.administrative.item.AddBitstreamForm.bundle_cc_license");
 	private static final Message T_file_label = message("xmlui.administrative.item.AddBitstreamForm.file_label");
 	private static final Message T_file_help = message("xmlui.administrative.item.AddBitstreamForm.file_help");
 	private static final Message T_description_label = message("xmlui.administrative.item.AddBitstreamForm.description_label");
@@ -94,7 +99,9 @@
 
 	private static final Message T_no_bundles = message("xmlui.administrative.item.AddBitstreamForm.no_bundles");
 
-
+	
+	private static String DEFAULT_BUNDLE_LIST = "ORIGINAL, METADATA, THUMBNAIL, LICENSE, CC_LICENSE";
+		
 	public void addPageMeta(PageMeta pageMeta) throws WingException
 	{
 		pageMeta.addMetadata("title").addContent(T_title);
@@ -120,18 +127,20 @@
 		int bundleCount = 0; // record how many bundles we are able to upload too.
 		Select select = upload.addItem().addSelect("bundle");
 		select.setLabel(T_bundle_label);
-		if (addBundleOption(item,select,"ORIGINAL", T_bundle_original))
-			bundleCount++;
-		if (addBundleOption(item,select,"METADATA", T_bundle_metadata))
-			bundleCount++;
-		if (addBundleOption(item,select,"THUMBNAIL", T_bundle_thumbnail))
-			bundleCount++;
-		if (addBundleOption(item,select,"LICENSE", T_bundle_license))
-			bundleCount++;
-		if (addBundleOption(item,select,"CC_LICENSE", T_bundle_cc_license))
-			bundleCount++;
-		select.setOptionSelected("ORIGINAL");
-
+		
+		// Get the list of bundles to allow the user to upload too. Either use the default 
+		// or one supplied from the dspace.cfg.
+		String bundleString = ConfigurationManager.getProperty("xmlui.bundle.upload");
+        if (bundleString == null || bundleString.length() == 0)
+        	bundleString = DEFAULT_BUNDLE_LIST;
+        String[] parts = bundleString.split(",");
+        for (String part : parts)
+        {
+        	if (addBundleOption(item,select,part.trim()))
+        		bundleCount++;
+        }
+        select.setOptionSelected("ORIGINAL");
+		
 		if (bundleCount == 0)
 			select.setDisabled();
 		
@@ -166,7 +175,7 @@
 		div.addHidden("administrative-continue").setValue(knot.getId()); 
 	}	
 	
-	public boolean addBundleOption(org.dspace.content.Item item, Select select, String bundleName, Message bundleLabel) throws SQLException, WingException
+	public boolean addBundleOption(org.dspace.content.Item item, Select select, String bundleName) throws SQLException, WingException
 	{
 		
 		// For some crazzy reason multiple bundles can share the same name
@@ -192,7 +201,7 @@
 		}
 		
 		// It's okay to upload.
-		select.addOption(bundleName, bundleLabel);
+		select.addOption(bundleName, message("xmlui.administrative.item.AddBitstreamForm.bundle."+bundleName));
 		return true;
 	}
 	

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml	2008-02-28 06:28:08 UTC (rev 2747)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml	2008-02-28 06:58:30 UTC (rev 2748)
@@ -1176,11 +1176,11 @@
 	<message key="xmlui.administrative.item.AddBitstreamForm.trail">Upload bitstream</message>
 	<message key="xmlui.administrative.item.AddBitstreamForm.head1">Upload a new bitstream</message>
 	<message key="xmlui.administrative.item.AddBitstreamForm.bundle_label">Bundle</message>
-	<message key="xmlui.administrative.item.AddBitstreamForm.bundle_original">Content Files (default)</message>
-	<message key="xmlui.administrative.item.AddBitstreamForm.bundle_metadata">Metadata Files</message>
-	<message key="xmlui.administrative.item.AddBitstreamForm.bundle_thumbnail">Thumbnails</message>
-	<message key="xmlui.administrative.item.AddBitstreamForm.bundle_license">Licenses</message>
-	<message key="xmlui.administrative.item.AddBitstreamForm.bundle_cc_license">Creative Commons Licenses</message>
+	<message key="xmlui.administrative.item.AddBitstreamForm.bundle.ORIGINAL">Content Files (default)</message>
+	<message key="xmlui.administrative.item.AddBitstreamForm.bundle.METADATA">Metadata Files</message>
+	<message key="xmlui.administrative.item.AddBitstreamForm.bundle.THUMBNAIL">Thumbnails</message>
+	<message key="xmlui.administrative.item.AddBitstreamForm.bundle.LICENSE">Licenses</message>
+	<message key="xmlui.administrative.item.AddBitstreamForm.bundle.CC_LICENSE">Creative Commons Licenses</message>
 	<message key="xmlui.administrative.item.AddBitstreamForm.file_label">File</message>
 	<message key="xmlui.administrative.item.AddBitstreamForm.file_help">Please enter the name of the file on your computer corresponding to your item. If you click "Browse...", a new window will appear in which you can locate and select the file from your computer.</message>
 	<message key="xmlui.administrative.item.AddBitstreamForm.description_label">Description</message>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2783
          http://dspace.svn.sourceforge.net/dspace/?rev=2783&view=rev
Author:   ScottPhillips
Date:     2008-03-03 19:20:21 -0800 (Mon, 03 Mar 2008)

Log Message:
-----------
(Scott Phillips) webui.content_disposition_threshold -> xmlui.content_disposition_threshold 

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-04 01:41:06 UTC (rev 2782)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-04 03:20:21 UTC (rev 2783)
@@ -905,6 +905,7 @@
 # Use -1 to force all bitstream to be served inline
 # webui.content_disposition_threshold = -1
 webui.content_disposition_threshold = 8388608
+xmlui.content_disposition_threshold = 8388608
 
 #### Multi-file HTML document/site settings #####
 #

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java	2008-03-04 01:41:06 UTC (rev 2782)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java	2008-03-04 03:20:21 UTC (rev 2783)
@@ -442,8 +442,8 @@
                 + expires);
     	
         // If this is a large bitstream then tell the browser it should treat it as a download.
-        int threshold = ConfigurationManager.getIntProperty("webui.content_disposition_threshold");
-        if (bitstreamSize > threshold && threshold > 0)
+        int threshold = ConfigurationManager.getIntProperty("xmlui.content_disposition_threshold");
+        if (bitstreamSize > threshold && threshold != 0)
         {
 	    	String name  = bitstreamName;
 	    	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2788
          http://dspace.svn.sourceforge.net/dspace/?rev=2788&view=rev
Author:   ScottPhillips
Date:     2008-03-03 21:48:48 -0800 (Mon, 03 Mar 2008)

Log Message:
-----------
(Scott Phillips) Added support for xmlui.supported.locales parameter so that an administrator can choose which languages to deploy Manakin in.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/configure.html
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/core/I18nUtil.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/sitemap.xmap

Added Paths:
-----------
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceLocaleAction.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-04 05:03:36 UTC (rev 2787)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-04 05:48:48 UTC (rev 2788)
@@ -1045,6 +1045,15 @@
 # These are XML UI specific configuration items that apply only to Manakin
 # user interface.
 
+
+# A list of supported locales for Manakin. Manakin will look at a user's browser 
+# configuration for the first language that appears in this list to make available
+# to in the interface. This parameter is a comma seperated list of Locales. All 
+# types of Locales country, country_language, country_language_variant
+# Note that that if the approprate files are not present (i.e. Messages_XX_XX.xml) 
+# then Manakin will fall back through to a more general language.
+#xmlui.supportedLocales = en, de
+
 # Force all authenticated connections to use SSL, only non-authenticated 
 # connections are allowed over plain http. If set to true, then you need to 
 # ensure that the 'dspace.hostname' parameter is set to the correctly.

Modified: branches/dspace-1_5_x/dspace/docs/configure.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/configure.html	2008-03-04 05:03:36 UTC (rev 2787)
+++ branches/dspace-1_5_x/dspace/docs/configure.html	2008-03-04 05:48:48 UTC (rev 2788)
@@ -821,6 +821,15 @@
       </tr>
 
 
+	  <tr>
+        <td><code>xmlui.supportedLocales</code></td>
+
+        <td><code>en, de</code></td>
+
+        <td>A list of supported locales for Manakin. Manakin will look at a user's browser configuration for the first language that appears in this list to make available to in the interface. This parameter is a comma seperated list of Locales. All types of Locales country, country_language, country_language_variant Note that that if the approprate files are not present (i.e. Messages_XX_XX.xml) then Manakin will fall back through to a more general language.</td>
+      </tr>
+   
+
       <tr>
         <td><code>xmlui.force.ssl</code></td>
 

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/core/I18nUtil.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/core/I18nUtil.java	2008-03-04 05:03:36 UTC (rev 2787)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/core/I18nUtil.java	2008-03-04 05:48:48 UTC (rev 2788)
@@ -78,7 +78,7 @@
      * @return defaultLocale
      *         the default Locale for this DSpace instance
      */
-    private static Locale getDefaultLocale()
+    public static Locale getDefaultLocale()
     {
         Locale defaultLocale = null;
         if ((ConfigurationManager.getProperty("default.locale") != null)

Added: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceLocaleAction.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceLocaleAction.java	                        (rev 0)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceLocaleAction.java	2008-03-04 05:48:48 UTC (rev 2788)
@@ -0,0 +1,195 @@
+/*
+ * DSpaceLocaleAction.java
+ *
+ *
+ * Copyright (c) 2002-2007, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+
+package org.dspace.app.xmlui.cocoon;
+
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.parameters.Parameters;
+
+import org.apache.cocoon.acting.ServiceableAction;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.i18n.I18nUtils;
+import org.apache.cocoon.i18n.I18nUtils.LocaleValidator;
+import org.dspace.core.ConfigurationManager;
+import org.dspace.core.I18nUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * This action looks at several places to determine what locale should be used for 
+ * this request. We use cocoon's i18nUtils find local method which will look in 
+ * several places continuing to the next step if no local is found.:
+ * 
+ * 1. HTTP Request parameter 'locale' 
+ * 2. Session attribute 'locale'
+ * 3. First matching cookie parameter 'locale' within each cookie sent
+ * 4. Sitemap parameter "locale"
+ * 5. Locale setting of the requesting browser or server default
+ * 6. Default
+ * 7. Blank
+ * 8. Fail
+ * 
+ * Only those locales which are listed in xmlui.supported.locales will be identified,
+ * if no acceptable locales are found then the default locale will be used.
+ * 
+ * @author Scott Phillips
+ */
+public class DSpaceLocaleAction extends ServiceableAction implements Configurable {
+
+   
+	/** A validator class which tests if a local is a supported locale */
+	private static DSpaceLocaleValidator localeValidator;
+	
+	/** The default locale if no acceptable locales are identified */
+	private static Locale defaultLocale;
+	
+	
+	/** 
+	 * Configure the action.
+	 */
+	 public void configure(Configuration config)
+	 {
+		 if (localeValidator == null)
+			 localeValidator = new DSpaceLocaleValidator();
+		 
+		 if (defaultLocale == null)
+			 defaultLocale = I18nUtil.getDefaultLocale();
+	 }
+	
+	
+    /**
+     * Action which obtains the current environments locale information, and
+     * places it in the objectModel (and optionally in a session/cookie).
+     */
+    public Map act(Redirector redirector,
+                   SourceResolver resolver,
+                   Map objectModel,
+                   String source,
+                   Parameters parameters)
+    throws Exception {
+        
+        Locale locale = I18nUtils.findLocale(objectModel, "locale-attribute", parameters, defaultLocale, false, true, false, localeValidator);
+
+        if (locale == null) {
+            if (getLogger().isDebugEnabled()) {
+                getLogger().debug("No locale found, using default");
+            }
+            locale = I18nUtil.getDefaultLocale();
+        }
+
+        String localeStr = locale.toString();
+        if (getLogger().isDebugEnabled()) {
+            getLogger().debug("Found locale: " + localeStr);
+        }
+
+        I18nUtils.storeLocale(objectModel,
+                              "locale-attribute",
+                              localeStr,
+                              false,
+                              false,
+                              false,
+                              false);
+
+        // Set up a map for sitemap parameters
+        Map map = new HashMap();
+        map.put("language", locale.getLanguage());
+        map.put("country", locale.getCountry());
+        map.put("variant", locale.getVariant());
+        map.put("locale", localeStr);
+        return map;
+    }
+
+    
+    /**
+     * This validator class workes with cocoon's i18nutils class to test if locales are valid. 
+     * For dspace we define a locale as valid if it is listed in xmlui.supported.locales config 
+     * parameter.
+     */
+    public static class DSpaceLocaleValidator implements LocaleValidator {
+
+    	/** the list of supported locales that may be used. */
+    	private List<Locale> supportedLocales = new ArrayList<Locale>();
+    	
+    	/**
+    	 * Build a list supported locales to validate against upon object construction.
+    	 */
+    	public DSpaceLocaleValidator()
+    	{
+            if (ConfigurationManager.getProperty("xmlui.supported.locales") != null)
+            {
+
+                String supportedLocalesConfig = ConfigurationManager.getProperty("xmlui.supported.locales");
+                String[] parts = supportedLocalesConfig.split(",");
+                
+                for (String part : parts)
+                {
+                	Locale supportedLocale = I18nUtils.parseLocale(part.trim(), null);
+                	if (supportedLocale != null)
+                	{
+                		supportedLocales.add(supportedLocale);
+                	}
+                }
+            }
+
+            // The default locale is always supported
+            supportedLocales.add(I18nUtil.getDefaultLocale());
+    	}
+    	
+    	
+    	/**
+         * @param name of the locale (for debugging)
+         * @param locale to test
+         * @return true if locale satisfies validator's criteria
+         */
+		public boolean test(String name, Locale test) {
+			for (Locale locale : supportedLocales)
+				if (locale.equals(test))
+					return true;
+			return false;
+			
+		}
+    	
+    }
+    
+    
+}

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/sitemap.xmap
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/sitemap.xmap	2008-03-04 05:03:36 UTC (rev 2787)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/sitemap.xmap	2008-03-04 05:48:48 UTC (rev 2788)
@@ -155,15 +155,7 @@
 			<map:reader name="BitstreamReader" src="org.dspace.app.xmlui.cocoon.BitstreamReader"/>
 		</map:readers>
 		<map:actions>
-			<map:action name="locale" src="org.apache.cocoon.acting.LocaleAction">
-				<locale-attribute>locale</locale-attribute>
-				<use-locale>true</use-locale>
-				<default-locale language="en" country="US"/>
-				<store-in-request>false</store-in-request>
-				<create-session>false</create-session>
-				<store-in-session>false</store-in-session>
-				<store-in-cookie>false</store-in-cookie>
-			</map:action>
+			<map:action name="locale" src="org.dspace.app.xmlui.cocoon.DSpaceLocaleAction"/>
 			<map:action name="StartAuthentication" src="org.dspace.app.xmlui.aspect.eperson.StartAuthenticationAction"/>
 			<map:action name="DSpacePropertyFileReader" src="org.dspace.app.xmlui.cocoon.DSpacePropertyFileReader" />
 			<map:action name="PropertyFileReader" src="org.dspace.app.xmlui.cocoon.PropertyFileReader" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2793
          http://dspace.svn.sourceforge.net/dspace/?rev=2793&view=rev
Author:   ScottPhillips
Date:     2008-03-07 09:33:32 -0800 (Fri, 07 Mar 2008)

Log Message:
-----------
(Scott Phillips) SF#1908952 - Office 2007 formats cannot be added to FormatRegistry

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/registries/bitstream-formats.xml
    branches/dspace-1_5_x/dspace/etc/database_schema.sql
    branches/dspace-1_5_x/dspace/etc/database_schema_14-15.sql
    branches/dspace-1_5_x/dspace/etc/oracle/database_schema.sql
    branches/dspace-1_5_x/dspace/etc/oracle/database_schema_142-15.sql

Modified: branches/dspace-1_5_x/dspace/config/registries/bitstream-formats.xml
===================================================================
--- branches/dspace-1_5_x/dspace/config/registries/bitstream-formats.xml	2008-03-07 12:17:35 UTC (rev 2792)
+++ branches/dspace-1_5_x/dspace/config/registries/bitstream-formats.xml	2008-03-07 17:33:32 UTC (rev 2793)
@@ -113,6 +113,15 @@
   </bitstream-type>
 
   <bitstream-type>
+    <mimetype>application/vnd.openxmlformats-officedocument.wordprocessingml.document</mimetype>
+    <short_description>Microsoft Word XML</short_description>
+    <description>Microsoft Word XML</description>
+    <support_level>1</support_level>
+    <internal>false</internal>
+    <extension>docx</extension>
+  </bitstream-type>
+
+  <bitstream-type>
     <mimetype>application/vnd.ms-powerpoint</mimetype>
     <short_description>Microsoft Powerpoint</short_description>
     <description>Microsoft Powerpoint</description>
@@ -122,6 +131,15 @@
   </bitstream-type>
 
   <bitstream-type>
+    <mimetype>application/vnd.openxmlformats-officedocument.presentationml.presentation</mimetype>
+    <short_description>Microsoft Powerpoint XML</short_description>
+    <description>Microsoft Powerpoint XML</description>
+    <support_level>1</support_level>
+    <internal>false</internal>
+    <extension>pptx</extension>
+  </bitstream-type>
+
+  <bitstream-type>
     <mimetype>application/vnd.ms-excel</mimetype>
     <short_description>Microsoft Excel</short_description>
     <description>Microsoft Excel</description>
@@ -130,7 +148,18 @@
     <extension>xls</extension>
   </bitstream-type>
 
+
   <bitstream-type>
+    <mimetype>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</mimetype>
+    <short_description>Microsoft Excel XML</short_description>
+    <description>Microsoft Excel XML</description>
+    <support_level>1</support_level>
+    <internal>false</internal>
+    <extension>xlsx</extension>
+  </bitstream-type>
+
+
+  <bitstream-type>
     <mimetype>application/marc</mimetype>
     <short_description>MARC</short_description>
     <description>Machine-Readable Cataloging records</description>

Modified: branches/dspace-1_5_x/dspace/etc/database_schema.sql
===================================================================
--- branches/dspace-1_5_x/dspace/etc/database_schema.sql	2008-03-07 12:17:35 UTC (rev 2792)
+++ branches/dspace-1_5_x/dspace/etc/database_schema.sql	2008-03-07 17:33:32 UTC (rev 2793)
@@ -118,7 +118,7 @@
 CREATE TABLE BitstreamFormatRegistry
 (
   bitstream_format_id INTEGER PRIMARY KEY,
-  mimetype            VARCHAR(48),
+  mimetype            VARCHAR(256),
   short_description   VARCHAR(128) UNIQUE,
   description         TEXT,
   support_level       INTEGER,

Modified: branches/dspace-1_5_x/dspace/etc/database_schema_14-15.sql
===================================================================
--- branches/dspace-1_5_x/dspace/etc/database_schema_14-15.sql	2008-03-07 12:17:35 UTC (rev 2792)
+++ branches/dspace-1_5_x/dspace/etc/database_schema_14-15.sql	2008-03-07 17:33:32 UTC (rev 2793)
@@ -62,7 +62,15 @@
 -------------------------------------------------------------------------------
 ALTER TABLE workspaceitem ADD page_reached INTEGER;
 
+
 -------------------------------------------------------------------------
+-- Increase the mimetype field size to support larger types, such as the 
+-- new Word 2007 mimetypes.
+-------------------------------------------------------------------------
+ALTER TABLE BitstreamFormatRegistry ALTER COLUMN mimetype TYPE VARCHAR(256);
+
+
+-------------------------------------------------------------------------
 -- Tables to manage cache of item counts for communities and collections
 -------------------------------------------------------------------------
 

Modified: branches/dspace-1_5_x/dspace/etc/oracle/database_schema.sql
===================================================================
--- branches/dspace-1_5_x/dspace/etc/oracle/database_schema.sql	2008-03-07 12:17:35 UTC (rev 2792)
+++ branches/dspace-1_5_x/dspace/etc/oracle/database_schema.sql	2008-03-07 17:33:32 UTC (rev 2793)
@@ -79,7 +79,7 @@
 CREATE TABLE BitstreamFormatRegistry
 (
   bitstream_format_id INTEGER PRIMARY KEY,
-  mimetype            VARCHAR2(48),
+  mimetype            VARCHAR2(256),
   short_description   VARCHAR2(128) UNIQUE,
   description         VARCHAR2(2000),
   support_level       INTEGER,

Modified: branches/dspace-1_5_x/dspace/etc/oracle/database_schema_142-15.sql
===================================================================
--- branches/dspace-1_5_x/dspace/etc/oracle/database_schema_142-15.sql	2008-03-07 12:17:35 UTC (rev 2792)
+++ branches/dspace-1_5_x/dspace/etc/oracle/database_schema_142-15.sql	2008-03-07 17:33:32 UTC (rev 2793)
@@ -66,7 +66,15 @@
 -------------------------------------------------------------------------------
 ALTER TABLE workspaceitem ADD page_reached INTEGER;
 
+
 -------------------------------------------------------------------------
+-- Increase the mimetype field size to support larger types, such as the 
+-- new Word 2007 mimetypes.
+-------------------------------------------------------------------------
+ALTER TABLE BitstreamFormatRegistry MODIFY (mimetype VARCHAR(256));
+
+
+-------------------------------------------------------------------------
 -- Tables to manage cache of item counts for communities and collections
 -------------------------------------------------------------------------
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2795
          http://dspace.svn.sourceforge.net/dspace/?rev=2795&view=rev
Author:   mdiggory
Date:     2008-03-07 15:16:10 -0800 (Fri, 07 Mar 2008)

Log Message:
-----------
rename generated webapps and force assembly to use 2.2-beta-1

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/pom.xml
    branches/dspace-1_5_x/dspace/src/assemble/assembly.xml

Modified: branches/dspace-1_5_x/dspace/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/pom.xml	2008-03-07 19:53:12 UTC (rev 2794)
+++ branches/dspace-1_5_x/dspace/pom.xml	2008-03-07 23:16:10 UTC (rev 2795)
@@ -490,6 +490,7 @@
          <!--  overall project assembly -->
          <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
+            <version>2.2-beta-1</version>
             <configuration>
                <descriptors>
                   <descriptor>src/assemble/assembly.xml</descriptor>

Modified: branches/dspace-1_5_x/dspace/src/assemble/assembly.xml
===================================================================
--- branches/dspace-1_5_x/dspace/src/assemble/assembly.xml	2008-03-07 19:53:12 UTC (rev 2794)
+++ branches/dspace-1_5_x/dspace/src/assemble/assembly.xml	2008-03-07 23:16:10 UTC (rev 2795)
@@ -59,6 +59,7 @@
 			</includes>
 			<excludes>
 				<exclude>org.dspace:dspace-xmlui-webapp</exclude>
+            <exclude>org.dspace:dspace-xmlui-lang</exclude>
 				<exclude>org.dspace:dspace-lni-webapp</exclude>
 				<exclude>org.dspace:dspace-sword-webapp</exclude>
 				<exclude>org.dspace:dspace-jspui-webapp</exclude>
@@ -67,9 +68,10 @@
 			<binaries>
 				<includeDependencies>false</includeDependencies>
 				<outputDirectory>webapps</outputDirectory>
-			    <outputFileNameMapping>${artifactId}-${version}</outputFileNameMapping>
-                <unpack>true</unpack>
-			</binaries>
+			   <outputFileNameMapping>${artifactId}</outputFileNameMapping>
+            <unpack>true</unpack>
+         </binaries>
+         
 		</moduleSet>
 	</moduleSets>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2815
          http://dspace.svn.sourceforge.net/dspace/?rev=2815&view=rev
Author:   ScottPhillips
Date:     2008-03-11 23:01:29 -0700 (Tue, 11 Mar 2008)

Log Message:
-----------
(Scott Phillips) Added shibboleth options to disable editing of metadata and registration of new users if desired.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/configure.html
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/EditProfile.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/Navigation.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/PasswordLogin.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-12 05:59:57 UTC (rev 2814)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-12 06:01:29 UTC (rev 2815)
@@ -1059,6 +1059,14 @@
 # ensure that the 'dspace.hostname' parameter is set to the correctly.
 #xmlui.force.ssl = true
 
+# Determine if new users should be allowed to register or edit their own metadata. 
+# These parameters are usefull in congunction with shibboleth where you want to 
+# disallow registration and disable the user's ability to edit their metadata 
+# because both come from Shibboleth.
+#xmlui.user.registration=true
+#xmlui.user.editmetadata=true
+
+
 # Allow the user to override which theme is used to display a particular page. 
 # When submitting a request add the HTTP parameter "themepath" which corresponds 
 # to a particular theme, that specified theme will be used instead of the any 

Modified: branches/dspace-1_5_x/dspace/docs/configure.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/configure.html	2008-03-12 05:59:57 UTC (rev 2814)
+++ branches/dspace-1_5_x/dspace/docs/configure.html	2008-03-12 06:01:29 UTC (rev 2815)
@@ -831,13 +831,29 @@
    
 
       <tr>
+        <td><code>xmlui.user.registration</code></td>
+
+        <td><code>true</code></td>
+
+        <td>Determine if new users should be allowed to register.This parameter is usefull in congunction with shibboleth where you want to disallow registration because shibboleth will automatically register the user. Default value is true.</td>
+      </tr>
+
+      <tr>
+        <td><code>xmlui.user.editmetadata</code></td>
+
+        <td><code>true</code></td>
+
+        <td>Determine if users should be allowed to edit their own metadata. This parameter is usefull in congunction with shibboleth where you want to disable the user's ability to edit their metadata because it came from Shibboleth. Default value is true.</td>
+      </tr>
+
+      <tr>
         <td><code>xmlui.force.ssl</code></td>
 
         <td><code>true</code></td>
 
-        <td>Force all authenticated connections to use SSL, only non-authenticated connections are allowed over plain http. If set to true, then you need to ensure that the 'dspace.hostname' parameter is set to the correctly.</td>
+        <td>Force all authenticated connections to use SSL, only non-authenticated connections are allowed over plain http. If set to true, then you need to ensure that the 'dspace.hostname' parameter is set to the correctly. Default value is false.</td>
       </tr>
-   
+      
       <tr>
         <td><code>xmlui.theme.allowoverrides</code></td>
 

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/EditProfile.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/EditProfile.java	2008-03-12 05:59:57 UTC (rev 2814)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/EditProfile.java	2008-03-12 06:01:29 UTC (rev 2815)
@@ -63,6 +63,7 @@
 import org.dspace.app.xmlui.wing.element.Select;
 import org.dspace.app.xmlui.wing.element.Text;
 import org.dspace.content.Collection;
+import org.dspace.core.ConfigurationManager;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.Subscribe;
 import org.xml.sax.SAXException;
@@ -277,6 +278,8 @@
        {
            firstName.addError(T_error_required);
        }
+       if (!registering && !ConfigurationManager.getBooleanProperty("xmlui.user.editmetadata", true))
+    	   firstName.setDisabled();
        
        // Last name
        Text lastName = identity.addItem().addText("last_name");
@@ -287,6 +290,8 @@
        {
            lastName.addError(T_error_required);
        }
+       if (!registering &&!ConfigurationManager.getBooleanProperty("xmlui.user.editmetadata", true))
+    	   lastName.setDisabled();
        
        // Phone
        Text phone = identity.addItem().addText("phone");
@@ -296,6 +301,8 @@
        {
            phone.addError(T_error_required);
        }
+       if (!registering && !ConfigurationManager.getBooleanProperty("xmlui.user.editmetadata", true))
+    	   phone.setDisabled();
         
        // Subscriptions
        if (!registering)

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/Navigation.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/Navigation.java	2008-03-12 05:59:57 UTC (rev 2814)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/Navigation.java	2008-03-12 06:01:29 UTC (rev 2815)
@@ -60,6 +60,7 @@
 import org.dspace.app.xmlui.wing.element.Options;
 import org.dspace.app.xmlui.wing.element.UserMeta;
 import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.ConfigurationManager;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 import org.xml.sax.SAXException;
@@ -214,7 +215,8 @@
         else 
         {
             account.addItemXref(contextPath+"/login",T_login);
-            account.addItemXref(contextPath+"/register",T_register);
+            if (ConfigurationManager.getBooleanProperty("xmlui.user.registration", true))
+            	account.addItemXref(contextPath+"/register",T_register);
         }
     }
 

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/PasswordLogin.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/PasswordLogin.java	2008-03-12 05:59:57 UTC (rev 2814)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/PasswordLogin.java	2008-03-12 06:01:29 UTC (rev 2815)
@@ -60,6 +60,7 @@
 import org.dspace.app.xmlui.wing.element.PageMeta;
 import org.dspace.app.xmlui.wing.element.Password;
 import org.dspace.app.xmlui.wing.element.Text;
+import org.dspace.core.ConfigurationManager;
 import org.xml.sax.SAXException;
 
 /**
@@ -232,9 +233,12 @@
         Item submit = list.addItem("login-in", null);
         submit.addButton("submit").setValue(T_submit);
         
-        Division register = login.addDivision("register");
-        register.setHead(T_head2);
-        register.addPara(T_para1);
-        register.addPara().addXref(contextPath + "/register",T_register_link);
+        if (ConfigurationManager.getBooleanProperty("xmlui.user.registration", true))
+        {
+	        Division register = login.addDivision("register");
+	        register.setHead(T_head2);
+	        register.addPara(T_para1);
+	        register.addPara().addXref(contextPath + "/register",T_register_link);
+        }
     }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2828
          http://dspace.svn.sourceforge.net/dspace/?rev=2828&view=rev
Author:   ScottPhillips
Date:     2008-03-12 19:55:12 -0700 (Wed, 12 Mar 2008)

Log Message:
-----------
(Scott Phillips) Added xmlui.user.loginredirect to determine where a user should go after logging into the system.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/configure.html
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/AuthenticateAction.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-13 02:00:37 UTC (rev 2827)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-13 02:55:12 UTC (rev 2828)
@@ -1066,7 +1066,14 @@
 #xmlui.user.registration=true
 #xmlui.user.editmetadata=true
 
+# After a user has logged into the system, which url should they be directed too? 
+# Leave this parameter blank or undefined to direct users to the homepage, or
+# "/profile" for the user's profile, or another reasonable choice is "/submissions" 
+# to see if the user has any tasks awaiting their attention. The default is the 
+# repository home page.
+#xmlui.user.loginredirect=/profile
 
+
 # Allow the user to override which theme is used to display a particular page. 
 # When submitting a request add the HTTP parameter "themepath" which corresponds 
 # to a particular theme, that specified theme will be used instead of the any 

Modified: branches/dspace-1_5_x/dspace/docs/configure.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/configure.html	2008-03-13 02:00:37 UTC (rev 2827)
+++ branches/dspace-1_5_x/dspace/docs/configure.html	2008-03-13 02:55:12 UTC (rev 2828)
@@ -847,6 +847,14 @@
       </tr>
 
       <tr>
+        <td><code>xmlui.user.loginredirect</code></td>
+
+        <td><code>/profile</code></td>
+
+        <td>Determine where a user is directed after logging into the system. Leave this parameter blank or undefined to direct users to the repository homepage, or "/profile" for the user's profile, or another reasonable choice is "/submissions" to see if the user has any tasks awaiting their attention. The default is the repository home page.</td>
+      </tr>
+
+      <tr>
         <td><code>xmlui.force.ssl</code></td>
 
         <td><code>true</code></td>

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/AuthenticateAction.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/AuthenticateAction.java	2008-03-13 02:00:37 UTC (rev 2827)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/AuthenticateAction.java	2008-03-13 02:55:12 UTC (rev 2828)
@@ -54,6 +54,7 @@
 import org.apache.cocoon.environment.http.HttpEnvironment;
 import org.apache.cocoon.sitemap.PatternException;
 import org.dspace.app.xmlui.utils.AuthenticationUtil;
+import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 
@@ -113,6 +114,12 @@
                 		// that of the originaly interrupted request.
                 		redirectURL += AuthenticationUtil.resumeInterruptedRequest(objectModel);
                 	}
+                	else
+                	{
+                		// Otherwise direct the user to the login page
+                		String loginRedirect = ConfigurationManager.getProperty("xmlui.user.loginredirect");
+                		redirectURL += (loginRedirect != null) ? loginRedirect.trim() : "";	
+                	}
                 	
                     // Authentication successfull send a redirect.
                     final HttpServletResponse httpResponse = (HttpServletResponse) objectModel.get(HttpEnvironment.HTTP_RESPONSE_OBJECT);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2831
          http://dspace.svn.sourceforge.net/dspace/?rev=2831&view=rev
Author:   grahamtriggs
Date:     2008-03-13 09:19:15 -0700 (Thu, 13 Mar 2008)

Log Message:
-----------
Fixed problem with thumbnails appearing multiple times if you include multiple dates in your list columns.
Also provides for a more attractive display, and faster table rendering.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace-api/src/main/resources/Messages.properties
    branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java
    branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemListTag.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-13 15:08:06 UTC (rev 2830)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-13 16:19:15 UTC (rev 2831)
@@ -307,6 +307,8 @@
 webui.submit.blocktheses = false
 
 # whether to display thumbnails on browse and search results pages (1.2+)
+# nb - if you have customised the columnlist, then you must also
+# include a 'thumbnail' column in your configuration (1.5+)
 webui.browse.thumbnail.show = false
 
 # max dimensions of the browse/search thumbs. Must be <= thumbnail.maxwidth
@@ -422,7 +424,15 @@
 # fields at least the date and title fields as specified by the
 # webui.browse.index.* configuration options below.
 #
-# webui.itemlist.columns = dc.date.issued(date), dc.title, dc.contributor.*
+# If you have enabled thumbnails (webui.browse.thumbnail.show), you must also
+# include a 'thumbnail' entry in your columns - this is where the thumbnail will be displayed
+#
+# webui.itemlist.columns = thumbnail, dc.date.issued(date), dc.title, dc.contributor.*
+#
+# You can customise the width of each column with the following line - you can have numbers (pixels)
+# or percentages. For the 'thumbnail' column, a setting of '*' will use the max width specified
+# for browse thumbnails (webui.browse.thumbnail.maxwidth, thumbnail.maxwidth)
+# webui.itemlist.widths = *, 130, 60%, 40%
 
 # Additionally, you can override the DC fields used on the listing page for
 # a given browse index and/or sort option. As a sort option or index may be defined
@@ -445,8 +455,19 @@
 # The following example would display the date of accession in place of the issue date
 # whenever the dateaccessioned browse index or sort option is selected.
 #
-# webui.itemlist.dateaccessioned.columns = dc.date.accessioned(date), dc.title, dc.contributor.*
+# Just like webui.itemlist.columns, you will need to include a 'thumbnail' entry to display
+# and thumbnails in the item list
+#
+# webui.itemlist.dateaccessioned.columns = thumbnail, dc.date.accessioned(date), dc.title, dc.contributor.*
+#
+# As above, you can customise the width of the columns for each configured column list, substituting '.widths' for
+# '.columns' in the property name. See the setting for webui.itemlist.widths for more details
+# webui.itemlist.dateaccessioned.widths = *, 130, 60%, 40%
 
+# You can also set the overall size of the item list table with the following setting. It can lead to faster
+# table rendering when used with the column widths above, but not generally recommended.
+# webui.itemlist.tablewidth = 100%
+
 ###### Browse Configuration ######
 #
 # Use this to configure the browse indices. Each entry will receive a link in the 

Modified: branches/dspace-1_5_x/dspace-api/src/main/resources/Messages.properties
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/resources/Messages.properties	2008-03-13 15:08:06 UTC (rev 2830)
+++ branches/dspace-1_5_x/dspace-api/src/main/resources/Messages.properties	2008-03-13 16:19:15 UTC (rev 2831)
@@ -66,6 +66,7 @@
 itemlist.dc.type.course        = Course
 itemlist.dc.type.degree        = Degree
 itemlist.et-al                 = et al
+itemlist.thumbnail             = Preview
 
 jsp.adminhelp                                                   = Admin Help...
 jsp.administer                                                  = Administer

Modified: branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java	2008-03-13 15:08:06 UTC (rev 2830)
+++ branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java	2008-03-13 16:19:15 UTC (rev 2831)
@@ -107,8 +107,11 @@
     private boolean disableCrossLinks = false;
 
     /** The default fields to be displayed when listing items */
-    private static String listFields = "dc.date.issued(date), dc.title, dc.contributor.*";
+    private static String listFields;
 
+    /** The default widths for the columns */
+    private static String listWidths;
+
     /** The default field which is bound to the browse by date */
     private static String dateField = "dc.date.issued";
 
@@ -125,6 +128,17 @@
     {
         super();
         getThumbSettings();
+
+        if (showThumbs)
+        {
+            listFields = "thumbnail, dc.date.issued(date), dc.title, dc.contributor.*";
+            listWidths = "*, 130, 60%, 40%";
+        }
+        else
+        {
+            listFields = "dc.date.issued(date), dc.title, dc.contributor.*";
+            listWidths = "130, 60%, 40%";
+        }
     }
 
     public int doStartTag() throws JspException
@@ -144,7 +158,8 @@
         */
 
         // get the elements to display
-        String browseListLine = null;
+        String browseListLine  = null;
+        String browseWidthLine = null;
 
         // As different indexes / sort options may require different columns to be displayed
         // try to obtain a custom configuration based for the browse that has been performed
@@ -158,7 +173,10 @@
             {
                 // First, try to get a configuration for this browse and sort option combined
                 if (so != null && browseListLine == null)
-                    browseListLine = ConfigurationManager.getProperty("webui.itemlist.browse." + bix.getName() + ".sort." + so.getName() + ".columns");
+                {
+                    browseListLine  = ConfigurationManager.getProperty("webui.itemlist.browse." + bix.getName() + ".sort." + so.getName() + ".columns");
+                    browseWidthLine = ConfigurationManager.getProperty("webui.itemlist.browse." + bix.getName() + ".sort." + so.getName() + ".widths");
+                }
 
                 // We haven't got a sort option defined, so get one for the index
                 // - it may be required later
@@ -168,29 +186,88 @@
 
             // If no config found, attempt to get one for this sort option
             if (so != null && browseListLine == null)
-                browseListLine = ConfigurationManager.getProperty("webui.itemlist.sort." + so.getName() + ".columns");
+            {
+                browseListLine  = ConfigurationManager.getProperty("webui.itemlist.sort." + so.getName() + ".columns");
+                browseWidthLine = ConfigurationManager.getProperty("webui.itemlist.sort." + so.getName() + ".widths");
+            }
 
             // If no config found, attempt to get one for this browse index
             if (bix != null && browseListLine == null)
-                browseListLine = ConfigurationManager.getProperty("webui.itemlist.browse." + bix.getName() + ".columns");
+            {
+                browseListLine  = ConfigurationManager.getProperty("webui.itemlist.browse." + bix.getName() + ".columns");
+                browseWidthLine = ConfigurationManager.getProperty("webui.itemlist.browse." + bix.getName() + ".widths");
+            }
 
             // If no config found, attempt to get a general one, using the sort name
             if (so != null && browseListLine == null)
-                browseListLine = ConfigurationManager.getProperty("webui.itemlist." + so.getName() + ".columns");
+            {
+                browseListLine  = ConfigurationManager.getProperty("webui.itemlist." + so.getName() + ".columns");
+                browseWidthLine = ConfigurationManager.getProperty("webui.itemlist." + so.getName() + ".widths");
+            }
 
             // If no config found, attempt to get a general one, using the index name
             if (bix != null && browseListLine == null)
-                browseListLine = ConfigurationManager.getProperty("webui.itemlist." + bix.getName() + ".columns");
+            {
+                browseListLine  = ConfigurationManager.getProperty("webui.itemlist." + bix.getName() + ".columns");
+                browseWidthLine = ConfigurationManager.getProperty("webui.itemlist." + bix.getName() + ".widths");
+            }
         }
 
         if (browseListLine == null)
         {
-            browseListLine = ConfigurationManager.getProperty("webui.itemlist.columns");
+            browseListLine  = ConfigurationManager.getProperty("webui.itemlist.columns");
+            browseWidthLine = ConfigurationManager.getProperty("webui.itemlist.widths");
         }
 
+        // Have we read a field configration from dspace.cfg?
         if (browseListLine != null)
         {
+            // If thumbnails are disabled, strip out any thumbnail column from the configuration
+            if (!showThumbs && browseListLine.contains("thumbnail"))
+            {
+                // Ensure we haven't got any nulls
+                browseListLine  = browseListLine  == null ? "" : browseListLine;
+                browseWidthLine = browseWidthLine == null ? "" : browseWidthLine;
+
+                // Tokenize the field and width lines
+                StringTokenizer bllt = new StringTokenizer(browseListLine,  ",");
+                StringTokenizer bwlt = new StringTokenizer(browseWidthLine, ",");
+
+                StringBuilder newBLLine = new StringBuilder();
+                StringBuilder newBWLine = new StringBuilder();
+                while (bllt.hasMoreTokens() && bwlt.hasMoreTokens())
+                {
+                    String browseListTok  = bllt.hasMoreTokens() ? bllt.nextToken() : null;
+                    String browseWidthTok = bwlt.hasMoreTokens() ? bwlt.nextToken() : null;
+
+                    // Only use the Field and Width tokens, if the field isn't 'thumbnail'
+                    if (browseListTok == null || !browseListTok.trim().equals("thumbnail"))
+                    {
+                        if (browseListTok != null)
+                        {
+                            if (newBLLine.length() > 0)
+                                newBLLine.append(",");
+
+                            newBLLine.append(browseListTok);
+                        }
+
+                        if (browseWidthTok != null)
+                        {
+                            if (newBWLine.length() > 0)
+                                newBWLine.append(",");
+
+                            newBWLine.append(browseWidthTok);
+                        }
+                    }
+                }
+
+                // Use the newly built configuration file
+                browseListLine  = newBLLine.toString();
+                browseWidthLine = newBWLine.toString();
+            }
+
             listFields = browseListLine;
+            listWidths = browseWidthLine;
         }
 
         // get the date and title fields
@@ -213,7 +290,9 @@
         	authorField = authorLine;
         }
 
-        String[] fieldArr  = listFields.split("\\s*,\\s*");
+        // Arrays used to hold the information we will require when outputting each row
+        String[] fieldArr  = listFields == null ? new String[0] : listFields.split("\\s*,\\s*");
+        String[] widthArr  = listWidths == null ? new String[0] : listWidths.split("\\s*,\\s*");
         boolean isDate[]   = new boolean[fieldArr.length];
         boolean emph[]     = new boolean[fieldArr.length];
         boolean isAuthor[] = new boolean[fieldArr.length];
@@ -223,10 +302,59 @@
 
         try
         {
-        	// get the interlinking configuration too
+        	// Get the interlinking configuration too
             CrossLinks cl = new CrossLinks();
 
-            out.println("<table align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
+            // Get a width for the table
+            String tablewidth = ConfigurationManager.getProperty("webui.itemlist.tablewidth");
+
+            // If we have column widths, try to use a fixed layout table - faster for browsers to render
+            // but not if we have to add an 'edit item' button - we can't know how big it will be
+            if (widthArr.length > 0 && widthArr.length == fieldArr.length && !linkToEdit)
+            {
+                // If the table width has been specified, we can make this a fixed layout
+                if (!StringUtils.isEmpty(tablewidth))
+                {
+                    out.println("<table style=\"width: " + tablewidth + "; table-layout: fixed;\" align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
+                }
+                else
+                {
+                    // Otherwise, don't constrain the width
+                    out.println("<table align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
+                }
+
+                // Output the known column widths
+                out.print("<colgroup>");
+
+                for (int w = 0; w < widthArr.length; w++)
+                {
+                    out.print("<col width=\"");
+
+                    // For a thumbnail column of width '*', use the configured max width for thumbnails
+                    if (fieldArr[w].equals("thumbnail") && widthArr[w].equals("*"))
+                    {
+                        out.print(thumbItemListMaxWidth);
+                    }
+                    else
+                    {
+                        out.print(StringUtils.isEmpty(widthArr[w]) ? "*" : widthArr[w]);
+                    }
+
+                    out.print("\" />");
+                }
+
+                out.println("</colgroup>");
+            }
+            else if (!StringUtils.isEmpty(tablewidth))
+            {
+                out.println("<table width=\"" + tablewidth + "\" align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
+            }
+            else
+            {
+                out.println("<table align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
+            }
+
+            // Output the table headers
             out.println("<tr>");
 
             for (int colIdx = 0; colIdx < fieldArr.length; colIdx++)
@@ -296,7 +424,7 @@
 
             out.print("</tr>");
 
-            // now prepare the frags for each of the table elements
+            // now output each item row
             for (int i = 0; i < items.length; i++)
             {
                 // now prepare the XHTML frag for this division
@@ -356,20 +484,17 @@
 
                     // now prepare the content of the table division
                     String metadata = "-";
-                    if (metadataArray.length > 0)
+                    if (field.equals("thumbnail"))
                     {
+                        metadata = getThumbMarkup(hrq, items[i]);
+                    }
+                    else if (metadataArray.length > 0)
+                    {
                         // format the date field correctly
                         if (isDate[colIdx])
                         {
-                            // FIXME: why on _earth_ is this here.  Thumbnail config should
-                        	// be part of the display columns configuration
-                            String thumbs = "";
-                            if (showThumbs)
-                            {
-                                thumbs = getThumbMarkup(hrq, items[i]);
-                            }
                             DCDate dd = new DCDate(metadataArray[0].value);
-                            metadata = UIUtil.displayDate(dd, false, false, hrq) + thumbs;
+                            metadata = UIUtil.displayDate(dd, false, false, hrq);
                         }
                         // format the title field correctly for withdrawn items (ie. don't link)
                         else if (field.equals(titleField) && items[i].isWithdrawn())
@@ -750,7 +875,7 @@
                      .append("\" alt=\"")
                      .append(alt + "\" ")
                      .append(scAttr)
-                     .append("/></a>");
+                     .append("/ border=\"0\"></a>");
 
         	return thumbFrag.toString();
         }

Modified: branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemListTag.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemListTag.java	2008-03-13 15:08:06 UTC (rev 2830)
+++ branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemListTag.java	2008-03-13 16:19:15 UTC (rev 2831)
@@ -118,8 +118,11 @@
     private boolean disableCrossLinks = false;
 
     /** The default fields to be displayed when listing items */
-    private static String listFields = "dc.date.issued(date), dc.title, dc.contributor.*";
+    private static String listFields;
 
+    /** The default widths for the columns */
+    private static String listWidths;
+
     /** The default field which is bound to the browse by date */
     private static String dateField = "dc.date.issued";
 
@@ -136,6 +139,17 @@
     {
         super();
         getThumbSettings();
+
+        if (showThumbs)
+        {
+            listFields = "thumbnail, dc.date.issued(date), dc.title, dc.contributor.*";
+            listWidths = "*, 130, 60%, 40%";
+        }
+        else
+        {
+            listFields = "dc.date.issued(date), dc.title, dc.contributor.*";
+            listWidths = "130, 60%, 40%";
+        }
     }
 
     public int doStartTag() throws JspException
@@ -154,23 +168,78 @@
 
         // get the elements to display
         String configLine = null;
+        String widthLine  = null;
+
         if (sortOption != null)
         {
             if (configLine == null)
+            {
                 configLine = ConfigurationManager.getProperty("webui.itemlist.sort." + sortOption.getName() + ".columns");
+                widthLine  = ConfigurationManager.getProperty("webui.itemlist.sort." + sortOption.getName() + ".widths");
+            }
 
             if (configLine == null)
+            {
                 configLine = ConfigurationManager.getProperty("webui.itemlist." + sortOption.getName() + ".columns");
+                widthLine  = ConfigurationManager.getProperty("webui.itemlist." + sortOption.getName() + ".widths");
+            }
         }
 
         if (configLine == null)
         {
             configLine = ConfigurationManager.getProperty("webui.itemlist.columns");
+            widthLine  = ConfigurationManager.getProperty("webui.itemlist.widths");
         }
 
+        // Have we read a field configration from dspace.cfg?
         if (configLine != null)
         {
+            // If thumbnails are disabled, strip out any thumbnail column from the configuration
+            if (!showThumbs && configLine.contains("thumbnail"))
+            {
+                // Ensure we haven't got any nulls
+                configLine = configLine  == null ? "" : configLine;
+                widthLine  = widthLine   == null ? "" : widthLine;
+
+                // Tokenize the field and width lines
+                StringTokenizer llt = new StringTokenizer(configLine,  ",");
+                StringTokenizer wlt = new StringTokenizer(widthLine, ",");
+
+                StringBuilder newLLine = new StringBuilder();
+                StringBuilder newWLine = new StringBuilder();
+                while (llt.hasMoreTokens() && wlt.hasMoreTokens())
+                {
+                    String listTok  = llt.hasMoreTokens() ? llt.nextToken() : null;
+                    String widthTok = wlt.hasMoreTokens() ? wlt.nextToken() : null;
+
+                    // Only use the Field and Width tokens, if the field isn't 'thumbnail'
+                    if (listTok == null || !listTok.trim().equals("thumbnail"))
+                    {
+                        if (listTok != null)
+                        {
+                            if (newLLine.length() > 0)
+                                newLLine.append(",");
+
+                            newLLine.append(listTok);
+                        }
+
+                        if (widthTok != null)
+                        {
+                            if (newWLine.length() > 0)
+                                newWLine.append(",");
+
+                            newWLine.append(widthTok);
+                        }
+                    }
+                }
+
+                // Use the newly built configuration file
+                configLine  = newLLine.toString();
+                widthLine = newWLine.toString();
+            }
+
             listFields = configLine;
+            listWidths = widthLine;
         }
 
         // get the date and title fields
@@ -192,7 +261,9 @@
             authorField = authorLine;
         }
 
+        // Arrays used to hold the information we will require when outputting each row
         String[] fieldArr  = listFields.split("\\s*,\\s*");
+        String[] widthArr  = listWidths == null ? new String[0] : listWidths.split("\\s*,\\s*");
         boolean isDate[]   = new boolean[fieldArr.length];
         boolean emph[]     = new boolean[fieldArr.length];
         boolean isAuthor[] = new boolean[fieldArr.length];
@@ -202,9 +273,59 @@
 
         try
         {
+            // Get the interlinking configuration too
             CrossLinks cl = new CrossLinks();
 
-            out.println("<table align=\"center\" class=\"miscTable\" summary=\"This table browse all dspace content\">");
+            // Get a width for the table
+            String tablewidth = ConfigurationManager.getProperty("webui.itemlist.tablewidth");
+
+            // If we have column widths, output a fixed layout table - faster for browsers to render
+            // but not if we have to add an 'edit item' button - we can't know how big it will be
+            if (widthArr.length > 0 && widthArr.length == fieldArr.length && !linkToEdit)
+            {
+                // If the table width has been specified, we can make this a fixed layout
+                if (!StringUtils.isEmpty(tablewidth))
+                {
+                    out.println("<table style=\"width: " + tablewidth + "; table-layout: fixed;\" align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
+                }
+                else
+                {
+                    // Otherwise, don't constrain the width
+                    out.println("<table align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
+                }
+
+                // Output the known column widths
+                out.print("<colgroup>");
+
+                for (int w = 0; w < widthArr.length; w++)
+                {
+                    out.print("<col width=\"");
+
+                    // For a thumbnail column of width '*', use the configured max width for thumbnails
+                    if (fieldArr[w].equals("thumbnail") && widthArr[w].equals("*"))
+                    {
+                        out.print(thumbItemListMaxWidth);
+                    }
+                    else
+                    {
+                        out.print(StringUtils.isEmpty(widthArr[w]) ? "*" : widthArr[w]);
+                    }
+
+                    out.print("\" />");
+                }
+
+                out.println("</colgroup>");
+            }
+            else if (!StringUtils.isEmpty(tablewidth))
+            {
+                out.println("<table width=\"" + tablewidth + "\" align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
+            }
+            else
+            {
+                out.println("<table align=\"center\" class=\"miscTable\" summary=\"This table browses all dspace content\">");
+            }
+
+            // Output the table headers
             out.println("<tr>");
 
             for (int colIdx = 0; colIdx < fieldArr.length; colIdx++)
@@ -272,7 +393,7 @@
 
             out.print("</tr>");
 
-            // now prepare the frags for each of the table elements
+            // now output each item row
             for (int i = 0; i < items.length; i++)
             {
                 // now prepare the XHTML frag for this division
@@ -332,20 +453,17 @@
 
                     // now prepare the content of the table division
                     String metadata = "-";
+                    if (field.equals("thumbnail"))
+                    {
+                        metadata = getThumbMarkup(hrq, items[i]);
+                    }
                     if (metadataArray.length > 0)
                     {
                         // format the date field correctly
                         if (isDate[colIdx])
                         {
-                            // this is to be consistent with the existing setup.
-                            // seems like an odd place to put it though (FIXME)
-                            String thumbs = "";
-                            if (showThumbs)
-                            {
-                                thumbs = getThumbMarkup(hrq, items[i]);
-                            }
                             DCDate dd = new DCDate(metadataArray[0].value);
-                            metadata = UIUtil.displayDate(dd, false, false, hrq) + thumbs;
+                            metadata = UIUtil.displayDate(dd, false, false, hrq);
                         }
                         // format the title field correctly for withdrawn items (ie. don't link)
                         else if (field.equals(titleField) && items[i].isWithdrawn())
@@ -730,7 +848,7 @@
                      .append("\" alt=\"")
                      .append(alt + "\" ")
                      .append(scAttr)
-                     .append("/></a>");
+                     .append("/ border=\"0\"></a>");
 
             return thumbFrag.toString();
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2834
          http://dspace.svn.sourceforge.net/dspace/?rev=2834&view=rev
Author:   tdonohue
Date:     2008-03-13 12:15:32 -0700 (Thu, 13 Mar 2008)

Log Message:
-----------
Removed references to the old 'history' directory, and the 'history.dir' param from dspace.cfg

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/bin/dspace-info.pl
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/install.html
    branches/dspace-1_5_x/dspace/src/main/config/build.xml

Modified: branches/dspace-1_5_x/dspace/bin/dspace-info.pl
===================================================================
--- branches/dspace-1_5_x/dspace/bin/dspace-info.pl	2008-03-13 18:01:54 UTC (rev 2833)
+++ branches/dspace-1_5_x/dspace/bin/dspace-info.pl	2008-03-13 19:15:32 UTC (rev 2834)
@@ -67,7 +67,6 @@
 
 my $assetstore_dir = GetConfigParameter( "assetstore.dir" );
 my $search_dir     = GetConfigParameter( "search.dir"     );
-my $history_dir    = GetConfigParameter( "history.dir"    );
 my $logs_dir       = GetConfigParameter( "log.dir"        );
 
 # directories in this array are to be checked for ownership by
@@ -105,7 +104,6 @@
 
 my $assetstore_size = DirectorySize( $assetstore_dir );
 my $search_size     = DirectorySize( $search_dir     );
-my $history_size    = DirectorySize( $history_dir    );
 my $logs_size       = DirectorySize( $logs_dir       );
 my $database_size   = DirectorySize( $database_dir   );
 

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-13 18:01:54 UTC (rev 2833)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-13 19:15:32 UTC (rev 2834)
@@ -168,9 +168,6 @@
 # Follow same pattern as for assetstores above (local or SRB)
 
 
-# Directory for history serializations
-history.dir = ${dspace.dir}/history
-
 ##### Logging configuration #####
 
 # Override default log4j configuration

Modified: branches/dspace-1_5_x/dspace/docs/install.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/install.html	2008-03-13 18:01:54 UTC (rev 2833)
+++ branches/dspace-1_5_x/dspace/docs/install.html	2008-03-13 19:15:32 UTC (rev 2834)
@@ -749,7 +749,6 @@
 	config.template.log4j-handle-plugin.properties
 	config.template.oaicat.properties
 	assetstore.dir
-	history.dir
 	log.dir
 	upload.temp.dir
 	report.dir

Modified: branches/dspace-1_5_x/dspace/src/main/config/build.xml
===================================================================
--- branches/dspace-1_5_x/dspace/src/main/config/build.xml	2008-03-13 18:01:54 UTC (rev 2833)
+++ branches/dspace-1_5_x/dspace/src/main/config/build.xml	2008-03-13 19:15:32 UTC (rev 2834)
@@ -334,8 +334,6 @@
 
 		<mkdir dir="${handle.dir}" />
 
-		<mkdir dir="${history.dir}" />
-
 		<mkdir dir="${search.dir}" />
 
 		<mkdir dir="${log.dir}" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2840
          http://dspace.svn.sourceforge.net/dspace/?rev=2840&view=rev
Author:   ScottPhillips
Date:     2008-03-13 15:44:19 -0700 (Thu, 13 Mar 2008)

Log Message:
-----------
(Scott Phillips) Added a DTD for the xmlui.xconf

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/configuration/XMLUIConfiguration.java

Added Paths:
-----------
    branches/dspace-1_5_x/dspace/config/xmlui.dtd
    branches/dspace-1_5_x/dspace/config/xmlui.xconf

Removed Paths:
-------------
    branches/dspace-1_5_x/dspace/config/xmlui.xconf

Added: branches/dspace-1_5_x/dspace/config/xmlui.dtd
===================================================================
--- branches/dspace-1_5_x/dspace/config/xmlui.dtd	                        (rev 0)
+++ branches/dspace-1_5_x/dspace/config/xmlui.dtd	2008-03-13 22:44:19 UTC (rev 2840)
@@ -0,0 +1,15 @@
+<!ELEMENT xmlui (aspects,themes)>
+<!ELEMENT aspects (aspect+)>
+<!ELEMENT aspect EMPTY>
+<!ATTLIST aspect name CDATA #REQUIRED>
+<!ATTLIST aspect description CDATA #IMPLIED>
+<!ATTLIST aspect desc CDATA #IMPLIED>
+<!ATTLIST aspect path CDATA #REQUIRED>
+
+<!ELEMENT themes (theme*)>
+<!ELEMENT theme EMPTY>
+<!ATTLIST theme name CDATA #REQUIRED>
+<!ATTLIST theme handle CDATA #IMPLIED>
+<!ATTLIST theme regex CDATA #IMPLIED>
+<!ATTLIST theme path CDATA #REQUIRED>
+<!ATTLIST theme id CDATA #IMPLIED>
\ No newline at end of file

Deleted: branches/dspace-1_5_x/dspace/config/xmlui.xconf
===================================================================
--- branches/dspace-1_5_x/dspace/config/xmlui.xconf	2008-03-13 22:22:21 UTC (rev 2839)
+++ branches/dspace-1_5_x/dspace/config/xmlui.xconf	2008-03-13 22:44:19 UTC (rev 2840)
@@ -1,115 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    - xmlui.xconf
-    -
-    - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts
-    - Institute of Technology.  All rights reserved.
-    - 
-    - Redistribution and use in source and binary forms, with or without
-    - modification, are permitted provided that the following conditions are
-    - met:
-    - 
-    - - Redistributions of source code must retain the above copyright
-    - notice, this list of conditions and the following disclaimer.
-    - 
-    - - Redistributions in binary form must reproduce the above copyright
-    - notice, this list of conditions and the following disclaimer in the
-    - documentation and/or other materials provided with the distribution.
-    - 
-    - - Neither the name of the Hewlett-Packard Company nor the name of the
-    - Massachusetts Institute of Technology nor the names of their
-    - contributors may be used to endorse or promote products derived from
-    - this software without specific prior written permission.
-    - 
-    - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-    - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-    - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-    - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-    - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-    - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-    - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-    - DAMAGE.
--->
-
-
-<!--
-    - The XMLUI (Manakin Release) configuration file
-    -
-    - Authors: Scott Phillips
-    - Version: $Revision: 1.2 $
-    - Date:    $Date: 2007/01/09 22:00:00 $
--->
-
-<xmlui>
-    <!--
-        This section configures the Aspect "chain". An Aspect provides a set 
-        of coupled features for the system. All Aspects are chained together
-        such that together they form the complete DSpace website. This is where
-        the chain is defined, the order in which each aspect is declared 
-        determines it's order in the chain. Aspects at the top are invoked 
-        first. 
-        
-        The <aspect> element has two attributes, name & path. The name is used 
-        to identify the Aspect, while the path determines the directory. The 
-        path attribute should be listed exactly as it is found in the
-        /xmlui/cocoon/aspects/ directory followed by a slash.
-    -->
-    <aspects>
-        <aspect name="Artifact Browser" path="resource://aspects/ArtifactBrowser/" />
-        <aspect name="Administration" path="resource://aspects/Administrative/" />
-        <aspect name="E-Person" path="resource://aspects/EPerson/" />
-        <aspect name="Submission and Workflow" path="resource://aspects/Submission/" />
-
-        <!-- 
-            This aspect tests the various possible DRI features, 
-            it helps a theme developer create themes 
-        -->
-        <!-- <aspect name="XML Tests" path="resource://aspects/XMLTest/"/> -->
-    </aspects>
-
-    <!--
-        This section configures which Theme should apply to a particular URL. 
-        Themes stylize an abstract DRI document (generated by the Aspect
-        chain from above) and produce XHTML (or possibly another format) for 
-        display to the user. Each theme rule is processed in the order that it 
-        is listed below, the first rule that matches is the theme that is applied.
-        
-        The <theme> element has several attributes including: name, id, regex, 
-        handle, and path. The name attribute is used to identify the theme, while
-        the path determines the directory. The path attribute should be listed 
-        exactly as it is found in the /xmlui/cocoon/themes/ directory. Both the
-        regex and handle attributes determine if the theme rule matches the URL.
-        If either the pattern or handle attribute is left off then the only the 
-        other component is used to determine matching. 
-        
-        Keep in mind that the order of <theme> elements matters in the case of 
-        overlapping matching rules. For example, a theme rule with a very broad
-        matching rule (like regex=".*") will override a more specific theme 
-        declaration (like handle="1234/23") if placed before it. 
-        
-        Finally, theme application also "cascades" down to pages derived from the
-        one that the theme directly applies to. Thus, a theme applied to a 
-        specific community will also apply to that community's collections and 
-        their respective items.    
-    -->
-    <themes>
-        <!-- Example configuration -->
-
-        <!-- <theme name="Test Theme 1" handle="123456789/1" path="theme1/"/>    -->
-        <!-- <theme name="Test Theme 2" regex="community-list" path="theme2/"/> -->
-
-        <!-- Default theme -->
-        <theme name="Default Reference Theme" regex=".*" path="Reference/" />
-
-        <!-- Classic theme, inspired by the JSP UI -->
-        <!-- <theme name="Classic" regex=".*" path="Classic/" /> -->
-
-        <!-- Table based browse display -->
-        <!-- <theme name="Table Theme" regex=".*" path="TableTheme/" /> -->
-
-    </themes>
-</xmlui>
\ No newline at end of file

Added: branches/dspace-1_5_x/dspace/config/xmlui.xconf
===================================================================
--- branches/dspace-1_5_x/dspace/config/xmlui.xconf	                        (rev 0)
+++ branches/dspace-1_5_x/dspace/config/xmlui.xconf	2008-03-13 22:44:19 UTC (rev 2840)
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<!DOCTYPE xmlui SYSTEM "xmlui.dtd">
+
+<!--
+    - xmlui.xconf
+    -
+    - Copyright (c) 2002, Hewlett-Packard Company and Massachusetts
+    - Institute of Technology.  All rights reserved.
+    - 
+    - Redistribution and use in source and binary forms, with or without
+    - modification, are permitted provided that the following conditions are
+    - met:
+    - 
+    - - Redistributions of source code must retain the above copyright
+    - notice, this list of conditions and the following disclaimer.
+    - 
+    - - Redistributions in binary form must reproduce the above copyright
+    - notice, this list of conditions and the following disclaimer in the
+    - documentation and/or other materials provided with the distribution.
+    - 
+    - - Neither the name of the Hewlett-Packard Company nor the name of the
+    - Massachusetts Institute of Technology nor the names of their
+    - contributors may be used to endorse or promote products derived from
+    - this software without specific prior written permission.
+    - 
+    - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    - HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+    - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+    - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+    - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+    - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+    - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+    - DAMAGE.
+-->
+
+
+<!--
+    - The XMLUI (Manakin Release) configuration file
+    -
+    - Authors: Scott Phillips
+    - Version: $Revision: 1.2 $
+    - Date:    $Date: 2007/01/09 22:00:00 $
+-->
+
+<xmlui>
+    <!--
+        This section configures the Aspect "chain". An Aspect provides a set 
+        of coupled features for the system. All Aspects are chained together
+        such that together they form the complete DSpace website. This is where
+        the chain is defined, the order in which each aspect is declared 
+        determines it's order in the chain. Aspects at the top are invoked 
+        first. 
+        
+        The <aspect> element has two attributes, name & path. The name is used 
+        to identify the Aspect, while the path determines the directory. The 
+        path attribute should be listed exactly as it is found in the
+        /xmlui/cocoon/aspects/ directory followed by a slash.
+    -->
+    <aspects>
+        <aspect name="Artifact Browser" path="resource://aspects/ArtifactBrowser/" />
+        <aspect name="Administration" path="resource://aspects/Administrative/" />
+        <aspect name="E-Person" path="resource://aspects/EPerson/" />
+        <aspect name="Submission and Workflow" path="resource://aspects/Submission/" />
+
+        <!-- 
+            This aspect tests the various possible DRI features, 
+            it helps a theme developer create themes 
+        -->
+        <!-- <aspect name="XML Tests" path="resource://aspects/XMLTest/"/> -->
+    </aspects>
+
+    <!--
+        This section configures which Theme should apply to a particular URL. 
+        Themes stylize an abstract DRI document (generated by the Aspect
+        chain from above) and produce XHTML (or possibly another format) for 
+        display to the user. Each theme rule is processed in the order that it 
+        is listed below, the first rule that matches is the theme that is applied.
+        
+        The <theme> element has several attributes including: name, id, regex, 
+        handle, and path. The name attribute is used to identify the theme, while
+        the path determines the directory. The path attribute should be listed 
+        exactly as it is found in the /xmlui/cocoon/themes/ directory. Both the
+        regex and handle attributes determine if the theme rule matches the URL.
+        If either the pattern or handle attribute is left off then the only the 
+        other component is used to determine matching. 
+        
+        Keep in mind that the order of <theme> elements matters in the case of 
+        overlapping matching rules. For example, a theme rule with a very broad
+        matching rule (like regex=".*") will override a more specific theme 
+        declaration (like handle="1234/23") if placed before it. 
+        
+        Finally, theme application also "cascades" down to pages derived from the
+        one that the theme directly applies to. Thus, a theme applied to a 
+        specific community will also apply to that community's collections and 
+        their respective items.    
+    -->
+    <themes>
+        <!-- Example configuration -->
+
+        <!-- <theme name="Test Theme 1" handle="123456789/1" path="theme1/"/>    -->
+        <!-- <theme name="Test Theme 2" regex="community-list" path="theme2/"/> -->
+
+        <!-- Default theme -->
+        <theme name="Default Reference Theme" regex=".*" path="Reference/" />
+
+        <!-- Classic theme, inspired by the JSP UI -->
+        <!-- <theme name="Classic" regex=".*" path="Classic/" /> -->
+
+        <!-- Table based browse display -->
+        <!-- <theme name="Table Theme" regex=".*" path="TableTheme/" /> -->
+
+    </themes>
+</xmlui>
\ No newline at end of file

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/configuration/XMLUIConfiguration.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/configuration/XMLUIConfiguration.java	2008-03-13 22:22:21 UTC (rev 2839)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/configuration/XMLUIConfiguration.java	2008-03-13 22:44:19 UTC (rev 2840)
@@ -121,7 +121,8 @@
         	throw new IllegalStateException("None of the xmlui configuration paths were valid: "+ allPaths);
         }
         
-        
+        // FIXME: Sometime in the future require that the xmlui.xconf be valid. 
+        // SAXBuilder builder = new SAXBuilder(true);
         SAXBuilder builder = new SAXBuilder();
         Document config = builder.build(configFile);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2846
          http://dspace.svn.sourceforge.net/dspace/?rev=2846&view=rev
Author:   mdiggory
Date:     2008-03-17 14:15:17 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
Adjust all modules to be under a simpler naming convention so that rebranding does not have to be of the war/webapp names themselves.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/DRISchemaReference.html
    branches/dspace-1_5_x/dspace/docs/application.html
    branches/dspace-1_5_x/dspace/docs/configure.html
    branches/dspace-1_5_x/dspace/docs/directories.html
    branches/dspace-1_5_x/dspace/docs/install.html
    branches/dspace-1_5_x/dspace/docs/update.html
    branches/dspace-1_5_x/dspace/modules/jspui/pom.xml
    branches/dspace-1_5_x/dspace/modules/lni/pom.xml
    branches/dspace-1_5_x/dspace/modules/oai/pom.xml
    branches/dspace-1_5_x/dspace/modules/pom.xml
    branches/dspace-1_5_x/dspace/modules/sword/pom.xml
    branches/dspace-1_5_x/dspace/modules/xmlui/pom.xml

Added Paths:
-----------
    branches/dspace-1_5_x/dspace/modules/jspui/
    branches/dspace-1_5_x/dspace/modules/lni/
    branches/dspace-1_5_x/dspace/modules/oai/
    branches/dspace-1_5_x/dspace/modules/sword/
    branches/dspace-1_5_x/dspace/modules/xmlui/

Removed Paths:
-------------
    branches/dspace-1_5_x/dspace/modules/dspace-jspui/
    branches/dspace-1_5_x/dspace/modules/dspace-lni/
    branches/dspace-1_5_x/dspace/modules/dspace-oai/
    branches/dspace-1_5_x/dspace/modules/dspace-sword/
    branches/dspace-1_5_x/dspace/modules/dspace-xmlui/

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-17 21:14:40 UTC (rev 2845)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-03-17 21:15:17 UTC (rev 2846)
@@ -27,7 +27,10 @@
 dspace.dir = /dspace
 
 # DSpace base URL.  Include port number etc., but NOT trailing slash
-dspace.url = http://localhost:8080/dspace-jspui
+# Change to xmlui if you wish to use the xmlui as the default, or remove
+# "/jspui" and set webapp of your choice as the "ROOT" webapp in 
+# the servlet engine.
+dspace.url = http://localhost:8080/jspui
 
 # DSpace host name - should match base URL.  Do not include port number
 dspace.hostname = localhost
@@ -1250,14 +1253,14 @@
 # which DSpace will construct the deposit location urls for
 # collections.
 #
-# The default is {dspace.url}/dspace-sword/deposit
+# The default is {dspace.url}/sword/deposit
 #
 # In the event that you are not deploying DSpace as the ROOT
 # application in the servlet container, this will generate
 # incorrect URLs, and you should override the functionality
 # by specifying in full as below:
 #
-# sword.deposit.url = http://www.myu.ac.uk/dspace-sword/deposit
+# sword.deposit.url = http://www.myu.ac.uk/sword/deposit
 
 # The metadata field in which to store the updated date for
 # items deposited via SWORD.

Modified: branches/dspace-1_5_x/dspace/docs/DRISchemaReference.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/DRISchemaReference.html	2008-03-17 21:14:40 UTC (rev 2845)
+++ branches/dspace-1_5_x/dspace/docs/DRISchemaReference.html	2008-03-17 21:15:17 UTC (rev 2846)
@@ -3064,7 +3064,7 @@
 
         <metadata element="title">Examlpe DRI page</metadata>
 
-        <metadata element="contextPath">/dspace-xmlui/</metadata>
+        <metadata element="contextPath">/xmlui/</metadata>
 
         <metadata ...> ... </metadata>
 
@@ -3584,7 +3584,7 @@
 
     <metadata element="title">Examlpe DRI page</metadata>
 
-    <metadata element="contextPath">/dspace-xmlui/</metadata>
+    <metadata element="contextPath">/xmlui/</metadata>
 
     <metadata ...> ... </metadata>
 

Modified: branches/dspace-1_5_x/dspace/docs/application.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/application.html	2008-03-17 21:14:40 UTC (rev 2845)
+++ branches/dspace-1_5_x/dspace/docs/application.html	2008-03-17 21:15:17 UTC (rev 2846)
@@ -428,17 +428,17 @@
 
   <p>The DSpace platform supports the <a href="http://www.openarchives.org/">Open Archives Initiative Protocol for Metadata Harvesting</a> (OAI-PMH) version 2.0 as a data provider. This is accomplished using the <a href="http://www.oclc.org/research/software/oai/cat.shtm">OAICat framework from OCLC</a>.</p>
 
-  <p>The DSpace build process builds a Web application archive, <code><em>[dspace-source]</em>/build/dspace-oai.war</code>), in much the same way as <a href="#webui_build">the Web UI build process</a> described above. The only differences are that the JSPs are not included, and <code><em>[dspace-source]</em>/etc/oai-web.xml</code> is used as the deployment descriptor. This 'webapp' is deployed to receive and respond to OAI-PMH requests via HTTP. Note that typically it should <em>not</em> be deployed on SSL (<code>https:</code> protocol). In a typical configuration, this is deployed at <code>dspace-oai</code>, for example:</p>
+  <p>The DSpace build process builds a Web application archive, <code><em>[dspace-source]</em>/build/oai.war</code>), in much the same way as <a href="#webui_build">the Web UI build process</a> described above. The only differences are that the JSPs are not included, and <code><em>[dspace-source]</em>/etc/oai-web.xml</code> is used as the deployment descriptor. This 'webapp' is deployed to receive and respond to OAI-PMH requests via HTTP. Note that typically it should <em>not</em> be deployed on SSL (<code>https:</code> protocol). In a typical configuration, this is deployed at <code>oai</code>, for example:</p>
   <pre>
-http://dspace.myu.edu/dspace-oai/request?verb=Identify
+http://dspace.myu.edu/oai/request?verb=Identify
 </pre>
 
   <p>The 'base URL' of this DSpace deployment would be:</p>
   <pre>
-http://dspace.myu.edu/dspace-oai/request
+http://dspace.myu.edu/oai/request
 </pre>
 
-  <p>It is this URL that should be registered with <a href="http://www.openarchives.org/">www.openarchives.org</a>. Note that you can easily change the '<code>request</code>' portion of the URL by editing <code><em>[dspace-source]</em>/etc/oai-web.xml</code> and rebuilding and deploying <code>dspace-oai.war</code>.</p>
+  <p>It is this URL that should be registered with <a href="http://www.openarchives.org/">www.openarchives.org</a>. Note that you can easily change the '<code>request</code>' portion of the URL by editing <code><em>[dspace-source]</em>/etc/oai-web.xml</code> and rebuilding and deploying <code>oai.war</code>.</p>
 
   <p>DSpace provides implementations of the OAICat interfaces <code>AbstractCatalog</code>, <code>RecordFactory</code> and <code>Crosswalk</code> that interface with the DSpace content management API and harvesting API (in the search subsystem).</p>
 

Modified: branches/dspace-1_5_x/dspace/docs/configure.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/configure.html	2008-03-17 21:14:40 UTC (rev 2845)
+++ branches/dspace-1_5_x/dspace/docs/configure.html	2008-03-17 21:15:17 UTC (rev 2846)
@@ -993,7 +993,7 @@
 
 <p>The interface will automatically determine which file to select based upon the user's browser and system configuration. For example, if the user's browser is set to Australian English then first the system will check if <code>messages_en_au.xml</code> is available. If this translation is not available it will fall back to <code>messages_en.xml</code>, and finally if that is not available, <code>messages.xml</code>. </p>
 
-<p>Manakin supplies an English only translation of the interface.  In order to add other translations to the system, locate the <code>[dspace-source]/dspace/modules/dspace-xmlui/src/main/webapp/i18n/</code> directory. By default this directory will be empty; to add additional translations add alternative versions of the <code>messages.xml</code> file in specific language and country variants as needed for your installation. </p>
+<p>Manakin supplies an English only translation of the interface.  In order to add other translations to the system, locate the <code>[dspace-source]/dspace/modules/xmlui/src/main/webapp/i18n/</code> directory. By default this directory will be empty; to add additional translations add alternative versions of the <code>messages.xml</code> file in specific language and country variants as needed for your installation. </p>
 
 To set a language other than English as the default language for the repository's interface, simply name the translation catalogue for the new default language "<code>messages.xml</code>"</p>
 
@@ -1002,7 +1002,7 @@
 <p>Manakin themes stylize the look-and-feel of the repository, community, or collection and are distributed as self-contained packages. A Manakin/DSpace installation may have multiple themes installed and available to be used in different parts of the repository. The central component of a theme is the sitemap.xmap, which defines what resources are available to the theme such as XSL stylesheets, CSS stylesheets, images, or multimedia files.</p>
 
 <b>1) Create theme skeleton</b>
-<p>Most theme developers do not create a new theme from scratch; instead they start from the standard theme template, which defines a skeleton structure for a theme. The template is located at: <code>[dspace-source]/dspace-xmlui/dspace-xmlui-webbapp/src/main/webbapp/themes/template</code>. To start your new theme simply copy the theme template into your locally defined modules directory, <code>[dspace-source]/dspace/modules/dspace-xmlui/src/main/webbapp/themes/[your theme's directory]/</code>.</p>
+<p>Most theme developers do not create a new theme from scratch; instead they start from the standard theme template, which defines a skeleton structure for a theme. The template is located at: <code>[dspace-source]/dspace-xmlui/dspace-xmlui-webbapp/src/main/webbapp/themes/template</code>. To start your new theme simply copy the theme template into your locally defined modules directory, <code>[dspace-source]/dspace/modules/xmlui/src/main/webbapp/themes/[your theme's directory]/</code>.</p>
 
 <b>2) Modify theme variables</b>
 <p>The next step is to modify the theme's parameters so that the theme knows where it is located. Open the <code>[your theme's directory]/sitemap.xmap</code> and look for <code>&lt;global-variables&gt;</code></p>
@@ -1249,14 +1249,14 @@
         If you set webui.supported.locales make sure that all the related additional files for each language are available. <code>LOCALE</code> should correspond to the locale set in <code>webui.supported.locales</code>, 
         e. g.: for webui.supported.locales = en, de, fr, there should be:
     <ul>
-      <li><code><i>[dspace]</i>/modules/dspace-jspui/src/main/resources/Messages.properties</code></li>
-      <li><code><i>[dspace]</i>/modules/dspace-jspui/src/main/resources/Messages_en.properties</code></li>
-      <li><code><i>[dspace]</i>/modules/dspace-jspui/src/main/resources/Messages_de.properties</code></li>
-      <li><code><i>[dspace]</i>/modules/dspace-jspui/src/main/resources/Messages_fr.properties</code></li>
+      <li><code><i>[dspace]</i>/modules/jspui/src/main/resources/Messages.properties</code></li>
+      <li><code><i>[dspace]</i>/modules/jspui/src/main/resources/Messages_en.properties</code></li>
+      <li><code><i>[dspace]</i>/modules/jspui/src/main/resources/Messages_de.properties</code></li>
+      <li><code><i>[dspace]</i>/modules/jspui/src/main/resources/Messages_fr.properties</code></li>
     </ul>
     Files to be localized:
     <ul>
-    <li><code><i>[dspace]</i>/modules/dspace-jspui/src/main/resources/Messages_LOCALE.properties</code></li>
+    <li><code><i>[dspace]</i>/modules/jspui/src/main/resources/Messages_LOCALE.properties</code></li>
       <li><code><i>[dspace]</i>/config/input-forms_LOCALE.xml</code></li>
       <li><code><i>[dspace]</i>/config/default_LOCALE.license</code> <i>should be pure ascii</i></li>
       <li><code><i>[dspace]</i>/config/news-top_LOCALE.html</code></li>
@@ -1294,7 +1294,7 @@
      <li><code><i>[dspace-source]</i>/dspace/target/dspace-[version].dir/webapps/dspace-jspui-webapp/</code> - The location where they are copied after first building DSpace.</li>
      </ul>
   </p>
-  <p>If you wish to modify a particular JSP, place your edited version in the <code><i>[dspace-source]</i>/dspace/modules/dspace-jspui/src/main/webapp/</code> directory (<i>this is the replacement for the pre-1.5 <code>/jsp/local</code> directory</i>), with the same path as the original.  If they exist, these will be used in preference to the default JSPs. For example:</p>
+  <p>If you wish to modify a particular JSP, place your edited version in the <code><i>[dspace-source]</i>/dspace/modules/jspui/src/main/webapp/</code> directory (<i>this is the replacement for the pre-1.5 <code>/jsp/local</code> directory</i>), with the same path as the original.  If they exist, these will be used in preference to the default JSPs. For example:</p>
 
   <table>
     <tbody>
@@ -1307,22 +1307,22 @@
       <tr>
         <td><code><i>[jsp.dir]</i>/community-list.jsp</code></td>
 
-        <td><code><i>[dspace-source]</i>/dspace/modules/dspace-jspui/src/main/webapp/community-list.jsp</code></td>
+        <td><code><i>[dspace-source]</i>/dspace/modules/jspui/src/main/webapp/community-list.jsp</code></td>
       </tr>
 
       <tr>
         <td><code><i>[jsp.dir]</i>/mydspace/main.jsp</code></td>
 
-        <td><code><i>[dspace-source]</i>/dspace/modules/dspace-jspui/src/main/webapp/mydspace/main.jsp</code></td>
+        <td><code><i>[dspace-source]</i>/dspace/modules/jspui/src/main/webapp/mydspace/main.jsp</code></td>
       </tr>
     </tbody>
   </table>
 
-  <p>Heavy use is made of a style sheet, <code>styles.css.jsp</code>. If you make edits, copy the local version to <code><i>[dspace-source]</i>/dspace/modules/dspace-jspui/src/main/webapp/styles.css.jsp</code>, and it will be used automatically in preference to the default, as described above.</p>
+  <p>Heavy use is made of a style sheet, <code>styles.css.jsp</code>. If you make edits, copy the local version to <code><i>[dspace-source]</i>/dspace/modules/jspui/src/main/webapp/styles.css.jsp</code>, and it will be used automatically in preference to the default, as described above.</p>
 
   <p>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.</p>
 
-  <p>The 'layout' of each page, that is, the top and bottom banners and the navigation bar, are determined by the JSPs <code>/layout/header-*.jsp</code> and <code>/layout/footer-*.jsp</code>. You can provide modified versions of these (in <code><i>[dspace-source]</i>/dspace/modules/dspace-jspui/src/main/webapp/layout</code>), or define more styles and apply them to pages by using the "style" attribute of the <code>dspace:layout</code> tag.</p>
+  <p>The 'layout' of each page, that is, the top and bottom banners and the navigation bar, are determined by the JSPs <code>/layout/header-*.jsp</code> and <code>/layout/footer-*.jsp</code>. You can provide modified versions of these (in <code><i>[dspace-source]</i>/dspace/modules/jspui/src/main/webapp/layout</code>), or define more styles and apply them to pages by using the "style" attribute of the <code>dspace:layout</code> tag.</p>
 
   <p>After you've customized your JSPs, <strong>you must rebuild the DSpace Web application</strong>. If you haven't already built and installed it, follow the <a href="install.html">install</a> directions. Otherwise, follow the steps below:</p>
 
@@ -1840,7 +1840,7 @@
 		<li>Uncomment the DIDL Crosswalk entry from the <code>config/templates/oaicat.properties</code> file</li>
 		<li>Run	the <code>bin/install-configs</code> script</li>
 		<li>Restart Tomcat</li>
-		<li>Verify the Crosswalk is activated by accessing a URL such as <code>http://mydspace/dspace-oai/request?verb=ListRecords&amp;metadataPrefix=didl</code></li>
+		<li>Verify the Crosswalk is activated by accessing a URL such as <code>http://mydspace/oai/request?verb=ListRecords&amp;metadataPrefix=didl</code></li>
 	</ul>
   
    <h3><a name="packager">Configuring Packager Plugins</a></h3>

Modified: branches/dspace-1_5_x/dspace/docs/directories.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/directories.html	2008-03-17 21:14:40 UTC (rev 2845)
+++ branches/dspace-1_5_x/dspace/docs/directories.html	2008-03-17 21:15:17 UTC (rev 2846)
@@ -64,16 +64,16 @@
 	          </li>
 	          <li><code>modules/</code> - The Web UI modules "overlay" directory.  DSpace uses Maven to automatically look here for any customizations you wish to make to DSpace Web interfaces.
 	          	<ul>
-	          	  <li><code>dspace-jspui</code> - Contains all customizations for the JSP User Interface.
+	          	  <li><code>jspui</code> - Contains all customizations for the JSP User Interface.
 	          	    <ul>
 	          	  		<li><code>src/main/resources/</code> - The overlay for JSPUI Resources.  This is the location to place any custom Messages.properties files.</li>
 	          	  		<li><code>src/main/webapp/</code> - The overlay for JSPUI Web Application.  This is the location to place any custom JSPs to be used by DSpace.</li>
 	          		</ul>
 	          	  </li>
-	          	  <li><code>dspace-lni</code> - Contains all customizations for the Lightweight Network Interface.</li>
-	          	  <li><code>dspace-oai</code> - Contains all customizations for the OAI-PMH Interface.</li>
-	          	  <li><code>dspace-sword</code> - Contains all customizations for the SWORD (Simple Web-service Offering Repository Deposit) Interface.</li>
-				  <li><code>dspace-xmlui</code> - Contains all customizations for the XML User Interface (aka Manakin).
+	          	  <li><code>lni</code> - Contains all customizations for the Lightweight Network Interface.</li>
+	          	  <li><code>oai</code> - Contains all customizations for the OAI-PMH Interface.</li>
+	          	  <li><code>sword</code> - Contains all customizations for the SWORD (Simple Web-service Offering Repository Deposit) Interface.</li>
+				  <li><code>xmlui</code> - Contains all customizations for the XML User Interface (aka Manakin).
 	          	  	<ul>
 	          	  		<li><code>src/main/webapp/</code> - The overlay for XMLUI Web Application. This is the location to place custom Themes or Configurations.
 	          	  			<ul>

Modified: branches/dspace-1_5_x/dspace/docs/install.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/install.html	2008-03-17 21:14:40 UTC (rev 2845)
+++ branches/dspace-1_5_x/dspace/docs/install.html	2008-03-17 21:15:17 UTC (rev 2846)
@@ -123,7 +123,7 @@
         <li>This method allows you to customize DSpace configurations (in dspace.cfg) 
           or user interfaces, using basic pre-built interface "overlays".<br>
   </li>
-        <li>It downloads &quot;precompiled&quot; libraries for the core dspace-api, supporting servlets, taglibraries, aspects and themes for the dspace-jspui, dspace-xmlui and other webservice/applications.<br>
+        <li>It downloads &quot;precompiled&quot; libraries for the core dspace-api, supporting servlets, taglibraries, aspects and themes for the dspace-xmlui, dspace-xmlui and other webservice/applications.<br>
             </li>
         <li>This approach exposes the parts of the application that the DSpace commiters would prefer to see customized. All other modules are downloaded from the 'Maven Central Repository'</li>
       </ul>
@@ -150,7 +150,7 @@
       <ul>
         <li><strong>This method is recommended for those who wish to develop DSpace further or alter its underlying capabilities to a greater degree.</strong><br>
         </li>
-        <li>It contains &quot;all&quot; dspace code for the core dspace-api, supporting servlets, taglibraries, aspects and themes for the dspace-jspui, dspace-xmlui and other webservice/applications.<br>
+        <li>It contains &quot;all&quot; dspace code for the core dspace-api, supporting servlets, taglibraries, aspects and themes for the dspace-xmlui, dspace-xmlui and other webservice/applications.<br>
         </li>
         <li>Provides all the same capabilities as the normal release.</li>
       </ul>
@@ -354,15 +354,15 @@
         (but replace <code><em>[dspace]</em></code> with your installation location):</P>
         
         <PRE>&lt;!-- DEFINE A CONTEXT PATH FOR DSpace JSP User Interface  --&gt;
-&lt;Context path="/dspace-jspui" docBase="[dspace]\webapps\dspace-jspui" debug="0" reloadable="true" cachingAllowed="false" allowLinking="true"/&gt;
+&lt;Context path="/jspui" docBase="[dspace]\webapps\jspui" debug="0" reloadable="true" cachingAllowed="false" allowLinking="true"/&gt;
 	
 &lt;!-- DEFINE A CONTEXT PATH FOR DSpace OAI User Interface  --&gt;
-&lt;Context path="/dspace-oai" docBase="[dspace]\webapps\dspace-oai" debug="0" reloadable="true" cachingAllowed="false" allowLinking="true"/&gt;</PRE>
+&lt;Context path="/oai" docBase="[dspace]\webapps\oai" debug="0" reloadable="true" cachingAllowed="false" allowLinking="true"/&gt;</PRE>
         
         <P>Alternatively, you could copy only the DSpace Web application(s) you wish to use from <code><em>[dspace]</em>/webapps</code> to the appropriate directory in your Tomcat/Jetty/Resin installation.  For example:</P>
 
-        <PRE>cp -r <i>[dspace]</i>/webapps/dspace-jspui <i>[tomcat]</i>/webapps
-cp -r <i>[dspace]</i>/webapps/dspace-oai <i>[tomcat]</i>/webapps</PRE>
+        <PRE>cp -r <i>[dspace]</i>/webapps/jspui <i>[tomcat]</i>/webapps
+cp -r <i>[dspace]</i>/webapps/oai <i>[tomcat]</i>/webapps</PRE>
       </li>
 
       <LI>Create an initial administrator account:
@@ -372,9 +372,9 @@
       <LI>Now the moment of truth!  Start up (or restart) Tomcat/Jetty/Resin.  Visit the base URL(s) of your server, depending on which DSpace web applications you want to use.  You should see the DSpace home page.  Congratulations!
         <P>Base URLs of DSpace Web Applications:</P>
         <UL>
-        <li><em>JSP User Interface</em> - (e.g.) http://dspace.myu.edu:8080/dspace-jspui</li>
-        <li><em>XML User Interface (aka. Manakin)</em> -  (e.g.) http://dspace.myu.edu:8080/dspace-xmlui</li>
-        <li><em>OAI-PMH Interface</em> -  (e.g.) http://dspace.myu.edu:8080/dspace-oai/request?verb=identify  (Should return an XML-based response)</li>
+        <li><em>JSP User Interface</em> - (e.g.) http://dspace.myu.edu:8080/jspui</li>
+        <li><em>XML User Interface (aka. Manakin)</em> -  (e.g.) http://dspace.myu.edu:8080/xmlui</li>
+        <li><em>OAI-PMH Interface</em> -  (e.g.) http://dspace.myu.edu:8080/oai/request?verb=identify  (Should return an XML-based response)</li>
         </UL>
       </LI>
     </ol>
@@ -784,15 +784,15 @@
         (but replace <code><em>[dspace]</em></code> with your installation location):</P>
         
         <PRE>&lt;!-- DEFINE A CONTEXT PATH FOR DSpace JSP User Interface  --&gt;
-&lt;Context path="/dspace-jspui" docBase="[dspace]\webapps\dspace-jspui" debug="0" reloadable="true" cachingAllowed="false" allowLinking="true"/&gt;
+&lt;Context path="/jspui" docBase="[dspace]\webapps\jspui" debug="0" reloadable="true" cachingAllowed="false" allowLinking="true"/&gt;
 	
 &lt;!-- DEFINE A CONTEXT PATH FOR DSpace OAI User Interface  --&gt;
-&lt;Context path="/dspace-oai" docBase="[dspace]\webapps\dspace-oai" debug="0" reloadable="true" cachingAllowed="false" allowLinking="true"/&gt;</PRE>
+&lt;Context path="/oai" docBase="[dspace]\webapps\oai" debug="0" reloadable="true" cachingAllowed="false" allowLinking="true"/&gt;</PRE>
 		</li>
 		</ul>
 	</li>
 	<li><p>Start the Tomcat service</p></li>
-	<li><p>Browse to either <code>http://localhost:8080/dspace-jspui</code> or <code>http://localhost:8080/dspace-xmlui</code>. You should see the DSpace home page for
+	<li><p>Browse to either <code>http://localhost:8080/jspui</code> or <code>http://localhost:8080/xmlui</code>. You should see the DSpace home page for
 	either the JSPUI or XMLUI, respectively.</p></li>
 </ol>
 </p>

Modified: branches/dspace-1_5_x/dspace/docs/update.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/update.html	2008-03-17 21:14:40 UTC (rev 2845)
+++ branches/dspace-1_5_x/dspace/docs/update.html	2008-03-17 21:15:17 UTC (rev 2846)
@@ -180,7 +180,7 @@
 </li>
 <li><b>Apply any customizations</b>
 <p>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 <code>[dspace 1.4.2]/jsp/local</code> directory. These should be moved 
-<code>[dspace-source]/dspace/modules/dspace-jspui/src/main/webapp/</code> in the new build structure. See <a href="file:///Users/scott/Development/Workspaces/DSpace1.5/dspace-1.5/dspace/docs/configure.html#jspui-jsp">Customizing the JSP Pages</a> for more information.</li>
+<code>[dspace-source]/dspace/modules/jspui/src/main/webapp/</code> in the new build structure. See <a href="file:///Users/scott/Development/Workspaces/DSpace1.5/dspace-1.5/dspace/docs/configure.html#jspui-jsp">Customizing the JSP Pages</a> for more information.</li>
 	
 	
 	
@@ -771,7 +771,7 @@
         <UL>
           <LI><P>Change the value of <code>OAI_ID_PREFIX</code> at the top of the <code>org.dspace.app.oai.DSpaceOAICatalog</code> class to <code>hdl:</code></P></LI>
           <LI><P>Change the servlet mapping for the <code>OAIHandler</code> servlet back to <code>/</code> (from <code>/request</code>)</P></LI>
-          <LI><P>Rebuild and deploy <code>dspace-oai.war</code></LI>
+          <LI><P>Rebuild and deploy <code>oai.war</code></LI>
         </UL>
 
         <P>However, note that in this case, all the records will be re-harvested by harvesters anyway, so you still need to brace for the associated DB activity; also note that the set spec changes may not be picked up by some harvesters.  It's recommended you read the above-linked mailing list posts to understand why the change was made.</P>

Copied: branches/dspace-1_5_x/dspace/modules/jspui (from rev 2844, branches/dspace-1_5_x/dspace/modules/dspace-jspui)

Modified: branches/dspace-1_5_x/dspace/modules/jspui/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/modules/dspace-jspui/pom.xml	2008-03-17 15:27:55 UTC (rev 2844)
+++ branches/dspace-1_5_x/dspace/modules/jspui/pom.xml	2008-03-17 21:15:17 UTC (rev 2846)
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.dspace.modules</groupId>
-	<artifactId>dspace-jspui</artifactId>
+	<artifactId>jspui</artifactId>
 	<packaging>war</packaging>
 	<name>DSpace JSP-UI :: Web Application</name>
 	<url>http://www.dspace.org</url>
@@ -89,9 +89,9 @@
 	</repositories>
 
 	<scm>
-		<connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/dspace-jspui</connection>
-		<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/dspace-jspui</developerConnection>
-		<url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace/modules/dspace-jspui</url>
+		<connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/jspui</connection>
+		<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/jspui</developerConnection>
+		<url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace/modules/jspui</url>
 	</scm>
 
 	<build>

Copied: branches/dspace-1_5_x/dspace/modules/lni (from rev 2844, branches/dspace-1_5_x/dspace/modules/dspace-lni)

Modified: branches/dspace-1_5_x/dspace/modules/lni/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/modules/dspace-lni/pom.xml	2008-03-17 15:27:55 UTC (rev 2844)
+++ branches/dspace-1_5_x/dspace/modules/lni/pom.xml	2008-03-17 21:15:17 UTC (rev 2846)
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.dspace.modules</groupId>
-	<artifactId>dspace-lni</artifactId>
+	<artifactId>lni</artifactId>
 	<packaging>war</packaging>
 	<name>DSpace LNI :: Web Application</name>
 	<description>
@@ -48,9 +48,9 @@
 	</pluginRepositories>
 
 	<scm>
-		<connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-webapp</connection>
-		<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-webapp</developerConnection>
-		<url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-webapp</url>
+		<connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/lni</connection>
+		<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/lni</developerConnection>
+		<url>http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/lni</url>
 	</scm>
 
 	<build>

Copied: branches/dspace-1_5_x/dspace/modules/oai (from rev 2844, branches/dspace-1_5_x/dspace/modules/dspace-oai)

Modified: branches/dspace-1_5_x/dspace/modules/oai/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/modules/dspace-oai/pom.xml	2008-03-17 15:27:55 UTC (rev 2844)
+++ branches/dspace-1_5_x/dspace/modules/oai/pom.xml	2008-03-17 21:15:17 UTC (rev 2846)
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.dspace.modules</groupId>
-	<artifactId>dspace-oai</artifactId>
+	<artifactId>oai</artifactId>
 	<packaging>war</packaging>
 	<name>DSpace OAI :: Web Application</name>
 	<description>DSpace OAI Service Provider Web Application</description>
@@ -55,9 +55,9 @@
 		into the snapshot repository below.
 	-->
 	<scm>
-		<connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-oai</connection>
-		<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-oai</developerConnection>
-		<url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-oai</url>
+		<connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/oai</connection>
+		<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/oai</developerConnection>
+		<url>http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/oai</url>
 	</scm>
 
 	<build>

Modified: branches/dspace-1_5_x/dspace/modules/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/modules/pom.xml	2008-03-17 21:14:40 UTC (rev 2845)
+++ branches/dspace-1_5_x/dspace/modules/pom.xml	2008-03-17 21:15:17 UTC (rev 2846)
@@ -29,12 +29,18 @@
 		</repository>
 	</repositories>
 
+   <scm>
+      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules</url>
+   </scm>
+   
 	<modules>
-		<module>dspace-xmlui</module>
-		<module>dspace-lni</module>
-		<module>dspace-oai</module>
-		<module>dspace-jspui</module>
-		<module>dspace-sword</module>
+		<module>xmlui</module>
+		<module>lni</module>
+		<module>oai</module>
+		<module>jspui</module>
+		<module>sword</module>
 	</modules>
 	
 </project>
\ No newline at end of file

Copied: branches/dspace-1_5_x/dspace/modules/sword (from rev 2844, branches/dspace-1_5_x/dspace/modules/dspace-sword)

Modified: branches/dspace-1_5_x/dspace/modules/sword/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/modules/dspace-sword/pom.xml	2008-03-17 15:27:55 UTC (rev 2844)
+++ branches/dspace-1_5_x/dspace/modules/sword/pom.xml	2008-03-17 21:15:17 UTC (rev 2846)
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.dspace.modules</groupId>
-	<artifactId>dspace-sword</artifactId>
+	<artifactId>sword</artifactId>
 	<packaging>war</packaging>
 	<name>DSpace SWORD :: Web Application</name>
 	<description>
@@ -58,9 +58,9 @@
 		into the snapshot repository below.
 	-->
 	<scm>
-		<connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/modules/dspace-sword</connection>
-		<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/dspace-sword</developerConnection>
-		<url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace/modules/dspace-sword</url>
+		<connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/sword</connection>
+		<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/sword</developerConnection>
+		<url>http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/sword</url>
 	</scm>
 
 	<build>

Copied: branches/dspace-1_5_x/dspace/modules/xmlui (from rev 2844, branches/dspace-1_5_x/dspace/modules/dspace-xmlui)

Modified: branches/dspace-1_5_x/dspace/modules/xmlui/pom.xml
===================================================================
--- branches/dspace-1_5_x/dspace/modules/dspace-xmlui/pom.xml	2008-03-17 15:27:55 UTC (rev 2844)
+++ branches/dspace-1_5_x/dspace/modules/xmlui/pom.xml	2008-03-17 21:15:17 UTC (rev 2846)
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.dspace.modules</groupId>
-   <artifactId>dspace-xmlui</artifactId>
+   <artifactId>xmlui</artifactId>
    <packaging>war</packaging>
    <name>DSpace XML-UI (Manakin) :: Web Application</name>
    <url>http://projects.dspace.org/dspace-xmlui</url>
@@ -49,9 +49,9 @@
    </pluginRepositories>
 
    <scm>
-      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-xmlui</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-xmlui</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-xmlui</url>
+      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/xmlui</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/xmlui</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace/modules/xmlui</url>
    </scm>
 
    <build>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2849
          http://dspace.svn.sourceforge.net/dspace/?rev=2849&view=rev
Author:   ScottPhillips
Date:     2008-03-17 22:23:13 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
(Scott Phillips) Fixed a bug where the new.xml file was not being read. I changed the file to news-xmlui.xml so that it lists well with the other news files for the jspui. I also have supplied a default version of this file.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap

Added Paths:
-----------
    branches/dspace-1_5_x/dspace/config/news-xmlui.xml

Added: branches/dspace-1_5_x/dspace/config/news-xmlui.xml
===================================================================
--- branches/dspace-1_5_x/dspace/config/news-xmlui.xml	                        (rev 0)
+++ branches/dspace-1_5_x/dspace/config/news-xmlui.xml	2008-03-18 05:23:13 UTC (rev 2849)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<document xmlns="http://di.tamu.edu/DRI/1.0/" xmlns:i18n="http://apache.org/cocoon/i18n/2.1" version="1.1">
+<body>
+<div id="file.news.div.news" n="news" rend="primary">
+<head>DSpace/Manakin Repository</head>
+<p>Welcome to the new Manakin interface to the DSpace digital repository.  DSpace is a digital service that collects, preserves, and distributes digital material. Repositories are important tools for preserving an organization&apos;s legacy; they facilitate digital preservation and scholarly communication.</p>
+</div>
+</body>
+<options/>
+<meta>
+<userMeta/>
+<pageMeta/>
+<repositoryMeta/>
+</meta>
+</document>
\ No newline at end of file

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap	2008-03-18 05:21:16 UTC (rev 2848)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap	2008-03-18 05:23:13 UTC (rev 2849)
@@ -113,7 +113,7 @@
 			    -->
 				<map:act type="DSpacePropertyFileReader">
 					<map:parameter name="dspace.dir" value="dspace.dir" />
-					<map:transform type="Include" src="{dspace.dir}/config/news.xml" /> 
+					<map:transform type="Include" src="file://{dspace.dir}/config/news-xmlui.xml" /> 
 				</map:act>				
 				
 				<map:transform type="FrontPageSearch"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2895
          http://dspace.svn.sourceforge.net/dspace/?rev=2895&view=rev
Author:   ScottPhillips
Date:     2008-04-14 10:58:15 -0700 (Mon, 14 Apr 2008)

Log Message:
-----------
(Scott Phillips) Added the ability for super admins to login as other users. This is controled by the parameter xmlui.user.assumelogin, default value is false.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/configure.html
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowEPersonUtils.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/eperson/EditEPersonForm.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/UnAuthenticateAction.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/AuthenticationUtil.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Administrative/administrative.js
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-04-14 16:08:57 UTC (rev 2894)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-04-14 17:58:15 UTC (rev 2895)
@@ -1151,6 +1151,13 @@
 #xmlui.user.registration=true
 #xmlui.user.editmetadata=true
 
+
+# Determine if super administrators (those whom are in the Administrators group) 
+# can login as another user from the "edit eperson" page. This is usefull for 
+# debugging problems in a running dspace instance, especially in the workflow
+# process. The default value is false, i.e. no one may assume the login of another user.
+#xmlui.user.assumelogin = true
+
 # After a user has logged into the system, which url should they be directed too? 
 # Leave this parameter blank or undefined to direct users to the homepage, or
 # "/profile" for the user's profile, or another reasonable choice is "/submissions" 

Modified: branches/dspace-1_5_x/dspace/docs/configure.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/configure.html	2008-04-14 16:08:57 UTC (rev 2894)
+++ branches/dspace-1_5_x/dspace/docs/configure.html	2008-04-14 17:58:15 UTC (rev 2895)
@@ -845,7 +845,15 @@
 
         <td>Determine if users should be allowed to edit their own metadata. This parameter is usefull in congunction with shibboleth where you want to disable the user's ability to edit their metadata because it came from Shibboleth. Default value is true.</td>
       </tr>
+      
+      <tr>
+        <td><code>xmlui.user.assumelogin</code></td>
 
+        <td><code>true</code></td>
+
+        <td>Determine if super administrators (those whom are in the Administrators group) can login as another user from the "edit eperson" page. This is usefull for debugging problems in a running dspace instance, especially in the workflow process so that you can see exactly what the user is seeing. The default value is false, i.e. no one may assume the login of another user.</td>
+      </tr>
+
       <tr>
         <td><code>xmlui.user.loginredirect</code></td>
 

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowEPersonUtils.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowEPersonUtils.java	2008-04-14 16:08:57 UTC (rev 2894)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowEPersonUtils.java	2008-04-14 17:58:15 UTC (rev 2895)
@@ -47,9 +47,12 @@
 import java.util.Map;
 
 import javax.mail.MessagingException;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.http.HttpEnvironment;
 import org.dspace.app.xmlui.utils.AuthenticationUtil;
+import org.dspace.app.xmlui.utils.ContextUtil;
 import org.dspace.app.xmlui.wing.Message;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
@@ -254,6 +257,39 @@
 	
 	
 	/**
+	 * Log this user in as another user. If the operation failed then the flow result
+	 * will be set to failure with it's mesage set correctly. Note that after logging out
+	 * the user may not have sufficent priveleges to continue.
+	 * 
+	 * @param context The current DSpace context.
+	 * @param objectModel Object model to obtain the HTTP request from.
+	 * @param epersonID The epersonID of the person to login as.
+	 * @return The flow result.
+	 */
+	public static FlowResult processLoginAs(Context context, Map objectModel, int epersonID) throws SQLException
+	{
+		FlowResult result = new FlowResult();
+		result.setContinue(true);
+		result.setOutcome(true);
+		
+		final HttpServletRequest request = (HttpServletRequest) objectModel.get(HttpEnvironment.HTTP_REQUEST_OBJECT);
+        
+		EPerson eperson = EPerson.find(context,epersonID);
+
+		try {
+			AuthenticationUtil.loginAs(context, request, eperson);
+		} 
+		catch (AuthorizeException ae)
+		{
+			// give the exception error as a notice.
+			result.setOutcome(false);
+			result.setCharacters(ae.getMessage());
+		}
+		
+		return result;
+	}
+	
+	/**
 	 * Delete the epeople specified by the epeopleIDs parameter. This assumes that the
 	 * detetion has been confirmed.
 	 * 

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/eperson/EditEPersonForm.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/eperson/EditEPersonForm.java	2008-04-14 16:08:57 UTC (rev 2894)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/eperson/EditEPersonForm.java	2008-04-14 17:58:15 UTC (rev 2895)
@@ -61,6 +61,7 @@
 import org.dspace.app.xmlui.wing.element.Text;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.AuthorizeManager;
+import org.dspace.core.ConfigurationManager;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 
@@ -128,6 +129,9 @@
 	private static final Message T_submit_delete =
 		message("xmlui.administrative.eperson.EditEPersonForm.submit_delete");
 	
+	private static final Message T_submit_login_as =
+		message("xmlui.administrative.eperson.EditEPersonForm.submit_login_as");
+	
 	private static final Message T_delete_constraint =
 		message("xmlui.administrative.eperson.EditEPersonForm.delete_constraint");
 
@@ -309,13 +313,19 @@
 	        certificateField.addOption(certificatValue,"true");
 	        
 	        
-        	// Buttons to reset or delete
+        	// Buttons to reset, delete or login as
 	        identity.addItem().addHighlight("italic").addContent(T_special_help);
 	        Item special = identity.addItem();
 	        special.addButton("submit_reset_password").setValue(T_submit_reset_password);
 	        
 	        Button submitDelete = special.addButton("submit_delete");
 	        submitDelete.setValue(T_submit_delete);
+	       
+	        Button submitLoginAs = special.addButton("submit_login_as");
+	        submitLoginAs.setValue(T_submit_login_as);
+	        if (!ConfigurationManager.getBooleanProperty("xmlui.user.assumelogin", false))
+	        	submitLoginAs.setDisabled();
+	       
 	        if (deleteConstraints != null && deleteConstraints.size() > 0)
 	        {
 	        	submitDelete.setDisabled();

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/UnAuthenticateAction.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/UnAuthenticateAction.java	2008-04-14 16:08:57 UTC (rev 2894)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/UnAuthenticateAction.java	2008-04-14 17:58:15 UTC (rev 2895)
@@ -98,7 +98,7 @@
         EPerson eperson = context.getCurrentUser();
         
         // Actualy log the user out.
-        AuthenticationUtil.loggedOut(context,httpRequest);
+        AuthenticationUtil.logOut(context,httpRequest);
         
         // Set the user as logged in for the rest of this request so that the cache does not get spoiled.
         context.setCurrentUser(eperson);

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/AuthenticationUtil.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/AuthenticationUtil.java	2008-04-14 16:08:57 UTC (rev 2894)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/utils/AuthenticationUtil.java	2008-04-14 17:58:15 UTC (rev 2895)
@@ -50,9 +50,12 @@
 import org.dspace.authenticate.AuthenticationManager;
 import org.dspace.authenticate.AuthenticationMethod;
 import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.AuthorizeManager;
+import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
 import org.dspace.eperson.EPerson;
+import org.dspace.eperson.Group;
 
 /**
  * Methods for authenticating the user. This is DSpace platform code, as opposed
@@ -83,15 +86,19 @@
 
     
     /**
-     * Session attribute names to store the current user & id.
+     * The IP address this user first logged in from, do not allow this session for
+     * other IP addresses.
      */
-    private static final String CURRENT_USER = "dspace.current.user";
-
-    private static final String CURRENT_USER_ID = "dspace.current.user.id";
+    private static final String CURRENT_IP_ADDRESS = "dspace.user.ip";
     
-    private static final String CURRENT_USER_ADDRESS = "dspace.current.user.address";
-
     /**
+     * The effective user id, typically this will never change. However if an administrator 
+     * has assumed login as this user then they will differ.
+     */
+    private static final String EFFECTIVE_USER_ID = "dspace.user.effective";
+    private static final String AUTHENTICATED_USER_ID = "dspace.user.authenticated";
+    
+    /**
      * Authenticate the current DSpace content based upon given authentication
      * credentials. The AuthenticationManager will consult the configured
      * authentication stack to determine the best method.
@@ -122,7 +129,7 @@
         if (implicitStatus == AuthenticationMethod.SUCCESS)
         {
             log.info(LogManager.getHeader(context, "login", "type=implicit"));
-            AuthenticationUtil.loggedIn(context, request, context.getCurrentUser());
+            AuthenticationUtil.logIn(context, request, context.getCurrentUser());
         }
         else
         {
@@ -136,7 +143,7 @@
                 // Logged in OK.
                 log.info(LogManager
                         .getHeader(context, "login", "type=explicit"));
-                AuthenticationUtil.loggedIn(context, request, context
+                AuthenticationUtil.logIn(context, request, context
                         .getCurrentUser());
             }
             else
@@ -175,14 +182,15 @@
         if (implicitStatus == AuthenticationMethod.SUCCESS)
         {
             log.info(LogManager.getHeader(context, "login", "type=implicit"));
-            AuthenticationUtil.loggedIn(context, request, context.getCurrentUser());
+            AuthenticationUtil.logIn(context, request, context.getCurrentUser());
         }
 
         return context;
     }
 
     /**
-     * Store information about the current user in the request and context
+     * Log the given user in as a real authenticated user. This should only be used after 
+     * a user has presented their credintals and they have been validated. 
      * 
      * @param context
      *            DSpace context
@@ -191,7 +199,7 @@
      * @param eperson
      *            the eperson logged in
      */
-    public static void loggedIn(Context context, HttpServletRequest request,
+    private static void logIn(Context context, HttpServletRequest request,
             EPerson eperson) throws SQLException
     {
         if (eperson == null)
@@ -204,32 +212,22 @@
         // Set any special groups - invoke the authentication mgr.
         int[] groupIDs = AuthenticationManager.getSpecialGroups(context,
                 request);
-
         for (int groupID : groupIDs)
             context.setSpecialGroup(groupID);
 
-        // We store the current user in the request as an EPerson object...
-        request.setAttribute(CURRENT_USER, eperson);
-
-        // and in the session as an ID
-        session.setAttribute(CURRENT_USER_ID, eperson.getID());
-        
         // and the remote IP address to compare against later requests
         // so we can detect session hijacking.
-        session.setAttribute(CURRENT_USER_ADDRESS,
-                             request.getRemoteAddr());
-    }
-    
-    public static void loggedIn(Map objectModel, EPerson eperson) throws SQLException
-    {
-        final HttpServletRequest request = (HttpServletRequest) objectModel.get(HttpEnvironment.HTTP_REQUEST_OBJECT);
-        Context context = ContextUtil.obtainContext(objectModel);
+        session.setAttribute(CURRENT_IP_ADDRESS, request.getRemoteAddr());
         
-        loggedIn(context,request,eperson);
+        // Set both the effective and authenticated user to the same.
+        session.setAttribute(EFFECTIVE_USER_ID, eperson.getID());
+        session.setAttribute(AUTHENTICATED_USER_ID,eperson.getID());
+        
     }
 
     /**
-     * Resume any previous login.
+     * Check to see if there are any session attributes indicating a currently authenticated 
+     * user. If there is then log this user in.
      * 
      * @param context
      *            DSpace context
@@ -243,15 +241,20 @@
 
         if (session != null)
         {
-            Integer id = (Integer) session.getAttribute(CURRENT_USER_ID);
+            Integer id = (Integer) session.getAttribute(EFFECTIVE_USER_ID);
 
             if (id != null)
             {
-                String address = (String)session.getAttribute(CURRENT_USER_ADDRESS);
+                String address = (String)session.getAttribute(CURRENT_IP_ADDRESS);
                 if (address != null && address.equals(request.getRemoteAddr()))
                 {
                     EPerson eperson = EPerson.find(context, id);
-                    loggedIn(context, request, eperson);
+                    context.setCurrentUser(eperson);
+
+                    // Set any special groups - invoke the authentication mgr.
+                    int[] groupIDs = AuthenticationManager.getSpecialGroups(context, request);
+                    for (int groupID : groupIDs)
+                        context.setSpecialGroup(groupID);
                 }
                 else
                 {
@@ -262,6 +265,54 @@
     }
 
     /**
+     * Assume the login as another user. Only site administrators may preform the action.
+     * 
+     * @param context
+     * 		The current DSpace context loged in as a site administrator
+     * @param request
+     * 		The reall HTTP request.
+     * @param loginAs
+     * 		Whom to login as.
+     */
+    public static void loginAs(Context context, HttpServletRequest request, EPerson loginAs ) 
+    throws SQLException, AuthorizeException
+    {
+    	// Only allow loginAs if the administrator has allowed it.
+    	if (!ConfigurationManager.getBooleanProperty("xmlui.user.assumelogin", false))
+    		return;
+    	
+    	// Only super administrators can login as someone else.
+    	if (!AuthorizeManager.isAdmin(context))
+    		throw new AuthorizeException("Only site administrators may assume login as another user.");
+    		
+    	// Just to be double be sure, make sure the administrator
+    	// is the one who actualy authenticated themself.
+	    HttpSession session = request.getSession(false);
+	    Integer authenticatedID = (Integer) session.getAttribute(AUTHENTICATED_USER_ID); 
+	    if (context.getCurrentUser().getID() != authenticatedID)
+	    	throw new AuthorizeException("Only authenticated users whom are administrators may assume the login as another user.");
+	    
+	    // You may not assume the login of another super administrator
+	    if (loginAs == null)
+	    	return;
+	    Group administrators = Group.find(context,1);
+	    if (administrators.isMember(loginAs))
+	    	throw new AuthorizeException("You may not assume the login as another super administrator.");
+	    
+	    // Success, allow the user to login as another user.
+	    context.setCurrentUser(loginAs);
+	
+        // Set any special groups - invoke the authentication mgr.
+        int[] groupIDs = AuthenticationManager.getSpecialGroups(context,request);
+        for (int groupID : groupIDs)
+            context.setSpecialGroup(groupID);
+	    	        
+        // Set both the effective and authenticated user to the same.
+        session.setAttribute(EFFECTIVE_USER_ID, loginAs.getID());
+    }
+    
+    
+    /**
      * Log the user out.
      * 
      * @param context
@@ -269,14 +320,33 @@
      * @param request
      *            HTTP request
      */
-    public static void loggedOut(Context context, HttpServletRequest request)
+    public static void logOut(Context context, HttpServletRequest request) throws SQLException
     {
         HttpSession session = request.getSession();
 
+        if (session.getAttribute(EFFECTIVE_USER_ID) != null &&
+        	session.getAttribute(AUTHENTICATED_USER_ID) != null)
+        {
+    	    Integer effectiveID = (Integer) session.getAttribute(EFFECTIVE_USER_ID); 
+    	    Integer authenticatedID = (Integer) session.getAttribute(AUTHENTICATED_USER_ID); 
+    	    
+    	    if (effectiveID != authenticatedID)
+    	    {
+    	    	// The user has login in as another user, instead of logging them out, 
+    	    	// revert back to their previous login name.
+    	    	
+    	    	EPerson authenticatedUser = EPerson.find(context, authenticatedID);
+    	    	context.setCurrentUser(authenticatedUser);
+    	    	session.setAttribute(EFFECTIVE_USER_ID, authenticatedID);
+    	    	return;
+    	    }
+        }
+        
+        // Otherwise, just log the person out as normal.
         context.setCurrentUser(null);
-        request.removeAttribute(CURRENT_USER);
-        session.removeAttribute(CURRENT_USER_ID);
-        session.removeAttribute(CURRENT_USER_ADDRESS);
+        session.removeAttribute(EFFECTIVE_USER_ID);
+        session.removeAttribute(AUTHENTICATED_USER_ID);
+        session.removeAttribute(CURRENT_IP_ADDRESS);
     }
 
     /**

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Administrative/administrative.js
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Administrative/administrative.js	2008-04-14 16:08:57 UTC (rev 2894)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Administrative/administrative.js	2008-04-14 17:58:15 UTC (rev 2895)
@@ -681,7 +681,6 @@
  */
 function doEditEPerson(epersonID)
 {
-	// FIXME:
 	// We can't assert any privleges at this point, the user could be a collection 
 	// admin or a supper admin. Instead we protect each operation.
     var result;
@@ -731,6 +730,22 @@
             if (result != null)
                 result.setContinue(false);
         }
+        else if (cocoon.request.get("submit_login_as"))
+        {
+        	// Login as this user.
+        	assertAdministrator();
+        	result = FlowEPersonUtils.processLoginAs(getDSContext(),getObjectModel(),epersonID);
+        	
+        	if (result != null && result.getOutcome().equals("success"))
+        	{
+        		// the user is loged in as another user, we can't let them continue on
+        		// using this flow because they might not have permissions. So forward
+        		// them to the homepage.
+        		cocoon.redirectTo(cocoon.request.getContextPath(),true);
+				getDSContext().complete();
+				cocoon.exit(); 
+        	}
+        }
         
     } while (result == null || !result.getContinue())  
     

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml	2008-04-14 16:08:57 UTC (rev 2894)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml	2008-04-14 17:58:15 UTC (rev 2895)
@@ -840,7 +840,8 @@
 	<message key="xmlui.administrative.eperson.EditEPersonForm.can_log_in">Can Log In</message>
 	<message key="xmlui.administrative.eperson.EditEPersonForm.submit_reset_password">Reset Password</message>
 	<message key="xmlui.administrative.eperson.EditEPersonForm.special_help">You may also permanently remove this E-Person from the system or reset his/her password. When resetting a password the user will be sent an email containing a special link they can follow to choose a new password.</message>
-	<message key="xmlui.administrative.eperson.EditEPersonForm.submit_delete">Delete this E-Person</message>
+	<message key="xmlui.administrative.eperson.EditEPersonForm.submit_delete">Delete E-Person</message>
+	<message key="xmlui.administrative.eperson.EditEPersonForm.submit_login_as">Login as E-Person</message>
 	
 	<message key="xmlui.administrative.eperson.EditEPersonForm.delete_constraint">This eperson is unable to be deleted because of the following constraint(s):</message>
 	<message key="xmlui.administrative.eperson.EditEPersonForm.delete_constraint.last_conjunction">and</message>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2896
          http://dspace.svn.sourceforge.net/dspace/?rev=2896&view=rev
Author:   ScottPhillips
Date:     2008-04-14 11:37:31 -0700 (Mon, 14 Apr 2008)

Log Message:
-----------
(Scott Phillips) Added easy support for google analytics statistics, if you want to use analytics simple provide your key in the parameter "xmlui.google.analytics.key".

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/configure.html
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/Navigation.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/structural.xsl

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-04-14 17:58:15 UTC (rev 2895)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-04-14 18:37:31 UTC (rev 2896)
@@ -1203,6 +1203,15 @@
 #xmlui.bitstream.mods = true
 #xmlui.bitstream.mets = true
 
+# If you would like to use google analytics to track general website statistics then 
+# use the following parameter to provide your analytics key. First sign up for an 
+# account at http://analytics.google.com, then create an entry for your repositories 
+# website. Analytics will give you a snipit of javascript code to place on your site, 
+# inside that snip it is your google analytics key ushually found in the line: 
+# _uacct = "UA-XXXXXXX-X"
+# Take this key (just the UA-XXXXXX-X part) and place it here in this parameter.   
+#xmlui.google.analytics.key=UA-XXXXXX-X
+
 #---------------------------------------------------------------#
 #--------------OAI-PMH SPECIFIC CONFIGURATIONS------------------#
 #---------------------------------------------------------------#

Modified: branches/dspace-1_5_x/dspace/docs/configure.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/configure.html	2008-04-14 17:58:15 UTC (rev 2895)
+++ branches/dspace-1_5_x/dspace/docs/configure.html	2008-04-14 18:37:31 UTC (rev 2896)
@@ -863,6 +863,15 @@
       </tr>
 
       <tr>
+        <td><code>xmlui.google.analytics.key</code></td>
+
+        <td><code>UA-XXXXXXX-X</code></td>
+
+        <td>If you would like to use google analytics to track general website statistics then provide your google analytics key in this parameter. First sign up for an account at <a href="http://analytics.google.com">http://analytics.google.com</a>, then create an entry for your repositories website. Analytics will give you a snipit of javascript code to place on your site, inside that snip it is your google analytics key usually found in the line, "<code>_uacct = 'UA-XXXXXXX-X'</code>" Take this key (just the <code>UA-XXXXXX-X</code> part) and place it here in this parameter.</td>
+      </tr>
+
+
+      <tr>
         <td><code>xmlui.force.ssl</code></td>
 
         <td><code>true</code></td>

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/Navigation.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/Navigation.java	2008-04-14 17:58:15 UTC (rev 2895)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/Navigation.java	2008-04-14 18:37:31 UTC (rev 2896)
@@ -66,6 +66,7 @@
 import org.dspace.content.Community;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
+import org.dspace.core.ConfigurationManager;
 import org.xml.sax.SAXException;
 
 /**
@@ -214,6 +215,13 @@
         pageMeta.addMetadata("request","serverName").addContent(request.getServerName());
         pageMeta.addMetadata("request","URI").addContent(request.getSitemapURI());
         
+        String analyticsKey = ConfigurationManager.getProperty("xmlui.google.analytics.key");
+        if (analyticsKey != null && analyticsKey.length() > 0)
+        {
+        	analyticsKey = analyticsKey.trim();
+        	pageMeta.addMetadata("google","analytics").addContent(analyticsKey);
+        }
+        
         // Add metadata for quick searches:
         pageMeta.addMetadata("search", "simpleURL").addContent(
                 contextPath + "/search");

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/structural.xsl
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/structural.xsl	2008-04-14 17:58:15 UTC (rev 2895)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/structural.xsl	2008-04-14 18:37:31 UTC (rev 2896)
@@ -228,6 +228,18 @@
                     &#160;
                 </script>
             </xsl:for-each>
+            
+            
+            <!-- Add a google analytics script if the key is present -->
+            <xsl:if test="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='google'][@qualifier='analytics']">
+            	<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"><xsl:text>&#160;</xsl:text></script>
+				<script type="text/javascript">
+					<xsl:text>_uacct = "</xsl:text><xsl:value-of select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='google'][@qualifier='analytics']"/><xsl:text>";</xsl:text>
+					<xsl:text>urchinTracker();</xsl:text>
+				</script>
+            </xsl:if>
+            
+            
             <!-- Add the title in -->
             <xsl:variable name="page_title" select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title']" />
             <title>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2897
          http://dspace.svn.sourceforge.net/dspace/?rev=2897&view=rev
Author:   ScottPhillips
Date:     2008-04-14 21:14:43 -0700 (Mon, 14 Apr 2008)

Log Message:
-----------
(Scott Phillips) Added an activity viewer to the Control Panel showing the current user activity on the repository.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/docs/configure.html
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Administrative/sitemap.xmap
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml

Added Paths:
-----------
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/CurrentActivityAction.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-04-14 18:37:31 UTC (rev 2896)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-04-15 04:14:43 UTC (rev 2897)
@@ -1165,7 +1165,6 @@
 # repository home page.
 #xmlui.user.loginredirect=/profile
 
-
 # Allow the user to override which theme is used to display a particular page. 
 # When submitting a request add the HTTP parameter "themepath" which corresponds 
 # to a particular theme, that specified theme will be used instead of the any 
@@ -1212,6 +1211,18 @@
 # Take this key (just the UA-XXXXXX-X part) and place it here in this parameter.   
 #xmlui.google.analytics.key=UA-XXXXXX-X
 
+# Assign how many page views will be recorded and displayed in the control panel's 
+# activity viewer. The activity tab allows an administrator to debug problems in a 
+# running DSpace by understanding who and how their dspace is currently being used. 
+# The default value is 250.
+#xmlui.controlpanel.activity.max = 250
+
+# Determine where the control panel's activity viwer recieves an events IP address 
+# from. If your DSpace is in a load balanced enviornment or otherwise behind a 
+# context-switch then you will need to set the paramater to the HTTP parameter that 
+# records the original IP address.
+#xmlui.controlpanel.activity.ipheader = X-Forward-For
+
 #---------------------------------------------------------------#
 #--------------OAI-PMH SPECIFIC CONFIGURATIONS------------------#
 #---------------------------------------------------------------#

Modified: branches/dspace-1_5_x/dspace/docs/configure.html
===================================================================
--- branches/dspace-1_5_x/dspace/docs/configure.html	2008-04-14 18:37:31 UTC (rev 2896)
+++ branches/dspace-1_5_x/dspace/docs/configure.html	2008-04-15 04:14:43 UTC (rev 2897)
@@ -870,7 +870,14 @@
         <td>If you would like to use google analytics to track general website statistics then provide your google analytics key in this parameter. First sign up for an account at <a href="http://analytics.google.com">http://analytics.google.com</a>, then create an entry for your repositories website. Analytics will give you a snipit of javascript code to place on your site, inside that snip it is your google analytics key usually found in the line, "<code>_uacct = 'UA-XXXXXXX-X'</code>" Take this key (just the <code>UA-XXXXXX-X</code> part) and place it here in this parameter.</td>
       </tr>
 
+	  <tr>
+        <td><code>xmlui.controlpanel.activity.max</code></td>
 
+        <td><code>250</code></td>
+
+        <td>Assign how many page views will be recorded and displayed in the control panel's activity viewer. The activity tab allows an administrator to debug problems in a running DSpace by understanding who and how their dspace is currently being used. The default value is 250.</td>
+      </tr>
+
       <tr>
         <td><code>xmlui.force.ssl</code></td>
 

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java	2008-04-14 18:37:31 UTC (rev 2896)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java	2008-04-15 04:14:43 UTC (rev 2897)
@@ -44,6 +44,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
@@ -69,6 +70,7 @@
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.AuthorizeManager;
 import org.dspace.core.ConfigurationManager;
+import org.dspace.eperson.EPerson;
 import org.xml.sax.SAXException;
 
 /**
@@ -90,6 +92,9 @@
 	private static final Message T_option_dspace  		= message("xmlui.administrative.ControlPanel.option_dspace");
 	private static final Message T_option_knots  		= message("xmlui.administrative.ControlPanel.option_knots");
 	private static final Message T_option_alerts  		= message("xmlui.administrative.ControlPanel.option_alerts");
+	private static final Message T_seconds 				= message("xmlui.administrative.ControlPanel.seconds");
+	private static final Message T_hours 				= message("xmlui.administrative.ControlPanel.hours");
+	private static final Message T_minutes 				= message("xmlui.administrative.ControlPanel.minutes");
 	private static final Message T_JAVA_HEAD 			= message("xmlui.administrative.ControlPanel.java_head");
 	private static final Message T_JAVA_VERSION 		= message("xmlui.administrative.ControlPanel.java_version");
 	private static final Message T_JAVA_VENDOR 			= message("xmlui.administrative.ControlPanel.java_vendor");
@@ -121,8 +126,6 @@
 	private static final Message T_knots_column1 		= message("xmlui.administrative.ControlPanel.knots_column1");
 	private static final Message T_knots_column2 		= message("xmlui.administrative.ControlPanel.knots_column2");
 	private static final Message T_knots_column3 		= message("xmlui.administrative.ControlPanel.knots_column3");
-	private static final Message T_knots_hours 			= message("xmlui.administrative.ControlPanel.knots_hours");
-	private static final Message T_knots_minutes 		= message("xmlui.administrative.ControlPanel.knots_minutes");
 	private static final Message T_knots_expired 		= message("xmlui.administrative.ControlPanel.knots_expired");
 	private static final Message T_knots_active 		= message("xmlui.administrative.ControlPanel.knots_active");
 	private static final Message T_knots_none			= message("xmlui.administrative.ControlPanel.knots_none");
@@ -139,6 +142,16 @@
 	private static final Message T_alerts_countdown_keep	= message("xmlui.administrative.ControlPanel.alerts_countdown_keep");
 	private static final Message T_alerts_submit_activate	= message("xmlui.administrative.ControlPanel.alerts_submit_activate");
 	private static final Message T_alerts_submit_deactivate	= message("xmlui.administrative.ControlPanel.alerts_submit_deactivate");
+	private static final Message T_activity_head 			= message("xmlui.administrative.ControlPanel.activity_head");
+	private static final Message T_activity_sort_time 		= message("xmlui.administrative.ControlPanel.activity_sort_time");
+	private static final Message T_activity_sort_user 		= message("xmlui.administrative.ControlPanel.activity_sort_user");
+	private static final Message T_activity_sort_ip  		= message("xmlui.administrative.ControlPanel.activity_sort_ip");
+	private static final Message T_activity_sort_url 		= message("xmlui.administrative.ControlPanel.activity_sort_url");
+	private static final Message T_activity_sort_agent 		= message("xmlui.administrative.ControlPanel.activity_sort_Agent");
+	private static final Message T_activity_anonymous 		= message("xmlui.administrative.ControlPanel.activity_anonymous");	
+	private static final Message T_activity_none			= message("xmlui.administrative.ControlPanel.activity_none");
+	private static final Message T_activity_hideself        = message("xmlui.administrative.ControlPanel.activity_hideself");
+	private static final Message T_activity_showself        = message("xmlui.administrative.ControlPanel.activity_showself");
 	private static final Message T_select_panel             = message("xmlui.administrative.ControlPanel.select_panel");
     /** 
      * The service manager allows us to access the continuation's 
@@ -149,7 +162,7 @@
     /**
      * The four states that this page can be in.
      */
-    private enum OPTIONS {java, dspace,knots,alerts};
+    private enum OPTIONS {java, dspace, knots, alerts, activity};
     
     /**
      * From the servicable api, give us a service manager.
@@ -184,6 +197,8 @@
 			option = OPTIONS.knots;
 		if (request.getParameter("alerts") != null)
 			option = OPTIONS.alerts;
+		if (request.getParameter("activity") != null)
+			option = OPTIONS.activity;
 		
 		Division div = body.addInteractiveDivision("control-panel", contextPath+"/admin/panel", Division.METHOD_POST, "primary administrative");
 		div.setHead(T_head);
@@ -212,7 +227,17 @@
 		else
 			options.addItemXref("?alerts",T_option_alerts);
 		
+		String userSortTarget = "?activity";
+		if (request.getParameter("sortBy") != null)
+			userSortTarget += "&sortBy="+request.getParameter("sortBy");
+		if (request.getParameter("showSelf") != null)
+			userSortTarget += "&showSelf="+request.getParameter("showSelf");
+		if (option == OPTIONS.activity)
+			options.addItem().addHighlight("bold").addXref(userSortTarget,"Current Activity");
+		else
+			options.addItemXref(userSortTarget,"Current Activity");
 		
+		
 		// The main content:
 		if (option == OPTIONS.java)
 			addJavaInformation(div);
@@ -222,7 +247,10 @@
 			addWebContinuations(div);
 		else if (option == OPTIONS.alerts)
 			addAlerts(div);
-		else{
+		else if (option == OPTIONS.activity)
+			addActivity(div);
+		else
+		{
 			div.addPara(T_select_panel);
 		}
 		
@@ -380,9 +408,9 @@
         	Message lastAccessMessage = null;
         	long lastAccess = System.currentTimeMillis() - knot.getLastAccessTime();
         	if (lastAccess > 2*60*60*1000)
-        		lastAccessMessage = T_knots_hours.parameterize((lastAccess / (60*60*1000))); 
+        		lastAccessMessage = T_hours.parameterize((lastAccess / (60*60*1000))); 
         	else
-        		lastAccessMessage = T_knots_minutes.parameterize((lastAccess / (60*1000)));
+        		lastAccessMessage = T_minutes.parameterize((lastAccess / (60*1000)));
         	
         	row = activeFlows.addRow();
         	row.addCellContent(interpreter);
@@ -453,5 +481,192 @@
 		
 	}
 	
+	/** The possible sorting parameters */
+	private static enum EventSort { TIME, URL, SESSION, AGENT, IP };
 	
+	/**
+	 * Create a list of all activity.
+	 */
+	private void addActivity(Division div) throws WingException, SQLException 
+	{
+		
+		// 0) Show my requests
+		Request request = ObjectModelHelper.getRequest(objectModel);
+		String showSelf = request.getParameter("showSelf");
+		if (showSelf == null || !showSelf.equals("false"))
+			showSelf = "true";
+		
+		// 1) Determine how to sort
+		EventSort sortBy = EventSort.TIME;
+		String sortByString = request.getParameter("sortBy");
+		if (EventSort.TIME.toString().equals(sortByString))
+			sortBy = EventSort.TIME;
+		if (EventSort.URL.toString().equals(sortByString))
+			sortBy = EventSort.URL;
+		if (EventSort.SESSION.toString().equals(sortByString))
+			sortBy = EventSort.SESSION;
+		if (EventSort.AGENT.toString().equals(sortByString))
+			sortBy = EventSort.AGENT;
+		if (EventSort.IP.toString().equals(sortByString))
+			sortBy = EventSort.IP;
+		
+		// 2) Sort the events by the requested sorting parameter
+		java.util.List<CurrentActivityAction.Event> events = CurrentActivityAction.getEvents();
+        Collections.sort(events, new ActivitySort<CurrentActivityAction.Event>(sortBy));
+        Collections.reverse(events);
+        
+        // 3) self toggle
+        if (showSelf.equals("true"))
+        	div.addPara().addXref("?activity&sortBy="+sortBy+"&showSelf=false").addContent(T_activity_hideself);
+        else
+        	div.addPara().addXref("?activity&sortBy="+sortBy+"&showSelf=true").addContent(T_activity_showself);
+       	
+        
+		// 4) Display the results Table
+        // TABLE: activeUsers
+        Table activeUsers = div.addTable("users",1,1);
+        activeUsers.setHead(T_activity_head);
+        Row row = activeUsers.addRow(Row.ROLE_HEADER);
+        if (sortBy == EventSort.TIME)
+        	row.addCell().addHighlight("bold").addXref("?activity&sortBy="+EventSort.TIME+"&showSelf="+showSelf).addContent(T_activity_sort_time);
+        else
+        	row.addCell().addXref("?activity&sortBy="+EventSort.TIME+"&showSelf="+showSelf).addContent(T_activity_sort_time);
+        
+        if (sortBy == EventSort.SESSION)
+        	row.addCell().addHighlight("bold").addXref("?activity&sortBy="+EventSort.SESSION+"&showSelf="+showSelf).addContent(T_activity_sort_user);
+        else
+        	row.addCell().addXref("?activity&sortBy="+EventSort.SESSION+"&showSelf="+showSelf).addContent(T_activity_sort_user);
+        
+        if (sortBy == EventSort.IP)
+        	row.addCell().addHighlight("bold").addXref("?activity&sortBy="+EventSort.IP+"&showSelf="+showSelf).addContent(T_activity_sort_ip);
+        else
+        	row.addCell().addXref("?activity&sortBy="+EventSort.IP+"&showSelf="+showSelf).addContent(T_activity_sort_ip);
+        
+        if (sortBy == EventSort.URL)
+        	row.addCell().addHighlight("bold").addXref("?activity&sortBy="+EventSort.URL+"&showSelf="+showSelf).addContent(T_activity_sort_url);
+        else
+        	row.addCell().addXref("?activity&sortBy="+EventSort.URL+"&showSelf="+showSelf).addContent(T_activity_sort_url);
+        
+        if (sortBy == EventSort.AGENT)
+        	row.addCell().addHighlight("bold").addXref("?activity&sortBy="+EventSort.AGENT+"&showSelf="+showSelf).addContent(T_activity_sort_agent);
+        else
+        	row.addCell().addXref("?activity&sortBy="+EventSort.AGENT+"&showSelf="+showSelf).addContent(T_activity_sort_agent);
+   
+        // Keep track of how many individual anonymous users there are, each unique anonymous
+        // user is assigned an index based upon the servlet session id.
+        HashMap<String,Integer> anonymousHash = new HashMap<String,Integer>();
+        int anonymousCount = 1;
+		
+        int shown = 0;
+		for (CurrentActivityAction.Event event : events)
+		{	
+			// Skip out if the user does not want to see their requests.
+			if (showSelf.equals("false") && event.getEPersonID() == context.getCurrentUser().getID())
+				continue;
+			
+			shown++;
+			
+			Message timeStampMessage = null;
+        	long ago = System.currentTimeMillis() - event.getTimeStamp();
+        	
+        	if (ago > 2*60*60*1000)
+        		timeStampMessage = T_hours.parameterize((ago / (60*60*1000))); 
+        	else if (ago > 60*1000)
+        		timeStampMessage = T_minutes.parameterize((ago / (60*1000))); 
+        	else
+        		timeStampMessage = T_seconds.parameterize((ago / (1000)));
+        	
+        	
+			Row eventRow = activeUsers.addRow();
+			
+			eventRow.addCellContent(timeStampMessage);
+			int eid = event.getEPersonID();
+			EPerson eperson = EPerson.find(context, eid);
+			if (eperson != null)
+			{
+				String name = eperson.getFullName();
+				eventRow.addCellContent(name);
+			}
+			else
+			{
+				// Is this a new anonymous user?
+				if (!anonymousHash.containsKey(event.getSessionID()))
+					anonymousHash.put(event.getSessionID(), anonymousCount++);
+				
+				eventRow.addCellContent(T_activity_anonymous.parameterize(anonymousHash.get(event.getSessionID())));
+			}
+			eventRow.addCellContent(event.getIP());
+			eventRow.addCell().addXref(contextPath+"/"+event.getURL()).addContent("/"+event.getURL());
+			eventRow.addCellContent(event.getDectectedBrowser());
+		}
+		
+		if (shown == 0)
+        {
+			activeUsers.addRow().addCell(1, 5).addContent(T_activity_none.parameterize(CurrentActivityAction.MAX_EVENTS));
+        }
+	}
+	
+	/**
+	 * Comparator to sort activity events by their access times.
+	 */
+	public static class ActivitySort<E extends CurrentActivityAction.Event> implements Comparator<E>
+	{
+		// Sort parameter
+		private EventSort sortBy;
+		
+		public ActivitySort(EventSort sortBy)
+		{
+			this.sortBy = sortBy;
+		}
+		
+		/**
+		 * Compare these two activity events based upon the given sort parameter. In the case of a tie,
+		 * allways fallback to sorting based upon the timestamp.
+		 */
+		public int compare(E a, E b) 
+		{
+			// Sort by the given ordering matrix
+			if (EventSort.URL == sortBy)
+			{
+				String aURL = a.getURL();
+				String bURL = b.getURL();
+				int cmp = aURL.compareTo(bURL);
+				if (cmp != 0)
+					return cmp;
+			}
+			else if (EventSort.AGENT == sortBy)
+			{
+				String aAgent = a.getDectectedBrowser();
+				String bAgent = b.getDectectedBrowser();
+				int cmp = aAgent.compareTo(bAgent);
+				if (cmp != 0)
+					return cmp;
+			}
+			else if (EventSort.IP == sortBy)
+			{
+				String aIP = a.getIP();
+				String bIP = b.getIP();
+				int cmp = aIP.compareTo(bIP);
+				if (cmp != 0)
+					return cmp;
+				
+			}
+			else if (EventSort.SESSION == sortBy)
+			{
+				String aSession = a.getSessionID();
+				String bSession = b.getSessionID();
+				int cmp = aSession.compareTo(bSession);
+				if (cmp != 0)
+					return cmp;
+			}
+			
+			// All ways fall back to sorting by time, when events are equal.
+			if (a.getTimeStamp() > b.getTimeStamp())
+				return 1;  // A > B
+			else if (a.getTimeStamp() > b.getTimeStamp())
+				return -1; // B < A
+			return 0; // A == B
+		}
+	}
+	
 }

Added: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/CurrentActivityAction.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/CurrentActivityAction.java	                        (rev 0)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/CurrentActivityAction.java	2008-04-15 04:14:43 UTC (rev 2897)
@@ -0,0 +1,320 @@
+/*
+ * CurrentActivityAction.java
+ *
+ * Version: $Revision: 1.1 $
+ *
+ * Date: $Date: 2006/05/01 22:33:39 $
+ *
+ * Copyright (c) 2002, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+package org.dspace.app.xmlui.aspect.administrative;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.acting.AbstractAction;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.SourceResolver;
+import org.dspace.app.xmlui.utils.ContextUtil;
+import org.dspace.core.ConfigurationManager;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+
+/**
+ * 
+ * This action simply records pipeline events that it sees, keeping track of the users and
+ * pages they are viewing. Later the control panel's activity viewer can access this data to
+ * get a realtime snap shot of current activity of the repository.
+ * 
+ * @author Scott Phillips
+ */
+
+public class CurrentActivityAction extends AbstractAction
+{
+
+	/** The maximum number of events that are recorded */
+	public static int MAX_EVENTS = 250;
+	
+	/** The HTTP header that contains the real IP for this request, this is used when DSpace is placed behind a load balancer */
+	public static String IP_HEADER = "X-Forwarded-For";
+	
+	/** The ordered list of events, by access time */
+	private static Queue<Event> events = new LinkedList<Event>();
+	
+	/**
+	 * Allow the DSpace.cfg to override our activity max and ip header.
+	 */
+	static {
+		// If the dspace.cfg has a max event count then use it.
+		if (ConfigurationManager.getProperty("xmlui.controlpanel.activity.max") != null)
+			MAX_EVENTS = ConfigurationManager.getIntProperty("xmlui.controlpanel.activity.max");
+		
+		if (ConfigurationManager.getProperty("xmlui.controlpanel.activity.ipheader") != null)
+			IP_HEADER = ConfigurationManager.getProperty("xmlui.controlpanel.activity.ipheader");
+	}
+	
+	
+    /**
+     * Record this current event.
+     */
+    public Map act(Redirector redirector, SourceResolver resolver, Map objectModel,
+            String source, Parameters parameters) throws Exception
+    {
+        Request request = ObjectModelHelper.getRequest(objectModel);
+        Context context = ContextUtil.obtainContext(objectModel);
+        
+        // Create and store our events
+        Event event = new Event(context,request);
+        events.add(event);
+        
+        // Remove the oldest element from the list if we are over our max
+        // number of elements.
+        while(events.size() > MAX_EVENTS)
+        	events.poll();
+       
+        return null;
+    }
+    
+    /**
+     * @return a list of all current events.
+     */
+    public static List<Event> getEvents()
+    {
+    	List<Event> list = new ArrayList<Event>();
+    	list.addAll(events);
+    	return list;
+    }
+    
+    /**
+     * An object that represents an activity event.
+     */
+    public static class Event
+    {
+    	/** The Servlet session */
+    	private String sessionID;
+    	
+    	/** The eperson ID */
+    	private int epersonID = -1;
+    	
+    	/** The url being viewed */
+    	private String url;
+    	
+    	/** A timestap of this event */
+    	private long timestamp;
+    	
+    	/** The user-agent for the request */
+    	private String userAgent;
+    	
+    	/** The ip address of the requester */
+    	private String ip;
+    	
+    	/**
+    	 * Construct a new activity event, grabing various bits of data about the request from the context and request.
+    	 */
+    	public Event(Context context, Request request)
+    	{
+    		if (context != null)
+    		{
+    			EPerson eperson = context.getCurrentUser();
+    			if (eperson != null)
+    				epersonID = eperson.getID();
+    		}
+    		
+    		if (request != null)
+    		{
+    			url = request.getSitemapURI();
+    			Session session = request.getSession(true);
+    			if (session != null)
+    				sessionID = session.getId();
+    			
+    			userAgent = request.getHeader("User-Agent");
+    			
+    			ip = request.getHeader(IP_HEADER);
+    			if (ip == null)
+    				ip = request.getRemoteAddr();
+    		}
+    		
+    		// The current time
+    		timestamp = System.currentTimeMillis();
+    	}
+    	
+  
+    	public String getSessionID()
+    	{
+    		return sessionID;
+    	}
+    	
+    	public int getEPersonID()
+    	{
+    		return epersonID;
+    	}
+    	
+    	public String getURL()
+    	{
+    		return url;
+    	}
+    	
+    	public long getTimeStamp()
+    	{
+    		return timestamp;
+    	}
+    	
+    	public String getUserAgent()
+    	{
+    		return userAgent;
+    	}
+    	
+    	public String getIP()
+    	{
+    		return ip;
+    	}
+    	
+    	/**
+    	 * Return the activity viewer's best guess as to what browser or bot was initiating the request.
+    	 * 
+    	 * @return A short name for the browser or bot.
+    	 */
+    	public String getDectectedBrowser()
+    	{
+    		// BOTS
+    		if (userAgent.toLowerCase().contains("google/"))
+    			return "Google (bot)";
+    		
+    		if (userAgent.toLowerCase().contains("msnbot/"))
+    			return "MSN (bot)";
+    		   
+    	    if (userAgent.toLowerCase().contains("googlebot/"))
+    	    	return "Google (bot)";
+    		
+    		if (userAgent.toLowerCase().contains("webcrawler/"))
+    			return "WebCrawler (bot)";
+    		
+    		if (userAgent.toLowerCase().contains("inktomi"))
+    			return "Inktomi (bot)";
+    		
+    		if (userAgent.toLowerCase().contains("teoma"))
+    			return "Teoma (bot)";
+    		
+    		// Normal Browsers
+    		if (userAgent.contains("Lotus-Notes/"))
+    			return "Lotus-Notes";
+    		
+    		if (userAgent.contains("Opera"))
+    			return "Opera";
+    		
+    		if (userAgent.contains("Safari/"))
+    			return "Safari";
+    		
+    		if (userAgent.contains("Konqueror/"))
+    			return "Konqueror";
+    		
+    		// Internet explorer browsers
+    		if (userAgent.contains("MSIE"))
+    		{
+    		    if (userAgent.contains("MSIE 8"))
+    		    	return "MSIE 8";
+    		    if (userAgent.contains("MSIE 7"))
+    		    	return "MSIE 7";
+    		    if (userAgent.contains("MSIE 6"))
+    		    	return "MSIE 6";
+    		    if (userAgent.contains("MSIE 5"))
+    		    	return "MSIE 5";
+    		    
+    		    // Can't fine the version number
+    			return "MSIE";
+    		}
+    		
+    		// Gecko based browsers
+    		if (userAgent.contains("Gecko/"))
+    		{
+    		    if (userAgent.contains("Camio/"))
+    		    	return "Gecko/Camino";
+    		    
+    		    if (userAgent.contains("Chimera/"))
+    		    	return "Gecko/Chimera";
+    		    
+    		    if (userAgent.contains("Firebird/"))
+    		    	return "Gecko/Firebird";
+    		    
+    		    if (userAgent.contains("Phoenix/"))
+    		    	return "Gecko/Phoenix";
+    		    
+    		    if (userAgent.contains("Galeon"))
+    		    	return "Gecko/Galeon";
+    		    
+    		    if (userAgent.contains("Firefox/1"))
+    		    	return "Firefox 1.x";
+    		    
+    		    if (userAgent.contains("Firefox/2"))
+    		    	return "Firefox 2.x";
+    		    
+    		    if (userAgent.contains("Firefox/3"))
+    		    	return "Firefox 3.x";
+    		   
+    		    if (userAgent.contains("Firefox/"))
+    		    	return "Firefox"; // can't find the exact version
+    		    
+    		    if (userAgent.contains("Netscape/"))
+    		    	return "Netscape";
+    		    
+    		    // Can't find the exact distribution
+    			return "Gecko";
+    		}
+    		
+    		// Generic browser types (lots of things report these names)
+    		
+    		if (userAgent.contains("KHTML/"))
+    			return "KHTML";
+    		
+    		if (userAgent.contains("Netscape/"))
+    			return "Netscape";
+    		
+    		if (userAgent.contains("Mozilla/"))
+    			return "Mozilla"; // Almost everything says they are mozilla.
+    		
+    		// if you get all the way to the end and still nothing, return unknown.
+    		return "Unknown";
+    	}  
+    }
+    
+    
+    
+
+}

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java	2008-04-14 18:37:31 UTC (rev 2896)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java	2008-04-15 04:14:43 UTC (rev 2897)
@@ -46,10 +46,8 @@
 import java.net.URLEncoder;
 import java.sql.SQLException;
 import java.util.Map;
-import java.util.regex.Matcher;
 
 import javax.mail.internet.MimeUtility;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.avalon.excalibur.pool.Recyclable;
@@ -189,8 +187,8 @@
         {
             this.request = ObjectModelHelper.getRequest(objectModel);
             this.response = ObjectModelHelper.getResponse(objectModel);
-            Context context = ContextUtil.obtainContext(objectModel);
-
+            Context context = ContextUtil.obtainContext(objectModel);            
+            
             // Get our parameters that identify the bitstream
             int itemID = par.getParameterAsInteger("itemID", -1);
             int bitstreamID = par.getParameterAsInteger("bitstreamID", -1);

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Administrative/sitemap.xmap
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Administrative/sitemap.xmap	2008-04-14 18:37:31 UTC (rev 2896)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Administrative/sitemap.xmap	2008-04-15 04:14:43 UTC (rev 2897)
@@ -115,6 +115,7 @@
 		
     	<map:actions>
     		<map:action name="ControlPanelAction" src="org.dspace.app.xmlui.aspect.administrative.ControlPanelAction" />
+    		<map:action name="CurrentActivityAction" src="org.dspace.app.xmlui.aspect.administrative.CurrentActivityAction" />
     	</map:actions>		
 		
 		<map:selectors>
@@ -262,6 +263,7 @@
 			</map:select>
 						
 			<map:generate/>
+			<map:act type="CurrentActivityAction"/>
 			<map:transform type="SystemwideAlerts"/>
 			<map:transform type="Navigation"/>
 		    

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml	2008-04-14 18:37:31 UTC (rev 2896)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml	2008-04-15 04:14:43 UTC (rev 2897)
@@ -1446,6 +1446,9 @@
 	<message key="xmlui.administrative.ControlPanel.option_dspace">DSpace Configuration</message>
 	<message key="xmlui.administrative.ControlPanel.option_knots">Web Continuations</message>
 	<message key="xmlui.administrative.ControlPanel.option_alerts">System-wide Alerts</message>
+	<message key="xmlui.administrative.ControlPanel.hours">{0} h</message>
+	<message key="xmlui.administrative.ControlPanel.minutes">{0} m</message>
+	<message key="xmlui.administrative.ControlPanel.seconds">{0} s</message>
 	<message key="xmlui.administrative.ControlPanel.java_head">Java and Operating System</message>
 	<message key="xmlui.administrative.ControlPanel.java_version">Java Runtime Environment Version</message>
 	<message key="xmlui.administrative.ControlPanel.java_vendor">Java Runtime Environment Vendor</message>
@@ -1477,8 +1480,6 @@
 	<message key="xmlui.administrative.ControlPanel.knots_column1">Interpreter</message>
 	<message key="xmlui.administrative.ControlPanel.knots_column2">Last Access</message>
 	<message key="xmlui.administrative.ControlPanel.knots_column3">State</message>
-	<message key="xmlui.administrative.ControlPanel.knots_hours">{0} hours</message>
-	<message key="xmlui.administrative.ControlPanel.knots_minutes">{0} minutes</message>
 	<message key="xmlui.administrative.ControlPanel.knots_expired">Expired</message>
 	<message key="xmlui.administrative.ControlPanel.knots_active">Active</message>
 	<message key="xmlui.administrative.ControlPanel.knots_none">There are no active continuations.</message>
@@ -1495,6 +1496,17 @@
 	<message key="xmlui.administrative.ControlPanel.alerts_countdown_keep">Keep the current count down timer</message>
 	<message key="xmlui.administrative.ControlPanel.alerts_submit_activate">Activate</message>
 	<message key="xmlui.administrative.ControlPanel.alerts_submit_deactivate">Deactivate</message>
+	<message key="xmlui.administrative.ControlPanel.activity_head">Current Activity ({0} pages maximum)</message>
+	<message key="xmlui.administrative.ControlPanel.activity_sort_time">Time Stamp</message>
+	<message key="xmlui.administrative.ControlPanel.activity_sort_user">User</message>
+	<message key="xmlui.administrative.ControlPanel.activity_sort_ip">IP Address</message>
+	<message key="xmlui.administrative.ControlPanel.activity_sort_url">URL Page</message>
+	<message key="xmlui.administrative.ControlPanel.activity_sort_Agent">User-Agent</message>
+	<message key="xmlui.administrative.ControlPanel.activity_anonymous">Anonymous {0}</message>	
+	<message key="xmlui.administrative.ControlPanel.activity_hideself">Hide my page views</message>
+	<message key="xmlui.administrative.ControlPanel.activity_showself">Show my page views</message>
+	<message key="xmlui.administrative.ControlPanel.activity_none">Other than yourself, there have been no page views in the past {0} pages.</message>
+	
 	<message key="xmlui.administrative.ControlPanel.select_panel">Use the tabs above to select the information to display</message>
 	
 	<!-- org.dspace.app.xmlui.administrative.SystemwideAlerts -->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2968
          http://dspace.svn.sourceforge.net/dspace/?rev=2968&view=rev
Author:   ScottPhillips
Date:     2008-06-24 14:08:28 -0700 (Tue, 24 Jun 2008)

Log Message:
-----------
Jay Paz (SF#1898241) Add item Export from jspui and xmlui.

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace/config/dstat.map
    branches/dspace-1_5_x/dspace/modules/jspui/src/main/resources/Messages.properties
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java
    branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/MyDSpaceServlet.java
    branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/WEB-INF/web.xml
    branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/collection-home.jsp
    branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/community-home.jsp
    branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/display-item.jsp
    branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/mydspace/main.jsp
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/Navigation.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceCocoonServlet.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/Administrative/sitemap.xmap
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/sitemap.xmap

Added Paths:
-----------
    branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/ItemExportArchiveServlet.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ItemExport.java
    branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/ItemExportDownloadReader.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-06-24 21:06:12 UTC (rev 2967)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-06-24 21:08:28 UTC (rev 2968)
@@ -578,6 +578,27 @@
 checker.retention.CHECKSUM_MATCH=8w
 
 
+### Item export and download settings ###
+# The directory where the exports will be done and compressed
+org.dspace.app.itemexport.work.dir = ${dspace.dir}/exports
+
+# The directory where the compressed files will reside and be read by the downloader
+org.dspace.app.itemexport.download.dir = ${dspace.dir}/exports/download
+
+# The length og time in hours each archive should live for. When new archives are 
+# created this entry is used to delete old ones
+org.dspace.app.itemexport.life.span.hours = 48
+
+# The maximum size in Megabytes the export should be.  This is enforced before the
+# compression.  Each bitstream's size in each item being exported is added up, if their
+# cummulative sizes are more than this entry the export is not kicked off
+org.dspace.app.itemexport.max.size = 200
+
+
+
+
+
+
 #---------------------------------------------------------------#
 #--------------JSPUI & XMLUI CONFIGURATIONS---------------------#
 #---------------------------------------------------------------#

Modified: branches/dspace-1_5_x/dspace/config/dstat.map
===================================================================
--- branches/dspace-1_5_x/dspace/config/dstat.map	2008-06-24 21:06:12 UTC (rev 2967)
+++ branches/dspace-1_5_x/dspace/config/dstat.map	2008-06-24 21:08:28 UTC (rev 2968)
@@ -99,4 +99,5 @@
 show_feedback_form=Feedback Form Displayed
 create_dc_type=New Dublin Core Type Created
 remove_template_item=Item Template Removed
-withdraw_item=Item Withdrawn
\ No newline at end of file
+withdraw_item=Item Withdrawn
+download_export_archive = Download Export Archive
\ No newline at end of file

Modified: branches/dspace-1_5_x/dspace/modules/jspui/src/main/resources/Messages.properties
===================================================================
--- branches/dspace-1_5_x/dspace/modules/jspui/src/main/resources/Messages.properties	2008-06-24 21:06:12 UTC (rev 2967)
+++ branches/dspace-1_5_x/dspace/modules/jspui/src/main/resources/Messages.properties	2008-06-24 21:08:28 UTC (rev 2968)
@@ -598,6 +598,7 @@
 jsp.mydspace.main.heading4                                      = Unfinished Submissions
 jsp.mydspace.main.heading5                                      = Submissions In Workflow Process
 jsp.mydspace.main.heading6                                      = Authorization Groups I'm a Member Of
+jsp.mydspace.main.heading7										= Export Archives Available for Download
 jsp.mydspace.main.item                                          = Item
 jsp.mydspace.main.link                                          = See Your Subscriptions
 jsp.mydspace.main.perform.button                                = Perform This Task
@@ -656,6 +657,7 @@
 jsp.mydspace.subscriptions.unsub.button                         = Unsubscribe
 jsp.mydspace.task-complete.text1                                = The task is complete, and notification has been sent to the appropriate people.
 jsp.mydspace.task-complete.title                                = Thank You
+jsp.mydspace.main.export.archive.title							= Download Export Archive {0}
 jsp.register.already-registered.info1                           = Our records show that you've already registered with DSpace and have an active account with us.
 jsp.register.already-registered.info2                           = You can <a href="{0}">set a new password if you've forgotten it</a>.
 jsp.register.already-registered.info4                           = If you're having trouble logging in, please contact us.

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java	2008-06-24 21:06:12 UTC (rev 2967)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java	2008-06-24 21:08:28 UTC (rev 2968)
@@ -41,14 +41,35 @@
 
 import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.IOException;
 import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
+import javax.mail.BodyPart;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Multipart;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.HelpFormatter;
@@ -57,13 +78,17 @@
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
 import org.dspace.content.Collection;
+import org.dspace.content.Community;
 import org.dspace.content.DCValue;
+import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.content.ItemIterator;
 import org.dspace.content.MetadataSchema;
+import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.Utils;
+import org.dspace.eperson.EPerson;
 import org.dspace.handle.HandleManager;
 
 /**
@@ -81,459 +106,1077 @@
  * issues -doesn't handle special characters in metadata (needs to turn &'s into
  * &amp;, etc.)
  * <P>
- * Modified by David Little, UCSD Libraries 12/21/04 to
- * allow the registration of files (bitstreams) into DSpace.
+ * Modified by David Little, UCSD Libraries 12/21/04 to allow the registration
+ * of files (bitstreams) into DSpace.
+ * 
+ * @author David Little
+ * @author Jay Paz
  */
-public class ItemExport
-{
-    private static final int SUBDIR_LIMIT = 0;
+public class ItemExport {
+	private static final int SUBDIR_LIMIT = 0;
 
-    /*
-     *  
-     */
-    public static void main(String[] argv) throws Exception
-    {
-        // create an options object and populate it
-        CommandLineParser parser = new PosixParser();
+	/**
+	 * used for export download
+	 */
+	public static final String COMPRESSED_EXPORT_MIME_TYPE = "application/zip";
 
-        Options options = new Options();
+	/*
+	 * 
+	 */
+	public static void main(String[] argv) throws Exception {
+		// create an options object and populate it
+		CommandLineParser parser = new PosixParser();
 
-        options.addOption("t", "type", true, "type: COLLECTION or ITEM");
-        options.addOption("i", "id", true, "ID or handle of thing to export");
-        options.addOption("d", "dest", true,
-                "destination where you want items to go");
-        options.addOption("n", "number", true,
-                "sequence number to begin exporting items with");
-        options.addOption("h", "help", false, "help");
+		Options options = new Options();
 
-        CommandLine line = parser.parse(options, argv);
+		options.addOption("t", "type", true, "type: COLLECTION or ITEM");
+		options.addOption("i", "id", true, "ID or handle of thing to export");
+		options.addOption("d", "dest", true,
+				"destination where you want items to go");
+		options.addOption("n", "number", true,
+				"sequence number to begin exporting items with");
+		options.addOption("h", "help", false, "help");
 
-        String typeString = null;
-        String destDirName = null;
-        String myIDString = null;
-        int seqStart = -1;
-        int myType = -1;
+		CommandLine line = parser.parse(options, argv);
 
-        Item myItem = null;
-        Collection mycollection = null;
+		String typeString = null;
+		String destDirName = null;
+		String myIDString = null;
+		int seqStart = -1;
+		int myType = -1;
 
-        if (line.hasOption('h'))
-        {
-            HelpFormatter myhelp = new HelpFormatter();
-            myhelp.printHelp("ItemExport\n", options);
-            System.out
-                    .println("\nfull collection: ItemExport -t COLLECTION -i ID -d dest -n number");
-            System.out
-                    .println("singleitem:       ItemExport -t ITEM -i ID -d dest -n number");
+		Item myItem = null;
+		Collection mycollection = null;
 
-            System.exit(0);
-        }
+		if (line.hasOption('h')) {
+			HelpFormatter myhelp = new HelpFormatter();
+			myhelp.printHelp("ItemExport\n", options);
+			System.out
+					.println("\nfull collection: ItemExport -t COLLECTION -i ID -d dest -n number");
+			System.out
+					.println("singleitem:       ItemExport -t ITEM -i ID -d dest -n number");
 
-        if (line.hasOption('t')) // type
-        {
-            typeString = line.getOptionValue('t');
+			System.exit(0);
+		}
 
-            if (typeString.equals("ITEM"))
-            {
-                myType = Constants.ITEM;
-            }
-            else if (typeString.equals("COLLECTION"))
-            {
-                myType = Constants.COLLECTION;
-            }
-        }
+		if (line.hasOption('t')) // type
+		{
+			typeString = line.getOptionValue('t');
 
-        if (line.hasOption('i')) // id
-        {
-            myIDString = line.getOptionValue('i');
-        }
+			if (typeString.equals("ITEM")) {
+				myType = Constants.ITEM;
+			} else if (typeString.equals("COLLECTION")) {
+				myType = Constants.COLLECTION;
+			}
+		}
 
-        if (line.hasOption('d')) // dest
-        {
-            destDirName = line.getOptionValue('d');
-        }
+		if (line.hasOption('i')) // id
+		{
+			myIDString = line.getOptionValue('i');
+		}
 
-        if (line.hasOption('n')) // number
-        {
-            seqStart = Integer.parseInt(line.getOptionValue('n'));
-        }
+		if (line.hasOption('d')) // dest
+		{
+			destDirName = line.getOptionValue('d');
+		}
 
-        // now validate the args
-        if (myType == -1)
-        {
-            System.out
-                    .println("type must be either COLLECTION or ITEM (-h for help)");
-            System.exit(1);
-        }
+		if (line.hasOption('n')) // number
+		{
+			seqStart = Integer.parseInt(line.getOptionValue('n'));
+		}
 
-        if (destDirName == null)
-        {
-            System.out
-                    .println("destination directory must be set (-h for help)");
-            System.exit(1);
-        }
+		// now validate the args
+		if (myType == -1) {
+			System.out
+					.println("type must be either COLLECTION or ITEM (-h for help)");
+			System.exit(1);
+		}
 
-        if (seqStart == -1)
-        {
-            System.out
-                    .println("sequence start number must be set (-h for help)");
-            System.exit(1);
-        }
+		if (destDirName == null) {
+			System.out
+					.println("destination directory must be set (-h for help)");
+			System.exit(1);
+		}
 
-        if (myIDString == null)
-        {
-            System.out
-                    .println("ID must be set to either a database ID or a handle (-h for help)");
-            System.exit(1);
-        }
+		if (seqStart == -1) {
+			System.out
+					.println("sequence start number must be set (-h for help)");
+			System.exit(1);
+		}
 
-        Context c = new Context();
-        c.setIgnoreAuthorization(true);
+		if (myIDString == null) {
+			System.out
+					.println("ID must be set to either a database ID or a handle (-h for help)");
+			System.exit(1);
+		}
 
-        if (myType == Constants.ITEM)
-        {
-            // first, is myIDString a handle?
-            if (myIDString.indexOf('/') != -1)
-            {
-                myItem = (Item) HandleManager.resolveToObject(c, myIDString);
+		Context c = new Context();
+		c.setIgnoreAuthorization(true);
 
-                if ((myItem == null) || (myItem.getType() != Constants.ITEM))
-                {
-                    myItem = null;
-                }
-            }
-            else
-            {
-                myItem = Item.find(c, Integer.parseInt(myIDString));
-            }
+		if (myType == Constants.ITEM) {
+			// first, is myIDString a handle?
+			if (myIDString.indexOf('/') != -1) {
+				myItem = (Item) HandleManager.resolveToObject(c, myIDString);
 
-            if (myItem == null)
-            {
-                System.out
-                        .println("Error, item cannot be found: " + myIDString);
-            }
-        }
-        else
-        {
-            if (myIDString.indexOf('/') != -1)
-            {
-                // has a / must be a handle
-                mycollection = (Collection) HandleManager.resolveToObject(c,
-                        myIDString);
+				if ((myItem == null) || (myItem.getType() != Constants.ITEM)) {
+					myItem = null;
+				}
+			} else {
+				myItem = Item.find(c, Integer.parseInt(myIDString));
+			}
 
-                // ensure it's a collection
-                if ((mycollection == null)
-                        || (mycollection.getType() != Constants.COLLECTION))
-                {
-                    mycollection = null;
-                }
-            }
-            else if (myIDString != null)
-            {
-                mycollection = Collection.find(c, Integer.parseInt(myIDString));
-            }
+			if (myItem == null) {
+				System.out
+						.println("Error, item cannot be found: " + myIDString);
+			}
+		} else {
+			if (myIDString.indexOf('/') != -1) {
+				// has a / must be a handle
+				mycollection = (Collection) HandleManager.resolveToObject(c,
+						myIDString);
 
-            if (mycollection == null)
-            {
-                System.out.println("Error, collection cannot be found: "
-                        + myIDString);
-                System.exit(1);
-            }
-        }
+				// ensure it's a collection
+				if ((mycollection == null)
+						|| (mycollection.getType() != Constants.COLLECTION)) {
+					mycollection = null;
+				}
+			} else if (myIDString != null) {
+				mycollection = Collection.find(c, Integer.parseInt(myIDString));
+			}
 
-        if (myItem != null)
-        {
-            // it's only a single item
-            exportItem(c, myItem, destDirName, seqStart);
-        }
-        else
-        {
-            System.out.println("Exporting from collection: " + myIDString);
+			if (mycollection == null) {
+				System.out.println("Error, collection cannot be found: "
+						+ myIDString);
+				System.exit(1);
+			}
+		}
 
-            // it's a collection, so do a bunch of items
-            ItemIterator i = mycollection.getItems();
+		if (myItem != null) {
+			// it's only a single item
+			exportItem(c, myItem, destDirName, seqStart);
+		} else {
+			System.out.println("Exporting from collection: " + myIDString);
 
-            exportItem(c, i, destDirName, seqStart);
-        }
+			// it's a collection, so do a bunch of items
+			ItemIterator i = mycollection.getItems();
 
-        c.complete();
-    }
+			exportItem(c, i, destDirName, seqStart);
+		}
 
-    private static void exportItem(Context c, ItemIterator i,
-            String destDirName, int seqStart) throws Exception
-    {
-        int mySequenceNumber = seqStart;
-        int counter = SUBDIR_LIMIT - 1;
-        int subDirSuffix = 0;
-        String fullPath = destDirName;
-        String subdir = "";
-        File dir;
+		c.complete();
+	}
 
-        if (SUBDIR_LIMIT > 0)
-        {
-            dir = new File(destDirName);
-            if (!dir.isDirectory())
-            {
-                throw new IOException(destDirName + " is not a directory.");
-            }
-        }
+	private static void exportItem(Context c, ItemIterator i,
+			String destDirName, int seqStart) throws Exception {
+		int mySequenceNumber = seqStart;
+		int counter = SUBDIR_LIMIT - 1;
+		int subDirSuffix = 0;
+		String fullPath = destDirName;
+		String subdir = "";
+		File dir;
 
-        System.out.println("Beginning export");
+		if (SUBDIR_LIMIT > 0) {
+			dir = new File(destDirName);
+			if (!dir.isDirectory()) {
+				throw new IOException(destDirName + " is not a directory.");
+			}
+		}
 
-        while (i.hasNext())
-        {
-            if (SUBDIR_LIMIT > 0 && ++counter == SUBDIR_LIMIT)
-            {
-                subdir = new Integer(subDirSuffix++).toString();
-                fullPath = destDirName + dir.separatorChar + subdir;
-                counter = 0;
+		System.out.println("Beginning export");
 
-                if (!new File(fullPath).mkdirs())
-                {
-                    throw new IOException("Error, can't make dir " + fullPath);
-                }
-            }
+		while (i.hasNext()) {
+			if (SUBDIR_LIMIT > 0 && ++counter == SUBDIR_LIMIT) {
+				subdir = new Integer(subDirSuffix++).toString();
+				fullPath = destDirName + File.separatorChar + subdir;
+				counter = 0;
 
-            System.out.println("Exporting item to " + mySequenceNumber);
-            exportItem(c, i.next(), fullPath, mySequenceNumber);
-            mySequenceNumber++;
-        }
-    }
+				if (!new File(fullPath).mkdirs()) {
+					throw new IOException("Error, can't make dir " + fullPath);
+				}
+			}
 
-    private static void exportItem(Context c, Item myItem, String destDirName,
-            int seqStart) throws Exception
-    {
-        File destDir = new File(destDirName);
+			System.out.println("Exporting item to " + mySequenceNumber);
+			exportItem(c, i.next(), fullPath, mySequenceNumber);
+			mySequenceNumber++;
+		}
+	}
 
-        if (destDir.exists())
-        {
-            // now create a subdirectory
-            File itemDir = new File(destDir + "/" + seqStart);
+	private static void exportItem(Context c, Item myItem, String destDirName,
+			int seqStart) throws Exception {
+		File destDir = new File(destDirName);
 
-            System.out.println("Exporting Item " + myItem.getID() + " to "
-                    + itemDir);
+		if (destDir.exists()) {
+			// now create a subdirectory
+			File itemDir = new File(destDir + "/" + seqStart);
 
-            if (itemDir.exists())
-            {
-                throw new Exception("Directory " + destDir + "/" + seqStart
-                        + " already exists!");
-            }
+			System.out.println("Exporting Item " + myItem.getID() + " to "
+					+ itemDir);
 
-            if (itemDir.mkdir())
-            {
-                // make it this far, now start exporting
-                writeMetadata(c, myItem, itemDir);
-                writeBitstreams(c, myItem, itemDir);
-                writeHandle(c, myItem, itemDir);
-            }
-            else
-            {
-                throw new Exception("Error, can't make dir " + itemDir);
-            }
-        }
-        else
-        {
-            throw new Exception("Error, directory " + destDirName
-                    + " doesn't exist!");
-        }
-    }
+			if (itemDir.exists()) {
+				throw new Exception("Directory " + destDir + "/" + seqStart
+						+ " already exists!");
+			}
 
-    /**
-     * Discover the different schemas in use and output a seperate metadata
-     * XML file for each schema.
-     *
-     * @param c
-     * @param i
-     * @param destDir
-     * @throws Exception
-     */
-    private static void writeMetadata(Context c, Item i, File destDir)
-            throws Exception
-    {
-        // Build a list of schemas for the item
-        HashMap map = new HashMap();
-        DCValue[] dcorevalues = i.getMetadata(Item.ANY, Item.ANY, Item.ANY, Item.ANY);
-        for (int ii = 0; ii < dcorevalues.length; ii++)
-        {
-            map.put(dcorevalues[ii].schema, null);
-        }
+			if (itemDir.mkdir()) {
+				// make it this far, now start exporting
+				writeMetadata(c, myItem, itemDir);
+				writeBitstreams(c, myItem, itemDir);
+				writeHandle(c, myItem, itemDir);
+			} else {
+				throw new Exception("Error, can't make dir " + itemDir);
+			}
+		} else {
+			throw new Exception("Error, directory " + destDirName
+					+ " doesn't exist!");
+		}
+	}
 
-        // Save each of the schemas into it's own metadata file
-        Iterator iterator = map.keySet().iterator();
-        while (iterator.hasNext())
-        {
-            String schema = (String) iterator.next();
-            writeMetadata(c, schema, i, destDir);
-        }
-    }
+	/**
+	 * Discover the different schemas in use and output a seperate metadata XML
+	 * file for each schema.
+	 * 
+	 * @param c
+	 * @param i
+	 * @param destDir
+	 * @throws Exception
+	 */
+	private static void writeMetadata(Context c, Item i, File destDir)
+			throws Exception {
+		// Build a list of schemas for the item
+		HashMap map = new HashMap();
+		DCValue[] dcorevalues = i.getMetadata(Item.ANY, Item.ANY, Item.ANY,
+				Item.ANY);
+		for (int ii = 0; ii < dcorevalues.length; ii++) {
+			map.put(dcorevalues[ii].schema, null);
+		}
 
-    // output the item's dublin core into the item directory
-    private static void writeMetadata(Context c, String schema, Item i, File destDir)
-            throws Exception
-    {
-        String filename;
-        if (schema.equals(MetadataSchema.DC_SCHEMA)) {
-            filename = "dublin_core.xml";
-        } else {
-            filename = "metadata_" + schema + ".xml";
-        }
-        
-        File outFile = new File(destDir, filename);
+		// Save each of the schemas into it's own metadata file
+		Iterator iterator = map.keySet().iterator();
+		while (iterator.hasNext()) {
+			String schema = (String) iterator.next();
+			writeMetadata(c, schema, i, destDir);
+		}
+	}
 
-        System.out.println("Attempting to create file " + outFile);
+	// output the item's dublin core into the item directory
+	private static void writeMetadata(Context c, String schema, Item i,
+			File destDir) throws Exception {
+		String filename;
+		if (schema.equals(MetadataSchema.DC_SCHEMA)) {
+			filename = "dublin_core.xml";
+		} else {
+			filename = "metadata_" + schema + ".xml";
+		}
 
-        if (outFile.createNewFile())
-        {
-            BufferedOutputStream out = new BufferedOutputStream(
-                    new FileOutputStream(outFile));
+		File outFile = new File(destDir, filename);
 
-            DCValue[] dcorevalues = i.getMetadata(schema, Item.ANY, Item.ANY, Item.ANY);
+		System.out.println("Attempting to create file " + outFile);
 
-            // XML preamble
-            byte[] utf8 = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>\n"
-                    .getBytes("UTF-8");
-            out.write(utf8, 0, utf8.length);
+		if (outFile.createNewFile()) {
+			BufferedOutputStream out = new BufferedOutputStream(
+					new FileOutputStream(outFile));
 
-            String dcTag = "<dublin_core schema=\""+schema+"\">\n";
-            utf8 = dcTag.getBytes("UTF-8");
-            out.write(utf8, 0, utf8.length);
+			DCValue[] dcorevalues = i.getMetadata(schema, Item.ANY, Item.ANY,
+					Item.ANY);
 
-            for (int j = 0; j < dcorevalues.length; j++)
-            {
-                DCValue dcv = dcorevalues[j];
-                String qualifier = dcv.qualifier;
+			// XML preamble
+			byte[] utf8 = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>\n"
+					.getBytes("UTF-8");
+			out.write(utf8, 0, utf8.length);
 
-                if (qualifier == null)
-                {
-                    qualifier = "none";
-                }
+			String dcTag = "<dublin_core schema=\"" + schema + "\">\n";
+			utf8 = dcTag.getBytes("UTF-8");
+			out.write(utf8, 0, utf8.length);
 
-                utf8 = ("  <dcvalue element=\"" + dcv.element + "\" "
-                        + "qualifier=\"" + qualifier + "\">"
-                        + Utils.addEntities(dcv.value) + "</dcvalue>\n").getBytes("UTF-8");
+			for (int j = 0; j < dcorevalues.length; j++) {
+				DCValue dcv = dcorevalues[j];
+				String qualifier = dcv.qualifier;
 
-                out.write(utf8, 0, utf8.length);
-            }
+				if (qualifier == null) {
+					qualifier = "none";
+				}
 
-            utf8 = "</dublin_core>\n".getBytes("UTF-8");
-            out.write(utf8, 0, utf8.length);
+				utf8 = ("  <dcvalue element=\"" + dcv.element + "\" "
+						+ "qualifier=\"" + qualifier + "\">"
+						+ Utils.addEntities(dcv.value) + "</dcvalue>\n")
+						.getBytes("UTF-8");
 
-            out.close();
-        }
-        else
-        {
-            throw new Exception("Cannot create dublin_core.xml in " + destDir);
-        }
-    }
+				out.write(utf8, 0, utf8.length);
+			}
 
-    // create the file 'handle' which contains the handle assigned to the item
-    private static void writeHandle(Context c, Item i, File destDir)
-            throws Exception
-    {
-        String filename = "handle";
+			utf8 = "</dublin_core>\n".getBytes("UTF-8");
+			out.write(utf8, 0, utf8.length);
 
-        File outFile = new File(destDir, filename);
+			out.close();
+		} else {
+			throw new Exception("Cannot create dublin_core.xml in " + destDir);
+		}
+	}
 
-        if (outFile.createNewFile())
-        {
-            PrintWriter out = new PrintWriter(new FileWriter(outFile));
+	// create the file 'handle' which contains the handle assigned to the item
+	private static void writeHandle(Context c, Item i, File destDir)
+			throws Exception {
+		if (i.getHandle() == null) {
+			return;
+		}
+		String filename = "handle";
 
-            out.println(i.getHandle());
+		File outFile = new File(destDir, filename);
 
-            // close the contents file
-            out.close();
-        }
-        else
-        {
-            throw new Exception("Cannot create file " + filename + " in "
-                    + destDir);
-        }
-    }
+		if (outFile.createNewFile()) {
+			PrintWriter out = new PrintWriter(new FileWriter(outFile));
 
-    /**
-     * Create both the bitstreams and the contents file. Any bitstreams that
-     * were originally registered will be marked in the contents file as such.
-     * However, the export directory will contain actual copies of the content
-     * files being exported.
-     * 
-     * @param c the DSpace context
-     * @param i the item being exported
-     * @param destDir the item's export directory
-     * @throws Exception if there is any problem writing to the export 
-     * 		directory
-     */
-    private static void writeBitstreams(Context c, Item i, File destDir)
-            throws Exception
-    {
-        File outFile = new File(destDir, "contents");
+			out.println(i.getHandle());
 
-        if (outFile.createNewFile())
-        {
-            PrintWriter out = new PrintWriter(new FileWriter(outFile));
+			// close the contents file
+			out.close();
+		} else {
+			throw new Exception("Cannot create file " + filename + " in "
+					+ destDir);
+		}
+	}
 
-            Bundle[] bundles = i.getBundles();
+	/**
+	 * Create both the bitstreams and the contents file. Any bitstreams that
+	 * were originally registered will be marked in the contents file as such.
+	 * However, the export directory will contain actual copies of the content
+	 * files being exported.
+	 * 
+	 * @param c
+	 *            the DSpace context
+	 * @param i
+	 *            the item being exported
+	 * @param destDir
+	 *            the item's export directory
+	 * @throws Exception
+	 *             if there is any problem writing to the export directory
+	 */
+	private static void writeBitstreams(Context c, Item i, File destDir)
+			throws Exception {
+		File outFile = new File(destDir, "contents");
 
-            for (int j = 0; j < bundles.length; j++)
-            {
-                // bundles can have multiple bitstreams now...
-                Bitstream[] bitstreams = bundles[j].getBitstreams();
+		if (outFile.createNewFile()) {
+			PrintWriter out = new PrintWriter(new FileWriter(outFile));
 
-                String bundleName = bundles[j].getName();
+			Bundle[] bundles = i.getBundles();
 
-                for (int k = 0; k < bitstreams.length; k++)
-                {
-                    Bitstream b = bitstreams[k];
+			for (int j = 0; j < bundles.length; j++) {
+				// bundles can have multiple bitstreams now...
+				Bitstream[] bitstreams = bundles[j].getBitstreams();
 
-                    String myName = b.getName();
-                    String oldName = myName;
-                    int myPrefix = 1; // only used with name conflict
+				String bundleName = bundles[j].getName();
 
-                    InputStream is = b.retrieve();
+				for (int k = 0; k < bitstreams.length; k++) {
+					Bitstream b = bitstreams[k];
 
-                    boolean isDone = false; // done when bitstream is finally
-                                            // written
+					String myName = b.getName();
+					String oldName = myName;
+					int myPrefix = 1; // only used with name conflict
 
-                    while (!isDone)
-                    {
-                        File fout = new File(destDir, myName);
+					InputStream is = b.retrieve();
 
-                        if (fout.createNewFile())
-                        {
-                            FileOutputStream fos = new FileOutputStream(fout);
-                            Utils.bufferedCopy(is, fos);
-                            // close streams
-                            is.close();
-                            fos.close();
+					boolean isDone = false; // done when bitstream is finally
+					// written
 
-                            // write the manifest file entry
-                            if (b.isRegisteredBitstream()) {
-                                out.println("-r -s " + b.getStoreNumber() 
-                                		+ " -f " + myName 
-										+ "\tbundle:" + bundleName);
-                            } else {
-                                out.println(myName + "\tbundle:" + bundleName);
-                            }
+					while (!isDone) {
+						File fout = new File(destDir, myName);
 
-                            isDone = true;
-                        }
-                        else
-                        {
-                            myName = myPrefix + "_" + oldName; // keep appending
-                                                               // numbers to the
-                                                               // filename until
-                                                               // unique
-                            myPrefix++;
-                        }
-                    }
-                }
-            }
+						if (fout.createNewFile()) {
+							FileOutputStream fos = new FileOutputStream(fout);
+							Utils.bufferedCopy(is, fos);
+							// close streams
+							is.close();
+							fos.close();
 
-            // close the contents file
-            out.close();
-        }
-        else
-        {
-            throw new Exception("Cannot create contents in " + destDir);
-        }
-    }
+							// write the manifest file entry
+							if (b.isRegisteredBitstream()) {
+								out.println("-r -s " + b.getStoreNumber()
+										+ " -f " + myName + "\tbundle:"
+										+ bundleName);
+							} else {
+								out.println(myName + "\tbundle:" + bundleName);
+							}
+
+							isDone = true;
+						} else {
+							myName = myPrefix + "_" + oldName; // keep
+							// appending
+							// numbers to the
+							// filename until
+							// unique
+							myPrefix++;
+						}
+					}
+				}
+			}
+
+			// close the contents file
+			out.close();
+		} else {
+			throw new Exception("Cannot create contents in " + destDir);
+		}
+	}
+
+	/**
+	 * Convenience methot to create export a single Community, Collection, or
+	 * Item
+	 * 
+	 * @param dso -
+	 *            the dspace object to export
+	 * @param context -
+	 *            the dspace context
+	 * @throws Exception
+	 */
+	public static void createDownloadableExport(DSpaceObject dso,
+			Context context) throws Exception {
+		EPerson eperson = context.getCurrentUser();
+		ArrayList<DSpaceObject> list = new ArrayList<DSpaceObject>(1);
+		list.add(dso);
+		processDownloadableExport(list, context, eperson == null ? null
+				: eperson.getEmail());
+	}
+
+	/**
+	 * Convenience method to export a List of dspace objects (Community,
+	 * Collection or Item)
+	 * 
+	 * @param dsObjects -
+	 *            List containing dspace objects
+	 * @param context -
+	 *            the dspace context
+	 * @throws Exception
+	 */
+	public static void createDownloadableExport(List<DSpaceObject> dsObjects,
+			Context context) throws Exception {
+		EPerson eperson = context.getCurrentUser();
+		processDownloadableExport(dsObjects, context, eperson == null ? null
+				: eperson.getEmail());
+	}
+
+	/**
+	 * Convenience methot to create export a single Community, Collection, or
+	 * Item
+	 * 
+	 * @param dso -
+	 *            the dspace object to export
+	 * @param context -
+	 *            the dspace context
+	 * @param additionalEmail -
+	 *            cc email to use
+	 * @throws Exception
+	 */
+	public static void createDownloadableExport(DSpaceObject dso,
+			Context context, String additionalEmail) throws Exception {
+		ArrayList<DSpaceObject> list = new ArrayList<DSpaceObject>(1);
+		list.add(dso);
+		processDownloadableExport(list, context, additionalEmail);
+	}
+
+	/**
+	 * Convenience method to export a List of dspace objects (Community,
+	 * Collection or Item)
+	 * 
+	 * @param dsObjects -
+	 *            List containing dspace objects
+	 * @param context -
+	 *            the dspace context
+	 * @param additionalEmail -
+	 *            cc email to use
+	 * @throws Exception
+	 */
+	public static void createDownloadableExport(List<DSpaceObject> dsObjects,
+			Context context, String additionalEmail) throws Exception {
+		processDownloadableExport(dsObjects, context, additionalEmail);
+	}
+
+	/**
+	 * Does the work creating a List with all the Items in the Community or
+	 * Collection It then kicks off a new Thread to export the items, zip the
+	 * export directory and send confirmation email
+	 * 
+	 * @param dsObjects -
+	 *            List of dspace objects to process
+	 * @param context -
+	 *            the dspace context
+	 * @param additionalEmail -
+	 *            email address to cc in addition the the current user email
+	 * @throws Exception
+	 */
+	private static void processDownloadableExport(List<DSpaceObject> dsObjects,
+			Context context, final String additionalEmail) throws Exception {
+		final EPerson eperson = context.getCurrentUser();
+
+		// before we create a new export archive lets delete the 'expired'
+		// archives
+		deleteOldExportArchives(eperson.getID());
+
+		// keep track of the commulative size of all bitstreams in each of the
+		// items
+		// it will be checked against the config file entry
+		float size = 0;
+		final ArrayList<Integer> items = new ArrayList<Integer>();
+		for (DSpaceObject dso : dsObjects) {
+			if (dso.getType() == Constants.COMMUNITY) {
+				Community community = (Community) dso;
+				// get all the collections in the community
+				Collection[] collections = community.getCollections();
+				for (Collection collection : collections) {
+					// get all the items in each collection
+					ItemIterator iitems = collection.getItems();
+					while (iitems.hasNext()) {
+						Item item = iitems.next();
+						// get all the bundles in the item
+						Bundle[] bundles = item.getBundles();
+						for (Bundle bundle : bundles) {
+							// get all the bitstreams in each bundle
+							Bitstream[] bitstreams = bundle.getBitstreams();
+							for (Bitstream bit : bitstreams) {
+								// add up the size
+								size += bit.getSize();
+							}
+						}
+						items.add(item.getID());
+					}
+				}
+			} else if (dso.getType() == Constants.COLLECTION) {
+				Collection collection = (Collection) dso;
+				// get all the items in the collection
+				ItemIterator iitems = collection.getItems();
+				while (iitems.hasNext()) {
+					Item item = iitems.next();
+					// get all thebundles in the item
+					Bundle[] bundles = item.getBundles();
+					for (Bundle bundle : bundles) {
+						// get all the bitstreams in the bundle
+						Bitstream[] bitstreams = bundle.getBitstreams();
+						for (Bitstream bit : bitstreams) {
+							// add up the size
+							size += bit.getSize();
+						}
+					}
+					items.add(item.getID());
+				}
+			} else if (dso.getType() == Constants.ITEM) {
+				Item item = (Item) dso;
+				// get all the bundles in the item
+				Bundle[] bundles = item.getBundles();
+				for (Bundle bundle : bundles) {
+					// get all the bitstreams in the bundle
+					Bitstream[] bitstreams = bundle.getBitstreams();
+					for (Bitstream bit : bitstreams) {
+						// add up the size
+						size += bit.getSize();
+					}
+				}
+				items.add(item.getID());
+			} else {
+				// nothing to do just ignore this type of DSPaceObject
+			}
+		}
+
+		// check the size of all the bitstreams against the configuration file
+		// entry if it exists
+		String megaBytes = ConfigurationManager
+				.getProperty("org.dspace.app.itemexport.max.size");
+		if (megaBytes != null) {
+			float maxSize = 0;
+			try {
+				maxSize = Float.parseFloat(megaBytes);
+			} catch (Exception e) {
+				// ignore...configuration entry may not be present
+			}
+
+			if (maxSize > 0) {
+				if (maxSize < (size / 1048576.00)) { // a megabyte
+					throw new Exception(
+							"The overall size of this export is too large.  Please contact your administrator for more information.");
+				}
+			}
+		}
+
+		// if we have any items to process then kick off annonymous thread
+		if (items.size() > 0) {
+			Thread go = new Thread() {
+				public void run() {
+					Context context;
+					try {
+						// create a new dspace context
+						context = new Context();
+						// ignore auths
+						context.setIgnoreAuthorization(true);
+						ItemIterator iitems = new ItemIterator(context, items);
+
+						String fileName = assembleFileName(eperson, new Date());
+						String workDir = getExportWorkDirectory()
+								+ System.getProperty("file.separator")
+								+ fileName;
+						String downloadDir = getExportDownloadDirectory(eperson
+								.getID());
+
+						File wkDir = new File(workDir);
+						if (!wkDir.exists()) {
+							wkDir.mkdirs();
+						}
+
+						File dnDir = new File(downloadDir);
+						if (!dnDir.exists()) {
+							dnDir.mkdirs();
+						}
+
+						// export the items using normal export method
+						exportItem(context, iitems, workDir, 1);
+						// now zip up the export directory created above
+						zip(workDir, downloadDir
+								+ System.getProperty("file.separator")
+								+ fileName + ".zip");
+						// email message letting user know the file is ready for
+						// download
+						emailSuccessMessage(eperson.getEmail(),
+								ConfigurationManager
+										.getProperty("mail.from.address"),
+								additionalEmail, fileName + ".zip");
+						// return to enforcing auths
+						context.setIgnoreAuthorization(false);
+					} catch (Exception e1) {
+						try {
+							emailErrorMessage(eperson.getEmail(),
+									ConfigurationManager
+											.getProperty("mail.from.address"),
+									additionalEmail, e1.getMessage());
+						} catch (Exception e) {
+							// wont throw here
+						}
+						throw new RuntimeException(e1);
+					}
+				}
+
+			};
+
+			go.isDaemon();
+			go.start();
+		}
+	}
+
+	/**
+	 * Create a file name based on the date and eperson
+	 * 
+	 * @param eperson -
+	 *            eperson who requested export and will be able to download it
+	 * @param date -
+	 *            the date the export process was created
+	 * @return String representing the file name in the form of
+	 *         'export_yyy_MMM_dd_count_epersonID'
+	 * @throws Exception
+	 */
+	private static String assembleFileName(EPerson eperson, Date date)
+			throws Exception {
+		// to format the date
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy_MMM_dd");
+		String downloadDir = getExportDownloadDirectory(eperson.getID());
+		// used to avoid name collision
+		int count = 1;
+		boolean exists = true;
+		String fileName = null;
+		while (exists) {
+			fileName = "export_" + sdf.format(date) + "_" + count + "_"
+					+ eperson.getID();
+			exists = new File(downloadDir
+					+ System.getProperty("file.separator") + fileName + ".zip")
+					.exists();
+			count++;
+		}
+		return fileName;
+	}
+
+	/**
+	 * Use config file entry for org.dspace.app.itemexport.download.dir and id
+	 * of the eperson to create a download directory name
+	 * 
+	 * @param ePersonID -
+	 *            id of the eperson who requested export archive
+	 * @return String representing a directory in the form of
+	 *         org.dspace.app.itemexport.download.dir/epersonID
+	 * @throws Exception
+	 */
+	private static String getExportDownloadDirectory(int ePersonID)
+			throws Exception {
+		String downloadDir = ConfigurationManager
+				.getProperty("org.dspace.app.itemexport.download.dir");
+		if (downloadDir == null) {
+			throw new Exception(
+					"A dspace.cfg entry for 'org.dspace.app.itemexport.download.dir' does not exist.");
+		}
+
+		return downloadDir + System.getProperty("file.separator") + ePersonID;
+
+	}
+
+	/**
+	 * Returns config file entry for org.dspace.app.itemexport.work.dir
+	 * 
+	 * @return String representing config file entry for
+	 *         org.dspace.app.itemexport.work.dir
+	 * @throws Exception
+	 */
+	private static String getExportWorkDirectory() throws Exception {
+		String exportDir = ConfigurationManager
+				.getProperty("org.dspace.app.itemexport.work.dir");
+		if (exportDir == null) {
+			throw new Exception(
+					"A dspace.cfg entry for 'org.dspace.app.itemexport.work.dir' does not exist.");
+		}
+		return exportDir;
+	}
+
+	/**
+	 * Used to read the export archived. Inteded for download.
+	 * 
+	 * @param fileName
+	 *            the name of the file to download
+	 * @param eperson
+	 *            the eperson requesting the download
+	 * @return an input stream of the file to be downloaded
+	 * @throws Exception
+	 */
+	public static InputStream getExportDownloadInputStream(String fileName,
+			EPerson eperson) throws Exception {
+		File file = new File(getExportDownloadDirectory(eperson.getID())
+				+ System.getProperty("file.separator") + fileName);
+		if (file.exists()) {
+			return new FileInputStream(file);
+		} else
+			return null;
+	}
+
+	/**
+	 * Get the file size of the export archive represented by the file name
+	 * 
+	 * @param fileName
+	 *            name of the file to get the size
+	 * @param eperson
+	 *            the eperson requesting file
+	 * @return
+	 * @throws Exception
+	 */
+	public static long getExportFileSize(String fileName) throws Exception {
+		String strID = fileName.substring(fileName.lastIndexOf('_') + 1,
+				fileName.lastIndexOf('.'));
+		File file = new File(
+				getExportDownloadDirectory(Integer.parseInt(strID))
+						+ System.getProperty("file.separator") + fileName);
+		if (!file.exists() || !file.isFile()) {
+			throw new FileNotFoundException("The file " + getExportDownloadDirectory(Integer.parseInt(strID))
+					+ System.getProperty("file.separator") + fileName
+					+ " does not exist.");
+		}
+
+		return file.length();
+	}
+
+	public static long getExportFileLastModified(String fileName) throws Exception {
+		String strID = fileName.substring(fileName.lastIndexOf('_') + 1,
+				fileName.lastIndexOf('.'));
+		File file = new File(
+				getExportDownloadDirectory(Integer.parseInt(strID))
+						+ System.getProperty("file.separator") + fileName);
+		if (!file.exists() || !file.isFile()) {
+			throw new FileNotFoundException("The file " + getExportDownloadDirectory(Integer.parseInt(strID))
+					+ System.getProperty("file.separator") + fileName
+					+ " does not exist.");
+		}
+
+		return file.lastModified();
+	}
+
+	/**
+	 * The file name of the export archive contains the eperson id of the person
+	 * who created it When requested for download this method can check if the
+	 * person requesting it is the same one that created it
+	 * 
+	 * @param context
+	 *            dspace context
+	 * @param fileName
+	 *            the file name to check auths for
+	 * @return true if it is the same person false otherwise
+	 */
+	public static boolean canDownload(Context context, String fileName) {
+		EPerson eperson = context.getCurrentUser();
+		if (eperson == null) {
+			return false;
+		}
+		String strID = fileName.substring(fileName.lastIndexOf('_') + 1,
+				fileName.lastIndexOf('.'));
+		try {
+			if (Integer.parseInt(strID) == eperson.getID()) {
+				return true;
+			}
+		} catch (Exception e) {
+			return false;
+		}
+		return false;
+	}
+
+	/**
+	 * Reads the download directory for the eperson to see if any export
+	 * archives are available
+	 * 
+	 * @param eperson
+	 * @return a list of file names representing export archives that have been
+	 *         processed
+	 * @throws Exception
+	 */
+	public static List<String> getExportsAvailable(EPerson eperson)
+			throws Exception {
+		File downloadDir = new File(getExportDownloadDirectory(eperson.getID()));
+		if (!downloadDir.exists() || !downloadDir.isDirectory()) {
+			return null;
+		}
+
+		List<String> fileNames = new ArrayList<String>();
+
+		for (String fileName : downloadDir.list()) {
+			if (fileName.contains("export") && fileName.endsWith(".zip")) {
+				fileNames.add(fileName);
+			}
+		}
+
+		if (fileNames.size() > 0) {
+			return fileNames;
+		}
+
+		return null;
+	}
+
+	/**
+	 * A clean up method that is ran before a new export archive is created. It
+	 * uses the config file entry 'org.dspace.app.itemexport.life.span.hours' to
+	 * determine if the current exports are too old and need pruging
+	 * 
+	 * @param epersonID -
+	 *            the id of the eperson to clean up
+	 * @throws Exception
+	 */
+	private static void deleteOldExportArchives(int epersonID) throws Exception {
+		int hours = ConfigurationManager
+				.getIntProperty("org.dspace.app.itemexport.life.span.hours");
+		Calendar now = Calendar.getInstance();
+		now.setTime(new Date());
+		now.add(Calendar.HOUR, (-hours));
+		File downloadDir = new File(getExportDownloadDirectory(epersonID));
+		if (downloadDir.exists()) {
+			File[] files = downloadDir.listFiles();
+			for (File file : files) {
+				if (file.lastModified() < now.getTimeInMillis()) {
+					file.delete();
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * Since the archive is created in a new thread we are unable to communicate
+	 * with calling method about success or failure. We accomplis this
+	 * communication with email instead. Send a success email once the export
+	 * archive is complete and ready for download
+	 * 
+	 * @param toMail -
+	 *            email to send message to
+	 * @param fromMail -
+	 *            email for the from field
+	 * @param ccMail -
+	 *            carbon copy email
+	 * @param fileName -
+	 *            the file name to be downloaded. It is added to the url in the
+	 *            email
+	 * @throws MessagingException
+	 */
+	private static void emailSuccessMessage(String toMail, String fromMail,
+			String ccMail, String fileName) throws MessagingException {
+		StringBuffer content = new StringBuffer();
+		content
+				.append("The item export you requested from the repositry is now ready for download.");
+		content.append(System.getProperty("line.separator"));
+		content.append(System.getProperty("line.separator"));
+		content
+				.append("You may download the compressed file using the following web address:");
+		content.append(System.getProperty("line.separator"));
+		content.append(ConfigurationManager.getProperty("dspace.url"));
+		content.append("/exportdownload/");
+		content.append(fileName);
+		content.append(System.getProperty("line.separator"));
+		content.append(System.getProperty("line.separator"));
+		content.append("Tis file will remain available for at least ");
+		content.append(ConfigurationManager
+				.getProperty("org.dspace.app.itemexport.life.span.hours"));
+		content.append(" hours.");
+		content.append(System.getProperty("line.separator"));
+		content.append(System.getProperty("line.separator"));
+		content.append("Thank you");
+
+		sendMessage(toMail, fromMail, ccMail,
+				"Item export requested is ready for download", content);
+	}
+
+	/**
+	 * Since the archive is created in a new thread we are unable to communicate
+	 * with calling method about success or failure. We accomplis this
+	 * communication with email instead. Send an error email if the export
+	 * archive fails
+	 * 
+	 * @param toMail -
+	 *            email to send message to
+	 * @param fromMail -
+	 *            email for the from field
+	 * @param ccMail -
+	 *            carbon copy email
+	 * @param fileName -
+	 *            the file name to be downloaded. It is added to the url in the
+	 *            email
+	 * @throws MessagingException
+	 */
+	private static void emailErrorMessage(String toMail, String fromMail,
+			String ccMail, String error) throws MessagingException {
+		StringBuffer content = new StringBuffer();
+		content.append("The item export you requested was not completed.");
+		content.append(System.getProperty("line.separator"));
+		content.append(System.getProperty("line.separator"));
+		content
+				.append("For more infrmation you may contact your system administrator.");
+		content.append(System.getProperty("line.separator"));
+		content.append(System.getProperty("line.separator"));
+		content.append("Error message received: ");
+		content.append(error);
+		content.append(System.getProperty("line.separator"));
+		content.append(System.getProperty("line.separator"));
+		content.append("Thank you");
+
+		sendMessage(toMail, fromMail, ccMail,
+				"Item export requested was not completed", content);
+	}
+
+	private static void sendMessage(String toMail, String fromMail,
+			String ccMail, String subject, StringBuffer content)
+			throws MessagingException {
+		try {
+			if (toMail == null || !toMail.contains("@")) {
+				return;
+			}
+
+			// Get the mail configuration properties
+			String server = ConfigurationManager.getProperty("mail.server");
+
+			// Set up properties for mail session
+			Properties props = System.getProperties();
+			props.put("mail.smtp.host", server);
+
+			// Get session
+			Session session = Session.getDefaultInstance(props, null);
+
+			MimeMessage msg = new MimeMessage(session);
+			Multipart multipart = new MimeMultipart();
+
+			// create the first part of the email
+			BodyPart messageBodyPart = new MimeBodyPart();
+			messageBodyPart.setText(content.toString());
+
+			multipart.addBodyPart(messageBodyPart);
+			msg.setContent(multipart);
+			msg.setFrom(new InternetAddress(fromMail));
+			msg.addRecipient(Message.RecipientType.TO, new InternetAddress(
+					toMail));
+			if (ccMail != null && ccMail.contains("@")) {
+				msg.addRecipient(Message.RecipientType.CC, new InternetAddress(
+						ccMail));
+			}
+			msg.setSentDate(new Date());
+			msg.setSubject(subject);
+			Transport.send(msg);
+		} catch (MessagingException e) {
+			e.printStackTrace();
+			throw e;
+		}
+	}
+
+	private static void zip(String strSource, String target) throws Exception {
+		ZipOutputStream cpZipOutputStream = null;
+		String tempFileName = target + "_tmp";
+		try {
+			File cpFile = new File(strSource);
+			if (!cpFile.isFile() && !cpFile.isDirectory()) {
+				return;
+			}
+			File targetFile = new File(tempFileName);
+			if (!targetFile.exists()) {
+				targetFile.createNewFile();
+			}
+			FileOutputStream fos = new FileOutputStream(tempFileName);
+			cpZipOutputStream = new ZipOutputStream(fos);
+			cpZipOutputStream.setLevel(9);
+			zipFiles(cpFile, strSource, tempFileName, cpZipOutputStream);
+			cpZipOutputStream.finish();
+			cpZipOutputStream.close();
+			deleteDirectory(cpFile);
+			targetFile.renameTo(new File(target));
+		} catch (Exception e) {
+			throw e;
+		}
+	}
+
+	private static void zipFiles(File cpFile, String strSource,
+			String strTarget, ZipOutputStream cpZipOutputStream)
+			throws Exception {
+		int byteCount;
+		final int DATA_BLOCK_SIZE = 2048;
+		FileInputStream cpFileInputStream;
+		if (cpFile.isDirectory()) {
+			File[] fList = cpFile.listFiles();
+			for (int i = 0; i < fList.length; i++) {
+				zipFiles(fList[i], strSource, strTarget, cpZipOutputStream);
+			}
+		} else {
+			try {
+				if (cpFile.getAbsolutePath().equalsIgnoreCase(strTarget)) {
+					return;
+				}
+				String strAbsPath = cpFile.getPath();
+				String strZipEntryName = strAbsPath.substring(strSource
+						.length() + 1, strAbsPath.length());
+
+				// byte[] b = new byte[ (int)(cpFile.length()) ];
+
+				cpFileInputStream = new FileInputStream(cpFile);
+				ZipEntry cpZipEntry = new ZipEntry(strZipEntryName);
+				cpZipOutputStream.putNextEntry(cpZipEntry);
+
+				byte[] b = new byte[DATA_BLOCK_SIZE];
+				while ((byteCount = cpFileInputStream.read(b, 0,
+						DATA_BLOCK_SIZE)) != -1) {
+					cpZipOutputStream.write(b, 0, byteCount);
+				}
+
+				// cpZipOutputStream.write(b, 0, (int)cpFile.length());
+				cpZipOutputStream.closeEntry();
+			} catch (Exception e) {
+				throw e;
+			}
+		}
+	}
+
+	private static boolean deleteDirectory(File path) {
+		if (path.exists()) {
+			File[] files = path.listFiles();
+			for (int i = 0; i < files.length; i++) {
+				if (files[i].isDirectory()) {
+					deleteDirectory(files[i]);
+				} else {
+					files[i].delete();
+				}
+			}
+		}
+
+		boolean pathDeleted = path.delete();
+		return (pathDeleted);
+	}
+
 }

Added: branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/ItemExportArchiveServlet.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/ItemExportArchiveServlet.java	                        (rev 0)
+++ branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/ItemExportArchiveServlet.java	2008-06-24 21:08:28 UTC (rev 2968)
@@ -0,0 +1,158 @@
+/*
+ * ItemExportArchiveServlet.java
+ *
+ * Version: $Revision: 2073 $
+ *
+ * Date: $Date: 2007-07-19 11:45:10 -0500 (Thu, 19 Jul 2007) $
+ *
+ * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+package org.dspace.app.webui.servlet;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.SQLException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.dspace.app.itemexport.ItemExport;
+import org.dspace.app.webui.util.JSPManager;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.ConfigurationManager;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.core.LogManager;
+import org.dspace.core.Utils;
+
+/**
+ * Servlet for retrieving item export archives. The bits are simply piped to the
+ * user. If there is an <code>If-Modified-Since</code> header, only a 304
+ * status code is returned if the containing item has not been modified since
+ * that date.
+ * <P>
+ * <code>/exportdownload/filename</code>
+ * 
+ * @author Jay Paz
+ */
+public class ItemExportArchiveServlet extends DSpaceServlet {
+	/** log4j category */
+	private static Logger log = Logger
+			.getLogger(ItemExportArchiveServlet.class);
+
+	/**
+	 * Threshold on export size size before content-disposition will be set.
+	 */
+	private int threshold;
+
+	@Override
+	public void init(ServletConfig arg0) throws ServletException {
+
+		super.init(arg0);
+		threshold = ConfigurationManager
+				.getIntProperty("webui.content_disposition_threshold");
+	}
+
+	@Override
+	protected void doDSGet(Context context, HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException,
+			SQLException, AuthorizeException {
+		String filename = null;
+
+		filename = request.getPathInfo().substring(
+				request.getPathInfo().lastIndexOf('/')+1);
+		System.out.println(filename);
+
+		if (ItemExport.canDownload(context, filename)) {
+			try {
+				InputStream exportStream = ItemExport
+						.getExportDownloadInputStream(filename, context
+								.getCurrentUser());
+
+				if (exportStream == null || filename == null) {
+					// No bitstream found or filename was wrong -- ID invalid
+					log.info(LogManager.getHeader(context, "invalid_id",
+							"path=" + filename));
+					JSPManager.showInvalidIDError(request, response, filename,
+							Constants.BITSTREAM);
+
+					return;
+				}
+
+				log.info(LogManager.getHeader(context,
+						"download_export_archive", "filename=" + filename));
+
+				// Modification date
+				// TODO: Currently the date of the item, since we don't have
+				// dates
+				// for files
+				long lastModified = ItemExport
+						.getExportFileLastModified(filename);
+				response.setDateHeader("Last-Modified", lastModified);
+
+				// Check for if-modified-since header
+				long modSince = request.getDateHeader("If-Modified-Since");
+
+				if (modSince != -1 && lastModified < modSince) {
+					// Item has not been modified since requested date,
+					// hence bitstream has not; return 304
+					response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+					return;
+				}
+
+				// Set the response MIME type
+				response.setContentType(ItemExport.COMPRESSED_EXPORT_MIME_TYPE);
+
+				// Response length
+				long size = ItemExport.getExportFileSize(filename);
+				response.setHeader("Content-Length", String.valueOf(size));
+
+				response.setHeader("Content-Disposition",
+						"attachment;filename=" + filename);
+
+				Utils.bufferedCopy(exportStream, response.getOutputStream());
+				exportStream.close();
+				response.getOutputStream().flush();
+			} catch (Exception e) {
+				throw new ServletException(e);
+			}
+		} else {
+			throw new AuthorizeException(
+					"You are not authorized to download this Export Archive.");
+		}
+	}
+
+}

Modified: branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/MyDSpaceServlet.java
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/MyDSpaceServlet.java	2008-06-24 21:06:12 UTC (rev 2967)
+++ branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/MyDSpaceServlet.java	2008-06-24 21:08:28 UTC (rev 2968)
@@ -50,11 +50,13 @@
 
 import org.apache.log4j.Logger;
 import org.dspace.app.webui.util.JSPManager;
+import org.dspace.app.itemexport.ItemExport;
 import org.dspace.app.util.SubmissionConfigReader;
 import org.dspace.app.util.SubmissionConfig;
 import org.dspace.app.webui.util.UIUtil;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
+import org.dspace.content.Community;
 import org.dspace.content.Item;
 import org.dspace.content.ItemIterator;
 import org.dspace.content.SupervisedItem;
@@ -73,6 +75,7 @@
  * Servlet for constructing the components of the "My DSpace" page
  * 
  * @author Robert Tansley
+ * @author Jay Paz
  * @version $Id$
  */
 public class MyDSpaceServlet extends DSpaceServlet
@@ -94,6 +97,9 @@
 
     /** The "reason for rejection" page */
     public static final int REJECT_REASON_PAGE = 4;
+    
+    /** The "request export archive for download" page */
+    public static final int REQUEST_EXPORT_ARCHIVE = 5;
 
     protected void doDSGet(Context context, HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException,
@@ -136,7 +142,11 @@
             processRejectReason(context, request, response);
 
             break;
+        case REQUEST_EXPORT_ARCHIVE:
+            processExportArchive(context, request, response);
 
+            break;
+
         default:
             log.warn(LogManager.getHeader(context, "integrity_error", UIUtil
                     .getRequestLogInfo(request)));
@@ -576,6 +586,99 @@
         }
     }
 
+    private void processExportArchive(Context context,
+            HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
+    	
+    	if (request.getParameter("item_id") != null) {
+			Item item = null;
+			try {
+				item = Item.find(context, Integer.parseInt(request
+						.getParameter("item_id")));
+			} catch (Exception e) {
+				log.warn(LogManager.getHeader(context, "integrity_error", UIUtil
+	                    .getRequestLogInfo(request)));
+	            JSPManager.showIntegrityError(request, response);
+	            return;
+			}
+
+			if (item == null) {
+				log.warn(LogManager.getHeader(context, "integrity_error", UIUtil
+	                    .getRequestLogInfo(request)));
+	            JSPManager.showIntegrityError(request, response);
+	            return;
+			} else {
+				try {
+					ItemExport.createDownloadableExport(item, context);
+				} catch (Exception e) {
+					log.warn(LogManager.getHeader(context, "integrity_error", UIUtil
+		                    .getRequestLogInfo(request)));
+		            JSPManager.showIntegrityError(request, response);
+		            return;
+				}
+			}
+			
+			// success
+			JSPManager.showJSP(request, response, "/mydspace/task-complete.jsp");
+		} else if (request.getParameter("collection_id") != null) {
+			Collection col = null;
+			try {
+				col = Collection.find(context, Integer.parseInt(request
+						.getParameter("collection_id")));
+			} catch (Exception e) {
+				log.warn(LogManager.getHeader(context, "integrity_error", UIUtil
+	                    .getRequestLogInfo(request)));
+	            JSPManager.showIntegrityError(request, response);
+	            return;
+			}
+
+			if (col == null) {
+				log.warn(LogManager.getHeader(context, "integrity_error", UIUtil
+	                    .getRequestLogInfo(request)));
+	            JSPManager.showIntegrityError(request, response);
+	            return;
+			} else {
+				try {
+					ItemExport.createDownloadableExport(col, context);
+				} catch (Exception e) {
+					log.warn(LogManager.getHeader(context, "integrity_error", UIUtil
+		                    .getRequestLogInfo(request)));
+		            JSPManager.showIntegrityError(request, response);
+		            return;
+				}
+			}
+			JSPManager.showJSP(request, response, "/mydspace/task-complete.jsp");
+		} else if (request.getParameter("community_id") != null) {
+			Community com = null;
+			try {
+				com = Community.find(context, Integer.parseInt(request
+						.getParameter("community_id")));
+			} catch (Exception e) {
+				log.warn(LogManager.getHeader(context, "integrity_error", UIUtil
+	                    .getRequestLogInfo(request)));
+	            JSPManager.showIntegrityError(request, response);
+	            return;
+			}
+
+			if (com == null) {
+				log.warn(LogManager.getHeader(context, "integrity_error", UIUtil
+	                    .getRequestLogInfo(request)));
+	            JSPManager.showIntegrityError(request, response);
+	            return;
+			} else {
+				try {
+					org.dspace.app.itemexport.ItemExport.createDownloadableExport(com, context);
+				} catch (Exception e) {
+					log.warn(LogManager.getHeader(context, "integrity_error", UIUtil
+		                    .getRequestLogInfo(request)));
+		            JSPManager.showIntegrityError(request, response);
+		            return;
+				}
+			}
+			JSPManager.showJSP(request, response, "/mydspace/task-complete.jsp");
+		}
+    	
+    	
+    }
     // ****************************************************************
     // ****************************************************************
     // METHODS FOR SHOWING FORMS
@@ -623,7 +726,16 @@
 
         SupervisedItem[] supervisedItems = SupervisedItem.findbyEPerson(
                 context, currentUser);
-
+        // export archives available for download
+        List<String> exportArchives = null;
+        try{
+        	exportArchives = ItemExport.getExportsAvailable(currentUser);
+        }
+        catch (Exception e) {
+			// nothing to do they just have no export archives available for download
+		}
+        
+        
         // Set attributes
         request.setAttribute("mydspace.user", currentUser);
         request.setAttribute("workspace.items", workspaceItems);
@@ -633,6 +745,7 @@
         request.setAttribute("group.memberships", memberships);
         request.setAttribute("display.groupmemberships", new Boolean(displayMemberships));
         request.setAttribute("supervised.items", supervisedItems);
+        request.setAttribute("export.archives", exportArchives);
 
         // Forward to main mydspace page
         JSPManager.showJSP(request, response, "/mydspace/main.jsp");

Modified: branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/WEB-INF/web.xml	2008-06-24 21:06:12 UTC (rev 2967)
+++ branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/WEB-INF/web.xml	2008-06-24 21:08:28 UTC (rev 2968)
@@ -164,6 +164,11 @@
     <servlet-class>org.dspace.app.webui.servlet.BitstreamServlet</servlet-class>
   </servlet>
 
+ <servlet>
+    <servlet-name>exportdownload</servlet-name>
+    <servlet-class>org.dspace.app.webui.servlet.ItemExportArchiveServlet</servlet-class>
+  </servlet>
+
 	<servlet>
 		<servlet-name>browse</servlet-name>
 		<servlet-class>org.dspace.app.webui.servlet.BrowserServlet</servlet-class>
@@ -413,6 +418,11 @@
     <url-pattern>/bitstream/*</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>exportdownload</servlet-name>
+    <url-pattern>/exportdownload/*</url-pattern>
+  </servlet-mapping>
+
 	<servlet-mapping>
 		<servlet-name>browse</servlet-name>
 		<url-pattern>/browse</url-pattern>

Modified: branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/collection-home.jsp
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/collection-home.jsp	2008-06-24 21:06:12 UTC (rev 2967)
+++ branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/collection-home.jsp	2008-06-24 21:08:28 UTC (rev 2968)
@@ -126,6 +126,7 @@
     ItemCounter ic = new ItemCounter(UIUtil.obtainContext(request));
 %>
 
+<%@page import="org.dspace.app.webui.servlet.MyDSpaceServlet"%>
 <dspace:layout locbar="commLink" title="<%= name %>" feedData="<%= feedData %>">
 
   <table border="0" cellpadding="5" width="100%">
@@ -289,8 +290,19 @@
 	         </td>
            </tr>
 <% } %>
+<% if( editor_button || admin_button) { %>
             <tr>
               <td headers="t1" class="standard" align="center">
+                <form method="post" action="<%=request.getContextPath()%>/mydspace">
+                  <input type="hidden" name="collection_id" value="<%= collection.getID() %>" />
+                  <input type="hidden" name="step" value="<%= MyDSpaceServlet.REQUEST_EXPORT_ARCHIVE %>" />
+                  <input type="submit" value="<fmt:message key="jsp.mydspace.request.export.collection"/>" />
+                </form>
+              </td>
+            </tr>
+<% } %>
+            <tr>
+              <td headers="t1" class="standard" align="center">
                  <dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.collection-admin\")%>"><fmt:message key="jsp.adminhelp"/></dspace:popup>
               </td>
             </tr>

Modified: branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/community-home.jsp
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/community-home.jsp	2008-06-24 21:06:12 UTC (rev 2967)
+++ branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/community-home.jsp	2008-06-24 21:08:28 UTC (rev 2968)
@@ -103,6 +103,7 @@
     ItemCounter ic = new ItemCounter(UIUtil.obtainContext(request));
 %>
 
+<%@page import="org.dspace.app.webui.servlet.MyDSpaceServlet"%>
 <dspace:layout locbar="commLink" title="<%= name %>" feedData="<%= feedData %>">
 
   <table border="0" cellpadding="5" width="100%">
@@ -333,8 +334,19 @@
              <% } %>
               </td>
             </tr>
+            <% if( editor_button ) { %>
             <tr>
               <td headers="t1" class="standard" align="center">
+                <form method="post" action="<%=request.getContextPath()%>/mydspace">
+                  <input type="hidden" name="community_id" value="<%= community.getID() %>" />
+                  <input type="hidden" name="step" value="<%= MyDSpaceServlet.REQUEST_EXPORT_ARCHIVE %>" />
+                  <input type="submit" value="<fmt:message key="jsp.mydspace.request.export.community"/>" />
+                </form>
+              </td>
+            </tr>
+			<% } %>
+            <tr>
+              <td headers="t1" class="standard" align="center">
                  <dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.site-admin\")%>"><fmt:message key="jsp.adminhelp"/></dspace:popup>
               </td>
             </tr>

Modified: branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/display-item.jsp
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/display-item.jsp	2008-06-24 21:06:12 UTC (rev 2967)
+++ branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/display-item.jsp	2008-06-24 21:08:28 UTC (rev 2968)
@@ -111,6 +111,7 @@
 	}
 %>
 
+<%@page import="org.dspace.app.webui.servlet.MyDSpaceServlet"%>
 <dspace:layout title="<%= title %>">
 
 <%
@@ -136,6 +137,14 @@
                     <input type="submit" name="submit" value="<fmt:message key="jsp.general.edit.button"/>" />
                 </form>
             </td>
+            <td class="evenRowEvenCol" align="center">
+                <form method="post" action="<%= request.getContextPath() %>/mydspace">
+                    <input type="hidden" name="item_id" value="<%= item.getID() %>" />
+                    <input type="hidden" name="step" value="<%= MyDSpaceServlet.REQUEST_EXPORT_ARCHIVE %>" />
+                    <%--<input type="submit" name="submit" value="Edit...">--%>
+                    <input type="submit" name="submit" value="<fmt:message key="jsp.mydspace.request.export.item"/>" />
+                </form>
+            </td>
 <%      } %>
         </tr>
     </table>

Modified: branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/mydspace/main.jsp
===================================================================
--- branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/mydspace/main.jsp	2008-06-24 21:06:12 UTC (rev 2967)
+++ branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp/src/main/webapp/mydspace/main.jsp	2008-06-24 21:08:28 UTC (rev 2968)
@@ -73,6 +73,7 @@
 <%@ page import="org.dspace.eperson.Group"   %>
 <%@ page import="org.dspace.workflow.WorkflowItem" %>
 <%@ page import="org.dspace.workflow.WorkflowManager" %>
+<%@ page import="java.util.List" %>
 
 <%
     EPerson user = (EPerson) request.getAttribute("mydspace.user");
@@ -95,6 +96,8 @@
     SupervisedItem[] supervisedItems =
         (SupervisedItem[]) request.getAttribute("supervised.items");
     
+    List<String> exportsAvailable = (List<String>)request.getAttribute("export.archives");
+    
     // Is the logged in user an admin
     Boolean displayMembership = (Boolean)request.getAttribute("display.groupmemberships");
     boolean displayGroupMembership = (displayMembership == null ? false : displayMembership.booleanValue());
@@ -438,4 +441,13 @@
 <%
   }
 %>
+
+	<%if(exportsAvailable!=null && exportsAvailable.size()>0){ %>
+	<h2><fmt:message key="jsp.mydspace.main.heading7"/></h2>
+	<ol class="exportArchives">
+		<%for(String fileName:exportsAvailable){%>
+			<li><a href="<%=request.getContextPath()+"/exportdownload/"+fileName%>" title="<fmt:message key="jsp.mydspace.main.export.archive.title"><fmt:param><%= fileName %></fmt:param></fmt:message>"><%=fileName%></a></li> 
+		<% } %>
+	</ol>
+	<%} %>
 </dspace:layout>

Added: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ItemExport.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ItemExport.java	                        (rev 0)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ItemExport.java	2008-06-24 21:08:28 UTC (rev 2968)
@@ -0,0 +1,323 @@
+/*
+ * ItemExport.java
+ *
+ * Version: $Revision: 1.3 $
+ *
+ * Date: $Date: 2006/07/13 23:20:54 $
+ *
+ * Copyright (c) 2002, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+package org.dspace.app.xmlui.aspect.administrative;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Map;
+
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.caching.CacheableProcessingComponent;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Response;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.util.HashUtil;
+import org.apache.excalibur.source.SourceValidity;
+import org.apache.excalibur.source.impl.validity.NOPValidity;
+import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
+import org.dspace.app.xmlui.utils.DSpaceValidity;
+import org.dspace.app.xmlui.utils.UIException;
+import org.dspace.app.xmlui.wing.Message;
+import org.dspace.app.xmlui.wing.WingException;
+import org.dspace.app.xmlui.wing.element.Body;
+import org.dspace.app.xmlui.wing.element.Division;
+import org.dspace.app.xmlui.wing.element.List;
+import org.dspace.app.xmlui.wing.element.PageMeta;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.Item;
+import org.dspace.eperson.Group;
+import org.xml.sax.SAXException;
+
+/**
+ * 
+ * Create the ability to view currently available export archives for download.
+ * 
+ * @author Jay Paz
+ */
+public class ItemExport extends AbstractDSpaceTransformer implements
+		CacheableProcessingComponent {
+	private final static Message T_dspace_home = message("xmlui.general.dspace_home");
+
+	private static final Message T_main_head = message("xmlui.administrative.ItemExport.head");
+
+	private static final Message T_export_bad_item_id = message("xmlui.administrative.ItemExport.item.id.error");
+
+	private static final Message T_export_bad_col_id = message("xmlui.administrative.ItemExport.collection.id.error");
+
+	private static final Message T_export_bad_community_id = message("xmlui.administrative.ItemExport.community.id.error");
+
+	private static final Message T_export_item_not_found = message("xmlui.administrative.ItemExport.item.not.found");
+
+	private static final Message T_export_col_not_found = message("xmlui.administrative.ItemExport.collection.not.found");
+
+	private static final Message T_export_community_not_found = message("xmlui.administrative.ItemExport.community.not.found");
+
+	private static final Message T_item_export_success = message("xmlui.administrative.ItemExport.item.success");
+
+	private static final Message T_col_export_success = message("xmlui.administrative.ItemExport.collection.success");
+
+	private static final Message T_community_export_success = message("xmlui.administrative.ItemExport.community.success");
+
+	private static final Message T_avail_head = message("xmlui.administrative.ItemExport.available.head");
+
+	/** The Cocoon request */
+	Request request;
+
+	/** The Cocoon response */
+	Response response;
+
+	java.util.List<Message> errors;
+
+	java.util.List<String> availableExports;
+
+	Message message;
+
+	/** Cached validity object */
+	private SourceValidity validity;
+
+	@Override
+	public void setup(SourceResolver resolver, Map objectModel, String src,
+			Parameters parameters) throws ProcessingException, SAXException,
+			IOException {
+		super.setup(resolver, objectModel, src, parameters);
+		this.objectModel = objectModel;
+		this.request = ObjectModelHelper.getRequest(objectModel);
+		this.response = ObjectModelHelper.getResponse(objectModel);
+		try {
+			availableExports = org.dspace.app.itemexport.ItemExport
+					.getExportsAvailable(context.getCurrentUser());
+		} catch (Exception e) {
+			// nothing to do
+		}
+		errors = new ArrayList<Message>();
+		if (request.getParameter("itemID") != null) {
+			Item item = null;
+			try {
+				item = Item.find(context, Integer.parseInt(request
+						.getParameter("itemID")));
+			} catch (Exception e) {
+				errors.add(T_export_bad_item_id);
+			}
+
+			if (item == null) {
+				errors.add(T_export_item_not_found);
+			} else {
+				try {
+					org.dspace.app.itemexport.ItemExport
+							.createDownloadableExport(item, context);
+				} catch (Exception e) {
+					errors.add(message(e.getMessage()));
+				}
+			}
+			if (errors.size() <= 0)
+				message = T_item_export_success;
+		} else if (request.getParameter("collectionID") != null) {
+			Collection col = null;
+			try {
+				col = Collection.find(context, Integer.parseInt(request
+						.getParameter("collectionID")));
+			} catch (Exception e) {
+				errors.add(T_export_bad_col_id);
+			}
+
+			if (col == null) {
+				errors.add(T_export_col_not_found);
+			} else {
+				try {
+					org.dspace.app.itemexport.ItemExport
+							.createDownloadableExport(col, context);
+				} catch (Exception e) {
+					errors.add(message(e.getMessage()));
+				}
+			}
+			if (errors.size() <= 0)
+				message = T_col_export_success;
+		} else if (request.getParameter("communityID") != null) {
+			Community com = null;
+			try {
+				com = Community.find(context, Integer.parseInt(request
+						.getParameter("communityID")));
+			} catch (Exception e) {
+				errors.add(T_export_bad_community_id);
+			}
+
+			if (com == null) {
+				errors.add(T_export_community_not_found);
+			} else {
+				try {
+					org.dspace.app.itemexport.ItemExport
+							.createDownloadableExport(com, context);
+				} catch (Exception e) {
+					errors.add(message(e.getMessage()));
+				}
+			}
+			if (errors.size() <= 0)
+				message = T_community_export_success;
+		}
+	}
+
+	/**
+	 * Generate the unique cache key.
+	 * 
+	 * @return The generated key hashes the src
+	 */
+	public Serializable getKey() {
+		Request request = ObjectModelHelper.getRequest(objectModel);
+
+		// Special case, don't cache anything if the user is logging
+		// in. The problem occures because of timming, this cache key
+		// is generated before we know whether the operation has
+		// succeded or failed. So we don't know whether to cache this
+		// under the user's specific cache or under the anonymous user.
+		if (request.getParameter("login_email") != null
+				|| request.getParameter("login_password") != null
+				|| request.getParameter("login_realm") != null) {
+			return "0";
+		}
+
+		String key;
+		if (context.getCurrentUser() != null) {
+			key = context.getCurrentUser().getEmail();
+			if (availableExports != null && availableExports.size() > 0) {
+				for (String fileName : availableExports) {
+					key += ":" + fileName;
+				}
+			}
+
+			if (request.getQueryString() != null) {
+				key += request.getQueryString();
+			}
+		} else
+			key = "anonymous";
+
+		return HashUtil.hash(key);
+	}
+
+	/**
+	 * Generate the validity object.
+	 * 
+	 * @return The generated validity object or <code>null</code> if the
+	 *         component is currently not cacheable.
+	 */
+	public SourceValidity getValidity() {
+		if (this.validity == null) {
+			// Only use the DSpaceValidity object is someone is logged in.
+			if (context.getCurrentUser() != null) {
+				try {
+					DSpaceValidity validity = new DSpaceValidity();
+
+					validity.add(eperson);
+
+					Group[] groups = Group.allMemberGroups(context, eperson);
+					for (Group group : groups) {
+						validity.add(group);
+					}
+
+					this.validity = validity.complete();
+				} catch (SQLException sqle) {
+					// Just ignore it and return invalid.
+				}
+			} else {
+				this.validity = NOPValidity.SHARED_INSTANCE;
+			}
+		}
+		return this.validity;
+	}
+
+	/**
+	 * Add Page metadata.
+	 */
+	public void addPageMeta(PageMeta pageMeta) throws SAXException,
+			WingException, UIException, SQLException, IOException,
+			AuthorizeException {
+		pageMeta.addMetadata("title").addContent(T_main_head);
+
+		pageMeta.addTrailLink(contextPath + "/", T_dspace_home);
+		pageMeta.addTrail().addContent(T_main_head);
+	}
+
+	public void addBody(Body body) throws SAXException, WingException,
+			UIException, SQLException, IOException, AuthorizeException {
+		Division main = body.addDivision("export_main");
+		main.setHead(T_main_head);
+
+		if (message != null) {
+			main.addDivision("success", "success").addPara(message);
+		}
+
+		if (errors.size() > 0) {
+			Division errors = main.addDivision("export-errors", "error");
+			for (Message error : this.errors) {
+				errors.addPara(error);
+			}
+		}
+
+		if (availableExports != null && availableExports.size() > 0) {
+			Division avail = main.addDivision("available-exports",
+					"available-exports");
+			avail.setHead(T_avail_head);
+
+			List fileList = avail.addList("available-files", List.TYPE_ORDERED);
+			for (String fileName : availableExports) {
+				fileList.addItem().addXref(
+						this.contextPath + "/exportdownload/" + fileName,
+						fileName);
+			}
+		}
+	}
+
+	/**
+	 * recycle
+	 */
+	public void recycle() {
+		this.validity = null;
+		this.errors = null;
+		this.message = null;
+		this.availableExports = null;
+		super.recycle();
+	}
+
+}

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/Navigation.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/Navigation.java	2008-06-24 21:06:12 UTC (rev 2967)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/Navigation.java	2008-06-24 21:08:28 UTC (rev 2968)
@@ -42,13 +42,18 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.sql.SQLException;
+import java.util.Map;
 
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.util.HashUtil;
 import org.apache.excalibur.source.SourceValidity;
 import org.apache.excalibur.source.impl.validity.NOPValidity;
+import org.dspace.app.itemexport.ItemExport;
 import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
 import org.dspace.app.xmlui.utils.DSpaceValidity;
 import org.dspace.app.xmlui.utils.HandleUtil;
@@ -75,6 +80,7 @@
  * @author Scott Phillips
  * @author Afonso Araujo Neto (internationalization)
  * @author Alexey Maslov
+ * @author Jay Paz
  */
 public class Navigation extends AbstractDSpaceTransformer implements CacheableProcessingComponent
 {
@@ -101,12 +107,18 @@
 
     private static final Message T_statistics            	= message("xmlui.administrative.Navigation.statistics");
 
-   
+    private static final Message T_context_export_item 				= message("xmlui.administrative.Navigation.context_export_item");
+    private static final Message T_context_export_collection 		= message("xmlui.administrative.Navigation.context_export_collection");
+    private static final Message T_context_export_community 		= message("xmlui.administrative.Navigation.context_export_community");
+    private static final Message T_account_export			 		= message("xmlui.administrative.Navigation.account_export");
 	
 
     /** Cached validity object */
 	private SourceValidity validity;
 	
+	/** exports available for download */
+	java.util.List<String> availableExports = null;
+	
 	 /**
      * Generate the unique cache key.
      *
@@ -128,9 +140,16 @@
             return "0";
         }
                 
-    	String key;
+        String key;
         if (context.getCurrentUser() != null)
-            key = context.getCurrentUser().getEmail();
+        {
+        	key = context.getCurrentUser().getEmail();
+        	if(availableExports!=null && availableExports.size()>0){
+        		for(String fileName:availableExports){
+        			key+= ":"+fileName;
+        		}
+        	}
+        }
         else
         	key = "anonymous";
         
@@ -176,6 +195,20 @@
     	return this.validity;
     }
 	
+    
+    public void setup(SourceResolver resolver, Map objectModel, String src, Parameters parameters) throws ProcessingException, SAXException, IOException {
+    	super.setup(resolver, objectModel, src, parameters);
+    	try{
+    		availableExports = ItemExport.getExportsAvailable(context.getCurrentUser());
+    	}
+    	catch (Exception e) {
+    		// nothing to do
+    	}
+    }
+    
+    
+    
+    
     public void addOptions(Options options) throws SAXException, WingException,
             UIException, SQLException, IOException, AuthorizeException
     {
@@ -183,10 +216,16 @@
     	 * even if they are never used 
     	 */
         options.addList("browse");
-        options.addList("account");
+        List account = options.addList("account");
         List context = options.addList("context");
         List admin = options.addList("administrative");
         
+        // My Account options
+        if(availableExports!=null && availableExports.size()>0){
+        	account.addItem().addXref(contextPath+"/admin/export", T_account_export);
+        }
+        
+        
         // Context Administrative options
         DSpaceObject dso = HandleUtil.obtainHandle(objectModel);
     	if (dso instanceof Item)
@@ -197,6 +236,7 @@
     		{
             	context.setHead(T_context_head);
             	context.addItem().addXref(contextPath+"/admin/item?itemID="+item.getID(), T_context_edit_item);
+            	context.addItem().addXref(contextPath+"/admin/export?itemID="+item.getID(), T_context_export_item );
     		}
     	}
     	else if (dso instanceof Collection)
@@ -209,7 +249,8 @@
             {
             	context.setHead(T_context_head);
             	context.addItemXref(contextPath+"/admin/collection?collectionID=" + collection.getID(), T_context_edit_collection);            	
-            	context.addItemXref(contextPath+"/admin/mapper?collectionID="+collection.getID(), T_context_item_mapper);            	
+            	context.addItemXref(contextPath+"/admin/mapper?collectionID="+collection.getID(), T_context_item_mapper); 
+            	context.addItem().addXref(contextPath+"/admin/export?collectionID="+collection.getID(), T_context_export_collection );
             }
     	}
     	else if (dso instanceof Community)
@@ -220,7 +261,8 @@
             if (community.canEditBoolean())
             {
             	context.setHead(T_context_head);
-            	context.addItemXref(contextPath+"/admin/community?communityID=" + community.getID(), T_context_edit_community);            	
+            	context.addItemXref(contextPath+"/admin/community?communityID=" + community.getID(), T_context_edit_community); 
+            	context.addItem().addXref(contextPath+"/admin/export?communityID="+community.getID(), T_context_export_community );
             }
             
             // can they add to this community?

Modified: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceCocoonServlet.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceCocoonServlet.java	2008-06-24 21:06:12 UTC (rev 2967)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceCocoonServlet.java	2008-06-24 21:08:28 UTC (rev 2968)
@@ -223,7 +223,13 @@
         finally
         {
             // Ensure that the current context is removed from ThreadLocal
-            ContextMap.removeCurrentContext();
+        	try {
+        		ContextMap.removeCurrentContext();
+        	} 
+        	catch (NoSuchMethodError nsme)
+        	{
+        		// just ignore this, it means we're using an out of date logging library.
+        	}
         }
     }
     

Added: branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/ItemExportDownloadReader.java
===================================================================
--- branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/ItemExportDownloadReader.java	                        (rev 0)
+++ branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/ItemExportDownloadReader.java	2008-06-24 21:08:28 UTC (rev 2968)
@@ -0,0 +1,299 @@
+/*
+ * ItemExportDownlaodReader.java
+ *
+ * Version: $Revision: 1.5 $
+ *
+ * Date: $Date: 2006/08/08 20:59:54 $
+ *
+ * Copyright (c) 2002, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+
+package org.dspace.app.xmlui.cocoon;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Response;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.environment.http.HttpEnvironment;
+import org.apache.cocoon.environment.http.HttpResponse;
+import org.apache.cocoon.reading.AbstractReader;
+import org.apache.cocoon.util.ByteRange;
+import org.dspace.app.itemexport.ItemExport;
+import org.dspace.app.xmlui.utils.AuthenticationUtil;
+import org.dspace.app.xmlui.utils.ContextUtil;
+import org.dspace.core.Context;
+import org.xml.sax.SAXException;
+
+/**
+ * @author Jay Paz
+ */
+
+public class ItemExportDownloadReader extends AbstractReader implements Recyclable
+{
+
+	/**
+     * Messages to be sent when the user is not authorized to view 
+     * a particular bitstream. They will be redirected to the login
+     * where this message will be displayed.
+     */
+	private final static String AUTH_REQUIRED_HEADER = "xmlui.ItemExportDownloadReader.auth_header";
+	private final static String AUTH_REQUIRED_MESSAGE = "xmlui.ItemExportDownloadReader.auth_message";
+	
+    /**
+     * How big of a buffer should we use when reading from the bitstream before
+     * writting to the HTTP response?
+     */
+    protected static final int BUFFER_SIZE = 8192;
+
+    /**
+     * When should a download expire in milliseconds. This should be set to
+     * some low value just to prevent someone hiting DSpace repeatily from
+     * killing the server. Note: 60000 milliseconds are in a second.
+     * 
+     * Format: minutes * seconds * milliseconds
+     */
+    protected static final int expires = 60 * 60 * 60000;
+
+    /** The Cocoon response */
+    protected Response response;
+
+    /** The Cocoon request */
+    protected Request request;
+
+    /** The bitstream file */
+    protected InputStream compressedExportInputStream;
+    
+    /** The compressed export's reported size */
+    protected long compressedExportSize;
+    
+    protected String compressedExportName;
+    /**
+     * Set up the export reader.
+     * 
+     * See the class description for information on configuration options.
+     */
+    public void setup(SourceResolver resolver, Map objectModel, String src,
+            Parameters par) throws ProcessingException, SAXException,
+            IOException
+    {
+        super.setup(resolver, objectModel, src, par);
+
+        try
+        {
+            this.request = ObjectModelHelper.getRequest(objectModel);
+            this.response = ObjectModelHelper.getResponse(objectModel);
+            Context context = ContextUtil.obtainContext(objectModel);
+
+            // Get our parameters that identify the bitstream
+            String fileName = par.getParameter("fileName", null);
+            
+                
+            // Is there a User logged in and does the user have access to read it?
+            if (!ItemExport.canDownload(context, fileName))
+            {
+            	if(this.request.getSession().getAttribute("dspace.current.user.id")!=null){
+            		// A user is logged in, but they are not authorized to read this bitstream, 
+            		// instead of asking them to login again we'll point them to a friendly error 
+            		// message that tells them the bitstream is restricted.
+            		String redictURL = request.getContextPath() + "/restricted-resource?name=" + fileName;
+
+            		HttpServletResponse httpResponse = (HttpServletResponse) 
+            		objectModel.get(HttpEnvironment.HTTP_RESPONSE_OBJECT);
+            		httpResponse.sendRedirect(redictURL);
+            		return;
+            	}
+            	else{
+
+            		// The user does not have read access to this bitstream. Inturrupt this current request
+            		// and then forward them to the login page so that they can be authenticated. Once that is
+            		// successfull they will request will be resumed.
+            		AuthenticationUtil.interruptRequest(objectModel, AUTH_REQUIRED_HEADER, AUTH_REQUIRED_MESSAGE, null);
+
+            		// Redirect
+            		String redictURL = request.getContextPath() + "/login";
+
+            		HttpServletResponse httpResponse = (HttpServletResponse) 
+            		objectModel.get(HttpEnvironment.HTTP_RESPONSE_OBJECT);
+            		httpResponse.sendRedirect(redictURL);
+            		return;
+            	}
+            }
+                
+                
+            // Success, bitstream found and the user has access to read it.
+            // Store these for later retreval:
+            this.compressedExportInputStream = ItemExport.getExportDownloadInputStream(fileName, context.getCurrentUser());
+            this.compressedExportSize = ItemExport.getExportFileSize(fileName);
+            this.compressedExportName = fileName;
+        }
+        catch (Exception e)
+        {
+            throw new ProcessingException("Unable to read bitstream.",e);
+        } 
+    }
+
+    
+    /**
+	 * Write the actual data out to the response.
+	 * 
+	 * Some implementation notes,
+	 * 
+	 * 1) We set a short expires time just in the hopes of preventing someone
+	 * from overloading the server by clicking reload a bunch of times. I
+	 * realize that this is nowhere near 100% effective but it may help in some
+	 * cases and shouldn't hurt anything.
+	 * 
+	 */
+    public void generate() throws IOException, SAXException,
+            ProcessingException
+    {
+    	if (this.compressedExportInputStream == null)
+	    	return;
+    	
+        byte[] buffer = new byte[BUFFER_SIZE];
+        int length = -1;
+
+        response.setDateHeader("Expires", System.currentTimeMillis()
+                + expires);
+        response.setHeader("Content-disposition","attachement; filename=" + this.compressedExportName );
+        // Turn off partial downloads, they cause problems
+        // and are only rarely used. Specifically some windows pdf
+        // viewers are incapable of handling this request. By
+        // uncommenting the following two lines you will turn this feature back on.
+        // response.setHeader("Accept-Ranges", "bytes");
+        // String ranges = request.getHeader("Range");
+        String ranges = null;
+        
+
+        ByteRange byteRange = null;
+        if (ranges != null)
+        {
+            try
+            {
+                ranges = ranges.substring(ranges.indexOf('=') + 1);
+                byteRange = new ByteRange(ranges);
+            }
+            catch (NumberFormatException e)
+            {
+                byteRange = null;
+                if (response instanceof HttpResponse)
+                {
+                    // Respond with status 416 (Request range not
+                    // satisfiable)
+                    ((HttpResponse) response).setStatus(416);
+                }
+            }
+        }
+
+        if (byteRange != null)
+        {
+            String entityLength;
+            String entityRange;
+            if (this.compressedExportSize != -1)
+            {

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2995
          http://dspace.svn.sourceforge.net/dspace/?rev=2995&view=rev
Author:   grahamtriggs
Date:     2008-07-15 01:19:31 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
Fix #1714851 - set eperson.subscription.onlynew in dspace.cfg to only include items that are new to the repository, otherwise any modified items will be included

Modified Paths:
--------------
    branches/dspace-1_5_x/dspace/config/dspace.cfg
    branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/eperson/Subscribe.java

Modified: branches/dspace-1_5_x/dspace/config/dspace.cfg
===================================================================
--- branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-07-10 08:14:53 UTC (rev 2994)
+++ branches/dspace-1_5_x/dspace/config/dspace.cfg	2008-07-15 08:19:31 UTC (rev 2995)
@@ -595,10 +595,11 @@
 org.dspace.app.itemexport.max.size = 200
 
 
+# For backwards compatability, the subscription emails by default include any modified items
+# uncomment the following entry for only new items to be emailed
+# eperson.subscription.onlynew = true
 
 
-
-
 #---------------------------------------------------------------#
 #--------------JSPUI & XMLUI CONFIGURATIONS---------------------#
 #---------------------------------------------------------------#

Modified: branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/eperson/Subscribe.java
===================================================================
--- branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/eperson/Subscribe.java	2008-07-10 08:14:53 UTC (rev 2994)
+++ branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/eperson/Subscribe.java	2008-07-15 08:19:31 UTC (rev 2995)
@@ -42,8 +42,10 @@
 import java.io.IOException;
 import java.sql.SQLException;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -362,6 +364,11 @@
                         false, // But not containers
                         false); // Or withdrawals
     
+                if (ConfigurationManager.getBooleanProperty("eperson.subscription.onlynew", false))
+                {
+                    itemInfos = filterOutModified(itemInfos);
+                }
+
                 // Only add to buffer if there are new items
                 if (itemInfos.size() > 0)
                 {
@@ -466,4 +473,32 @@
             }
         }
     }
+
+    private static List filterOutModified(List completeList)
+    {
+        log.info("Filtering out all modified to leave new items list size="+completeList.size());
+        List filteredList = new ArrayList();
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        for (Iterator iter = completeList.iterator(); iter.hasNext();)
+        {
+            HarvestedItemInfo infoObject = (HarvestedItemInfo) iter.next();
+            DCValue[] dateAccArr = infoObject.item.getDC("date", "accessioned", null);
+            if (dateAccArr != null && dateAccArr.length > 0 && dateAccArr[0].value != null)
+            {
+                String lastModded = sdf.format(infoObject.datestamp);
+
+                // if it's never been changed
+                if (dateAccArr[0].value.startsWith(lastModded))
+                    filteredList.add(infoObject);
+            }
+            else
+            {
+                filteredList.add(infoObject);
+            }
+        }
+
+        return filteredList;
+    }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.