DSpace

Revision: 3099
          http://dspace.svn.sourceforge.net/dspace/?rev=3099&view=rev
Author:   grahamtriggs
Date:     2008-09-09 10:25:48 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
Add JSPUI compatible log messages to XMLUI transformers

Modified Paths:
--------------
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/AbstractSearch.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ItemViewer.java

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/dspace-1_5_x:2946

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/AbstractSearch.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/AbstractSearch.java	2008-09-09 04:06:22 UTC (rev 3098)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/AbstractSearch.java	2008-09-09 10:25:48 UTC (rev 3099)
@@ -43,6 +43,7 @@
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.util.HashUtil;
 import org.apache.excalibur.source.SourceValidity;
+import org.apache.log4j.Logger;
 import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
 import org.dspace.app.xmlui.utils.ContextUtil;
 import org.dspace.app.xmlui.utils.DSpaceValidity;
@@ -66,6 +67,8 @@
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.dspace.core.LogManager;
+import org.dspace.core.Constants;
 import org.dspace.search.DSQuery;
 import org.dspace.search.QueryArgs;
 import org.dspace.search.QueryResults;
@@ -89,35 +92,37 @@
  * This is an abstract search page. It is a collection of search methods that
  * are common between diffrent search implementation. An implementer must
  * implement at least three methods: addBody(), getQuery(), and generateURL().
- * 
+ *
  * See the two implementors: SimpleSearch and AdvancedSearch.
- * 
+ *
  * @author Scott Phillips
  */
 public abstract class AbstractSearch extends AbstractDSpaceTransformer
 {
+    private static final Logger log = Logger.getLogger(AbstractSearch.class);
+
 	/** Language strings */
-    private static final Message T_result_query = 
+    private static final Message T_result_query =
         message("xmlui.ArtifactBrowser.AbstractSearch.result_query");
-    
+
     private static final Message T_head1_community =
         message("xmlui.ArtifactBrowser.AbstractSearch.head1_community");
-    
-    private static final Message T_head1_collection =  
+
+    private static final Message T_head1_collection =
         message("xmlui.ArtifactBrowser.AbstractSearch.head1_collection");
-    
-    private static final Message T_head1_none =  
+
+    private static final Message T_head1_none =
         message("xmlui.ArtifactBrowser.AbstractSearch.head1_none");
-    
+
     private static final Message T_head2 =
         message("xmlui.ArtifactBrowser.AbstractSearch.head2");
-    
+
     private static final Message T_head3 =
         message("xmlui.ArtifactBrowser.AbstractSearch.head3");
-    
+
     private static final Message T_no_results =
         message("xmlui.ArtifactBrowser.AbstractSearch.no_results");
-    
+
     private static final Message T_all_of_dspace =
         message("xmlui.ArtifactBrowser.AbstractSearch.all_of_dspace");
 
@@ -131,26 +136,29 @@
     private final static Message T_order_desc = message("xmlui.ArtifactBrowser.AbstractSearch.order.desc");
 
     private final static Message T_rpp = message("xmlui.ArtifactBrowser.AbstractSearch.rpp");
-    
+
     /** The options for results per page */
     private static final int[] RESULTS_PER_PAGE_PROGRESSION = {5,10,20,40,60,80,100};
-    
+
+    /** Cached query arguments */
+    private QueryArgs queryArgs;
+
     /** Cached query results */
     private QueryResults queryResults;
-    
+
     /** Cached validity object */
     private SourceValidity validity;
-    
+
     /**
      * Generate the unique caching key.
      * This key must be unique inside the space of this component.
      */
     public Serializable getKey()
     {
-        try 
+        try
         {
             String key = "";
-            
+
             // Page Parameter
             Request request = ObjectModelHelper.getRequest(objectModel);
             key += "-" + getParameterPage();
@@ -163,7 +171,7 @@
             DSpaceObject scope = getScope();
             if (scope != null)
                 key += "-" + IdentifierService.getCanonicalForm(scope);
-            
+
             // The actualy search query.
             key += "-" + getQuery();
 
@@ -178,7 +186,7 @@
 
     /**
      * Generate the cache validity object.
-     * 
+     *
      * This validity object should never "over cache" because it will
      * perform the search, and serialize the results using the
      * DSpaceValidity object.
@@ -190,15 +198,15 @@
 	        try
 	        {
 	            DSpaceValidity validity = new DSpaceValidity();
-	            
+
 	            DSpaceObject scope = getScope();
 	            validity.add(scope);
-	            
+
 	            performSearch();
 
                 ExternalIdentifierDAO dao =
                     ExternalIdentifierDAOFactory.getInstance(context);
-	            
+
 	            @SuppressWarnings("unchecked") // This cast is correct
 	            java.util.List<String> uris = queryResults.getHitURIs();
 //	            java.util.List<String> handles = queryResults.getHitHandles();
@@ -209,9 +217,13 @@
                         DSpaceObject resultDSO = (DSpaceObject) IdentifierService.getResource(context, ri);
                         validity.add(resultDSO);
 	            }
-	            
+
 	            this.validity = validity.complete();
-	        }
+
+                // add log message that we are viewing the item
+                // done here, as the serialization may not occur if the cache is valid
+                logSearch();
+            }
 	        catch (Exception e)
 	        {
 	            // Just ignore all errors and return an invalid cache.
@@ -219,8 +231,8 @@
     	}
     	return this.validity;
     }
-    
-    
+
+
     /**
      * Build the resulting search DRI document.
      */
@@ -228,10 +240,10 @@
             UIException, SQLException, IOException, AuthorizeException;
 
     /**
-     * 
+     *
      * Attach a division to the given search division named "search-results"
      * which contains results for this search query.
-     * 
+     *
      * @param search
      *            The search division to contain the search-results division.
      */
@@ -362,21 +374,21 @@
             throw new RuntimeException(e);
         }
     }
-    
+
     /**
      * Add options to the search scope field. This field determines in what
      * communities or collections to search for the query.
-     * 
+     *
      * The scope list will depend upon the current search scope. There are three
      * cases:
-     * 
+     *
      * No current scope: All top level communities are listed.
-     * 
+     *
      * The current scope is a community: All collections contained within the
      * community are listed.
-     * 
+     *
      * The current scope is a collection: All parent communities are listed.
-     * 
+     *
      * @param scope
      *            The current scope field.
      */
@@ -416,7 +428,7 @@
             scope.addOption("/",T_all_of_dspace);
             scope.addOption(IdentifierService.getCanonicalForm(collection),collection.getMetadata("name"));
             scope.setOptionSelected(IdentifierService.getCanonicalForm(collection));
-            
+
             Community[] communities = collection.getCommunities()[0]
                     .getAllParents();
             for (Community community : communities)
@@ -429,49 +441,49 @@
     /**
      * Query DSpace for a list of all items / collections / or communities that
      * match the given search query.
-     * 
+     *
      * @return The associated query results.
      */
     protected void performSearch() throws SQLException, IOException, UIException
     {
         if (queryResults != null)
             return;
-        
+
         Context context = ContextUtil.obtainContext(objectModel);
         String query = getQuery();
         DSpaceObject scope = getScope();
         int page = getParameterPage();
 
-        QueryArgs qArgs = new QueryArgs();
-        qArgs.setPageSize(getParameterRpp());
+        queryArgs = new QueryArgs();
+        queryArgs.setPageSize(getParameterRpp());
         try
         {
-            qArgs.setSortOption(SortOption.getSortOption(getParameterSortBy()));
+            queryArgs.setSortOption(SortOption.getSortOption(getParameterSortBy()));
         }
         catch (SortException se)
         {
         }
-        
-        qArgs.setSortOrder(getParameterOrder());
 
-        qArgs.setQuery(query);
+        queryArgs.setSortOrder(getParameterOrder());
+
+        queryArgs.setQuery(query);
         if (page > 1)
-            qArgs.setStart((Integer.valueOf(page) - 1) * qArgs.getPageSize());
+            queryArgs.setStart((Integer.valueOf(page) - 1) * queryArgs.getPageSize());
         else
-            qArgs.setStart(0);
+            queryArgs.setStart(0);
 
         QueryResults qResults = null;
         if (scope instanceof Community)
         {
-            qResults = DSQuery.doQuery(context, qArgs, (Community) scope);
+            qResults = DSQuery.doQuery(context, queryArgs, (Community) scope);
         }
         else if (scope instanceof Collection)
         {
-            qResults = DSQuery.doQuery(context, qArgs, (Collection) scope);
+            qResults = DSQuery.doQuery(context, queryArgs, (Collection) scope);
         }
         else
         {
-            qResults = DSQuery.doQuery(context, qArgs);
+            qResults = DSQuery.doQuery(context, queryArgs);
         }
 
         this.queryResults = qResults;
@@ -484,7 +496,7 @@
      *
      * FIXME: This depends on the "handle" string being of the form "hdl:12/34"
      * rather than just "12/34".
-     * 
+     *
      * @return The current scope.
      */
     protected DSpaceObject getScope() throws SQLException
@@ -577,25 +589,25 @@
 
     /**
      * Determine if the scope of the search should fixed or is changeable by the
-     * user. 
-     * 
-     * The search scope when preformed by url, i.e. they are at the url handle/xxxx/xx/search 
+     * user.
+     *
+     * The search scope when preformed by url, i.e. they are at the url handle/xxxx/xx/search
      * then it is fixed. However at the global level the search is variable.
-     * 
+     *
      * @return true if the scope is variable, false otherwise.
      */
     protected boolean variableScope() throws SQLException
     {
         if (URIUtil.resolve(objectModel) == null)
             return true;
-        else 
+        else
             return false;
     }
-    
+
     /**
      * Extract the query string. Under most implementations this will be derived
      * from the url parameters.
-     * 
+     *
      * @return The query string.
      */
     abstract protected String getQuery() throws UIException;
@@ -603,18 +615,18 @@
     /**
      * Generate a url to the given search implementation with the associated
      * parameters included.
-     * 
+     *
      * @param parameters
      * @return The post URL
      */
     abstract protected String generateURL(Map<String, String> parameters)
             throws UIException;
 
-    
+
     /**
      * Recycle
      */
-    public void recycle() 
+    public void recycle()
     {
         this.queryResults = null;
         this.validity = null;
@@ -681,4 +693,48 @@
         //    }
         //}
     }
+
+    protected void logSearch()
+    {
+        int countCommunities = 0;
+        int countCollections = 0;
+        int countItems       = 0;
+
+        for (Object type : queryResults.getHitTypes())
+        {
+            if (type instanceof Integer)
+            {
+                switch (((Integer)type).intValue())
+                {
+                case Constants.ITEM:       countItems++;        break;
+                case Constants.COLLECTION: countCollections++;  break;
+                case Constants.COMMUNITY:  countCommunities++;  break;
+                }
+            }
+        }
+
+        String logInfo = "";
+
+        try
+        {
+            DSpaceObject dsoScope = getScope();
+
+            if (dsoScope instanceof Collection)
+            {
+                logInfo = "collection_id=" + dsoScope.getID() + ",";
+            }
+            else if (dsoScope instanceof Community)
+            {
+                logInfo = "community_id=" + dsoScope.getID() + ",";
+            }
+        }
+        catch (SQLException sqle)
+        {
+            // Ignore, as we are only trying to get the scope to add detail to the log message
+        }
+
+        log.info(LogManager.getHeader(context, "search", logInfo + "query=\""
+                + queryArgs.getQuery() + "\",results=(" + countCommunities + ","
+                + countCollections + "," + countItems + ")"));
+    }
 }

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ItemViewer.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ItemViewer.java	2008-09-09 04:06:22 UTC (rev 3098)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ItemViewer.java	2008-09-09 10:25:48 UTC (rev 3099)
@@ -44,6 +44,7 @@
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.util.HashUtil;
 import org.apache.excalibur.source.SourceValidity;
+import org.apache.log4j.Logger;
 import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
 import org.dspace.app.xmlui.utils.DSpaceValidity;
 import org.dspace.app.xmlui.utils.HandleUtil;
@@ -61,6 +62,7 @@
 import org.dspace.content.DCValue;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
+import org.dspace.core.LogManager;
 import org.dspace.uri.IdentifierService;
 import org.xml.sax.SAXException;
 
@@ -71,30 +73,32 @@
 
 /**
  * Display a single item.
- * 
+ *
  * @author Scott Phillips
  */
 public class ItemViewer extends AbstractDSpaceTransformer implements CacheableProcessingComponent
 {
+    private static final Logger log = Logger.getLogger(ItemViewer.class);
+
     /** Language strings */
     private static final Message T_dspace_home =
         message("xmlui.general.dspace_home");
-    
+
     private static final Message T_trail =
         message("xmlui.ArtifactBrowser.ItemViewer.trail");
-    
+
     private static final Message T_show_simple =
         message("xmlui.ArtifactBrowser.ItemViewer.show_simple");
-    
+
     private static final Message T_show_full =
         message("xmlui.ArtifactBrowser.ItemViewer.show_full");
-    
+
     private static final Message T_head_parent_collections =
         message("xmlui.ArtifactBrowser.ItemViewer.head_parent_collections");
-    
+
 	/** Cached validity object */
 	private SourceValidity validity = null;
-	
+
     /**
      * Generate the unique caching key.
      * This key must be unique inside the space of this component.
@@ -102,12 +106,12 @@
     public Serializable getKey() {
         try {
             DSpaceObject dso = URIUtil.resolve(objectModel);
-            
+
             if (dso == null)
                 return "0"; // no item, something is wrong.
-            
+
             return HashUtil.hash(IdentifierService.getCanonicalForm(dso) + "full:" + showFullItem(objectModel));
-        } 
+        }
         catch (SQLException sqle)
         {
             // Ignore all errors and just return that the component is not cachable.
@@ -117,21 +121,25 @@
 
     /**
      * Generate the cache validity object.
-     * 
-     * The validity object will include the item being viewed, 
+     *
+     * The validity object will include the item being viewed,
      * along with all bundles & bitstreams.
      */
-    public SourceValidity getValidity() 
+    public SourceValidity getValidity()
     {
     	if (this.validity == null)
     	{
 	        try {
 	            DSpaceObject dso = URIUtil.resolve(objectModel);
-	            
+
 	            DSpaceValidity validity = new DSpaceValidity();
 	            validity.add(dso);
 	            this.validity =  validity.complete();
-	        } 
+
+                // add log message that we are viewing the item
+                // done here, as the serialization may not occur if the cache is valid
+                log.info(LogManager.getHeader(context, "view_item", "handle=" + dso.getHandle()));
+	        }
 	        catch (Exception e)
 	        {
 	            // Ignore all errors and just invalidate the cache.
@@ -139,8 +147,8 @@
     	}
     	return this.validity;
     }
-    
-    
+
+
     /**
      * Add the item's title and trail links to the page's metadata.
      */
@@ -199,7 +207,7 @@
             String link = IdentifierService.getURL(item).toString() + "?show=full";
             showfullPara.addXref(link).addContent(T_show_full);
         }
-        
+
         ReferenceSet referenceSet;
         if (showFullItem(objectModel))
         {
@@ -215,13 +223,13 @@
         // Refrence the actual Item
         ReferenceSet appearsInclude = referenceSet.addReference(item).addReferenceSet(ReferenceSet.TYPE_DETAIL_LIST,null,"hierarchy");
         appearsInclude.setHead(T_head_parent_collections);
-        
+
         // Reference all collections the item appears in.
         for (Collection collection : item.getCollections())
         {
             appearsInclude.addReference(collection);
         }
-        
+
         showfullPara = division.addPara(null,"item-view-toggle item-view-toggle-bottom");
 
         if (showFullItem(objectModel))


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

Revision: 3100
          http://dspace.svn.sourceforge.net/dspace/?rev=3100&view=rev
Author:   grahamtriggs
Date:     2008-09-09 10:54:18 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
integrated from branch1.5
Fixed incorrect downloading of bitstream on withdrawn item
Fixed caching of browse pages
Added addtional logging (JSP compatible)

Modified Paths:
--------------
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/AbstractSearch.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityBrowser.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ItemViewer.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/EditProfile.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/LicenseStep.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/workflow/RejectTaskStep.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/workflow/UnclaimTasksAction.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dspace-1_5_x:2946
   + /branches/dspace-1_5_x:2946,2948

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/AbstractSearch.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/AbstractSearch.java	2008-09-09 10:25:48 UTC (rev 3099)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/AbstractSearch.java	2008-09-09 10:54:18 UTC (rev 3100)
@@ -219,15 +219,15 @@
 	            }
 
 	            this.validity = validity.complete();
-
-                // add log message that we are viewing the item
-                // done here, as the serialization may not occur if the cache is valid
-                logSearch();
             }
 	        catch (Exception e)
 	        {
 	            // Just ignore all errors and return an invalid cache.
 	        }
+
+            // add log message that we are viewing the item
+            // done here, as the serialization may not occur if the cache is valid
+            logSearch();
     	}
     	return this.validity;
     }

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java	2008-09-09 10:25:48 UTC (rev 3099)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java	2008-09-09 10:54:18 UTC (rev 3100)
@@ -73,6 +73,7 @@
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.core.ConfigurationManager;
+import org.dspace.core.LogManager;
 import org.xml.sax.SAXException;
 
 /**
@@ -83,7 +84,7 @@
  */
 public class CollectionViewer extends AbstractDSpaceTransformer implements CacheableProcessingComponent
 {
-    private static final Logger log = Logger.getLogger(DSpaceFeedGenerator.class);
+    private static final Logger log = Logger.getLogger(CollectionViewer.class);
 
     /** Language Strings */
     private static final Message T_dspace_home =
@@ -159,6 +160,7 @@
     {
     	if (this.validity == null)
     	{
+            Collection collection = null;
 	        try
 	        {
 	            DSpaceObject dso = URIUtil.resolve(objectModel);
@@ -169,7 +171,7 @@
 	            if (!(dso instanceof Collection))
 	                return null;
 	
-	            Collection collection = (Collection) dso;
+	            collection = (Collection) dso;
 	
 	            DSpaceValidity validity = new DSpaceValidity();
 	            
@@ -188,6 +190,8 @@
 	        {
 	            // Just ignore all errors and return an invalid cache.
 	        }
+
+            log.info(LogManager.getHeader(context, "view_collection", "collection_id=" + (collection == null ? "" : collection.getID())));
     	}
     	return this.validity;
     }

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityBrowser.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityBrowser.java	2008-09-09 10:25:48 UTC (rev 3099)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityBrowser.java	2008-09-09 10:54:18 UTC (rev 3100)
@@ -45,6 +45,7 @@
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.util.HashUtil;
 import org.apache.excalibur.source.SourceValidity;
+import org.apache.log4j.Logger;
 import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
 import org.dspace.app.xmlui.utils.DSpaceValidity;
 import org.dspace.app.xmlui.utils.UIException;
@@ -62,6 +63,7 @@
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
+import org.dspace.core.LogManager;
 import org.dspace.uri.IdentifierService;
 import org.xml.sax.SAXException;
 
@@ -74,32 +76,34 @@
 
 /**
  * Display a list of Communities and collections.
- * 
+ *
  * This item may be configured so that it will only display to a specific depth,
  * and may include or exclude collections from the tree.
- * 
+ *
  * The configuration option available: <depth exclude-collections="true">999</depth>
- * 
+ *
  * @author Scott Phillips
  */
 public class CommunityBrowser extends AbstractDSpaceTransformer implements CacheableProcessingComponent
 {
+    private static Logger log = Logger.getLogger(CommunityBrowser.class);
+
     /** Language Strings */
     public static final Message T_dspace_home =
         message("xmlui.general.dspace_home");
-    
+
     public static final Message T_title =
         message("xmlui.ArtifactBrowser.CommunityBrowser.title");
-    
+
     public static final Message T_trail =
         message("xmlui.ArtifactBrowser.CommunityBrowser.trail");
-    
+
     public static final Message T_head =
         message("xmlui.ArtifactBrowser.CommunityBrowser.head");
-    
+
     public static final Message T_select =
         message("xmlui.ArtifactBrowser.CommunityBrowser.select");
-    
+
     /** Should collections be excluded from the list */
     protected boolean excludeCollections = false;
 
@@ -111,10 +115,10 @@
 
     /** Cached version the community / collection hierarch */
     protected TreeNode root;
-    
+
     /** cached validity object */
     private SourceValidity validity;
-    
+
     /**
      * Set the component up, pulling any configuration values from the sitemap
      * parameters.
@@ -142,8 +146,8 @@
 
     /**
      * Generate the cache validity object.
-     * 
-     * The validity object will include a list of all communities 
+     *
+     * The validity object will include a list of all communities
      * & collection being browsed along with there logo bitstreams.
      */
     public SourceValidity getValidity()
@@ -152,37 +156,38 @@
     	{
 	        try {
 	            DSpaceValidity validity = new DSpaceValidity();
-	            
+
 	            TreeNode root = buildTree(Community.findAllTop(context));
-	            
+
 	            Stack<TreeNode> stack = new Stack<TreeNode>();
 	            stack.push(root);
-	            
+
 	            int objectCount = 0;
 	            while (!stack.empty())
 	            {
 	            	objectCount++;
 	                TreeNode node = stack.pop();
-	                
+
 	                validity.add(node.getDSO());
-	                
+
 	                for (TreeNode child : node.getChildren())
 	                {
 	                    stack.push(child);
 	                }
 	            }
-	            
+
 	            // Check if we are configured to assume validity.
 	            String assumeCacheValidity = ConfigurationManager.getProperty("xmlui.community-list.cache");
 	            if (assumeCacheValidity != null)
 	            	validity.setAssumedValidityDelay(assumeCacheValidity);
-	            
+
 	            this.validity = validity.complete();
-	        } 
-	        catch (SQLException sqle) 
+	        }
+	        catch (SQLException sqle)
 	        {
 	            // ignore all errors and return an invalid cache.
 	        }
+            log.info(LogManager.getHeader(context, "view_community_list", ""));
     	}
     	return this.validity;
     }
@@ -213,101 +218,101 @@
         division.addPara(T_select);
 
         TreeNode root = buildTree(Community.findAllTop(context));
-        
+
         boolean full = ConfigurationManager.getBooleanProperty("xmlui.community-list.render.full", true);
-        
+
         if (full)
         {
 	        ReferenceSet referenceSet = division.addReferenceSet("community-browser",
 	                ReferenceSet.TYPE_SUMMARY_LIST,null,"hierarchy");
-	        
+
 	        ArrayList<TreeNode> rootNodes = root.getChildrenOfType(Constants.COMMUNITY);
-	        
+
 	        for (TreeNode node : rootNodes)
 	        {
-	            buildReferenceSet(referenceSet,node);   
+	            buildReferenceSet(referenceSet,node);
 	        }
         }
         else
         {
         	List list = division.addList("comunity-browser");
-        	
+
         	ArrayList<TreeNode> rootNodes = root.getChildrenOfType(Constants.COMMUNITY);
- 	        
+
  	        for (TreeNode node : rootNodes)
  	        {
- 	            buildList(list,node);   
+ 	            buildList(list,node);
  	        }
-        	
+
         }
-    } 
-    
+    }
+
     /**
      * Recursively build an includeset of the community / collection hierarcher based upon
      * the given NodeTree.
-     * 
+     *
      * @param referenceSet The include set
      * @param node The current node of the hierarch.
      */
     public void buildReferenceSet(ReferenceSet referenceSet, TreeNode node) throws WingException
     {
         DSpaceObject dso = node.getDSO();
-        
+
         Reference objectInclude = referenceSet.addReference(dso);
-        
+
         // Add all the sub-collections;
         ArrayList<TreeNode> collectionNodes = node.getChildrenOfType(Constants.COLLECTION);
         if (collectionNodes != null && collectionNodes.size() > 0)
         {
             ReferenceSet collectionSet = objectInclude.addReferenceSet(ReferenceSet.TYPE_SUMMARY_LIST);
-            
+
             for (TreeNode collectionNode : collectionNodes)
             {
                 collectionSet.addReference(collectionNode.getDSO());
             }
         }
-        
+
         // Add all the sub-communities
         ArrayList<TreeNode> communityNodes = node.getChildrenOfType(Constants.COMMUNITY);
         if (communityNodes != null && communityNodes.size() > 0)
         {
             ReferenceSet communitySet = objectInclude.addReferenceSet(ReferenceSet.TYPE_SUMMARY_LIST);
-            
+
             for (TreeNode communityNode : communityNodes)
             {
                 buildReferenceSet(communitySet,communityNode);
             }
         }
     }
-    
+
     /**
      * Recursively build a list of the community / collection hierarchery based upon
      * the given NodeTree.
-     * 
+     *
      * @param List The parent list
      * @param node The current node of the hierarch.
      */
     public void buildList(List list, TreeNode node) throws WingException
     {
         DSpaceObject dso = node.getDSO();
-        
+
         String name = null;
         if (dso instanceof Community)
         	name = ((Community) dso).getMetadata("name");
         else if (dso instanceof Collection)
         	name = ((Collection) dso).getMetadata("name");
-        
+
         String url = IdentifierService.getURL(dso).toString();
         list.addItem().addHighlight("bold").addXref(url, name);
-        
+
         List subList = null;
-        
+
         // Add all the sub-collections;
         ArrayList<TreeNode> collectionNodes = node.getChildrenOfType(Constants.COLLECTION);
         if (collectionNodes != null && collectionNodes.size() > 0)
         {
         	subList = list.addList("sub-list-"+dso.getID());
-        
+
             for (TreeNode collectionNode : collectionNodes)
             {
                 String collectionName = ((Collection) collectionNode.getDSO()).getMetadata("name");

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java	2008-09-09 10:25:48 UTC (rev 3099)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityViewer.java	2008-09-09 10:54:18 UTC (rev 3100)
@@ -75,6 +75,7 @@
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.core.ConfigurationManager;
+import org.dspace.core.LogManager;
 import org.xml.sax.SAXException;
 
 /**
@@ -86,7 +87,7 @@
  */
 public class CommunityViewer extends AbstractDSpaceTransformer implements CacheableProcessingComponent
 {
-    private static final Logger log = Logger.getLogger(DSpaceFeedGenerator.class);
+    private static final Logger log = Logger.getLogger(CommunityViewer.class);
 	
     /** Language Strings */
     private static final Message T_dspace_home =
@@ -163,8 +164,9 @@
      */
     public SourceValidity getValidity() 
     {
-    	if (this.validity == null)
+        if (this.validity == null)
     	{
+            Community community = null;
 	        try {
 	            DSpaceObject dso = URIUtil.resolve(objectModel);
 	            
@@ -174,7 +176,7 @@
 	            if (!(dso instanceof Community))
 	                return null;
 	            
-	            Community community = (Community) dso;
+	            community = (Community) dso;
 	            
 	            DSpaceValidity validity = new DSpaceValidity();
 	            validity.add(community);
@@ -204,6 +206,8 @@
 	        {
 	            // Ignore all errors and invalidate the cache.
 	        }
+
+            log.info(LogManager.getHeader(context, "view_community", "community_id=" + (community == null ? "" : community.getID())));
     	}
         return this.validity;
     }

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java	2008-09-09 10:25:48 UTC (rev 3099)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java	2008-09-09 10:54:18 UTC (rev 3100)
@@ -53,6 +53,7 @@
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.util.HashUtil;
 import org.apache.excalibur.source.SourceValidity;
+import org.apache.log4j.Logger;
 import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
 import org.dspace.app.xmlui.utils.ContextUtil;
 import org.dspace.app.xmlui.utils.DSpaceValidity;
@@ -87,6 +88,7 @@
 import org.dspace.content.Item;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.core.LogManager;
 import org.dspace.uri.IdentifierService;
 import org.xml.sax.SAXException;
 
@@ -94,12 +96,14 @@
  * Implements all the browse functionality (browse by title, subject, authors,
  * etc.) The types of browse available are configurable by the implementor. See
  * dspace.cfg and documentation for instructions on how to configure.
- * 
+ *
  * @author Graham Triggs
  */
 public class ConfigurableBrowse extends AbstractDSpaceTransformer implements
         CacheableProcessingComponent
 {
+    private final static Logger log = Logger.getLogger(ConfigurableBrowse.class);
+
     /**
      * Static Messages for common text
      */
@@ -152,7 +156,7 @@
 
     /** The options for results per page */
     private static final int[] RESULTS_PER_PAGE_PROGRESSION = {5,10,20,40,60,80,100};
-    
+
     /** Cached validity object */
     private SourceValidity validity;
 
@@ -169,14 +173,14 @@
         try
         {
             BrowseParams params = getUserParams();
-            
+
             String key = params.getKey();
-            
+
             if (key != null)
             {
                 DSpaceObject dso = URIUtil.resolve(objectModel);
                 if (dso != null)
-                    key += "-" + IdentifierService.getCanonicalForm(dso);            
+                    key += "-" + IdentifierService.getCanonicalForm(dso);
 
                 return HashUtil.hash(key);
             }
@@ -185,7 +189,7 @@
         {
             // Ignore all errors and just don't cache.
         }
-        
+
         return "0";
     }
 
@@ -200,9 +204,9 @@
 
                 if (dso != null)
                     validity.add(dso);
-                
+
                 BrowseInfo info = getBrowseInfo();
-                
+
                 // Are we browsing items, or unique metadata?
                 if (isItemBrowse(info))
                 {
@@ -220,14 +224,17 @@
                         validity.add(singleEntry);
                     }
                 }
+
+                this.validity =  validity.complete();
             }
             catch (Exception e)
             {
                 // Just ignore all errors and return an invalid cache.
             }
-            
+
+            log.info(LogManager.getHeader(context, "browse", this.validity.toString()));
         }
-        
+
         return this.validity;
     }
 
@@ -241,7 +248,7 @@
 
         // Get the name of the index
         String type = info.getBrowseIndex().getName();
-        
+
         pageMeta.addMetadata("title").addContent(getTitleMessage(info));
 
         DSpaceObject dso = URIUtil.resolve(objectModel);
@@ -271,7 +278,7 @@
 
         // Build the internal navigation (jump lists)
         addBrowseJumpNavigation(div, info, params);
-        
+
         // Build the sort and display controls
         addBrowseControls(div, info, params);
 
@@ -302,7 +309,7 @@
             // Create a table for the results
             Table singleTable = results.addTable("browse-by-" + type + "-results",
                     browseInfo.getResultCount() + 1, 1);
-            
+
             // Add the column heading
             singleTable.addRow(Row.ROLE_HEADER).addCell().addContent(
                     message("xmlui.ArtifactBrowser.ConfigurableBrowse." + type + ".column_heading"));
@@ -337,7 +344,7 @@
 
     /**
      * Makes the jump-list navigation for the results
-     * 
+     *
      * @param div
      * @param info
      * @param params
@@ -382,7 +389,7 @@
             year.addOption(false, "-1", T_choose_year);
             int currentYear = DCDate.getCurrent().getYear();
             int i = currentYear;
-            
+
             // Calculate where to move from 1, 5 to 10 year jumps
             int oneYearBreak = ((currentYear - ONE_YEAR_LIMIT) / 5) * 5;
             int fiveYearBreak = ((currentYear - FIVE_YEAR_LIMIT) / 10) * 10;
@@ -404,18 +411,18 @@
             jumpForm = jump.addPara();
             jumpForm.addContent(T_jump_year);
             jumpForm.addText("start_with").setHelp(T_jump_year_help);
-            
+
             jumpForm.addButton("submit").setValue(T_go);
         }
         else
         {
             // Create a clickable list of the alphabet
             List jumpList = jump.addList("jump-list", List.TYPE_SIMPLE, "alphabet");
-            
+
             Map<String, String> zeroQuery = new HashMap<String, String>(queryParams);
             zeroQuery.put(BrowseParams.STARTS_WITH, "0");
             jumpList.addItemXref(super.generateURL(BROWSE_URL_BASE, zeroQuery), "0-9");
-            
+
             for (char c = 'A'; c <= 'Z'; c++)
             {
                 Map<String, String> cQuery = new HashMap<String, String>(queryParams);
@@ -428,14 +435,14 @@
             Para jumpForm = jump.addPara();
             jumpForm.addContent(T_starts_with);
             jumpForm.addText(BrowseParams.STARTS_WITH).setHelp(T_starts_with_help);
-            
+
             jumpForm.addButton("submit").setValue(T_go);
         }
     }
 
     /**
      * Add the controls to changing sorting and display options.
-     * 
+     *
      * @param div
      * @param info
      * @param params
@@ -465,13 +472,13 @@
             {
                 // Create a drop down of the different sort columns available
                 Set<SortOption> sortOptions = SortOption.getSortOptions();
-                
+
                 // Only generate the list if we have multiple columns
                 if (sortOptions.size() > 1)
                 {
                     controlsForm.addContent(T_sort_by);
                     Select sortSelect = controlsForm.addSelect(BrowseParams.SORT_BY);
-    
+
                     for (SortOption so : sortOptions)
                     {
                         if (so.isVisible())
@@ -497,11 +504,11 @@
         // Create a control for the number of records to display
         controlsForm.addContent(T_rpp);
         Select rppSelect = controlsForm.addSelect(BrowseParams.RESULTS_PER_PAGE);
-        
+
         for (int i : RESULTS_PER_PAGE_PROGRESSION)
         {
             rppSelect.addOption((i == info.getResultsPerPage()), i, Integer.toString(i));
- 
+
         }
 
         // Create a control for the number of authors per item to display
@@ -526,7 +533,7 @@
 
     /**
      * The URL query string of of the previous page.
-     * 
+     *
      * Note: the query string does not start with a "?" or "&" those need to be
      * added as appropriate by the caller.
      */
@@ -552,7 +559,7 @@
 
     /**
      * The URL query string of of the next page.
-     * 
+     *
      * Note: the query string does not start with a "?" or "&" those need to be
      * added as appropriate by the caller.
      */
@@ -577,7 +584,7 @@
 
     /**
      * Get the query parameters supplied to the browse.
-     * 
+     *
      * @return
      * @throws SQLException
      * @throws UIException

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ItemViewer.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ItemViewer.java	2008-09-09 10:25:48 UTC (rev 3099)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ItemViewer.java	2008-09-09 10:54:18 UTC (rev 3100)
@@ -127,23 +127,25 @@
      */
     public SourceValidity getValidity()
     {
-    	if (this.validity == null)
+        DSpaceObject dso = null;
+
+        if (this.validity == null)
     	{
 	        try {
-	            DSpaceObject dso = URIUtil.resolve(objectModel);
+	            dso = URIUtil.resolve(objectModel);
 
 	            DSpaceValidity validity = new DSpaceValidity();
 	            validity.add(dso);
 	            this.validity =  validity.complete();
-
-                // add log message that we are viewing the item
-                // done here, as the serialization may not occur if the cache is valid
-                log.info(LogManager.getHeader(context, "view_item", "handle=" + dso.getHandle()));
 	        }
 	        catch (Exception e)
 	        {
 	            // Ignore all errors and just invalidate the cache.
 	        }
+
+            // add log message that we are viewing the item
+            // done here, as the serialization may not occur if the cache is valid
+            log.info(LogManager.getHeader(context, "view_item", "handle=" + (dso == null ? "" : dso.getHandle())));
     	}
     	return this.validity;
     }

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/EditProfile.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/EditProfile.java	2008-09-09 10:25:48 UTC (rev 3099)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/EditProfile.java	2008-09-09 10:54:18 UTC (rev 3100)
@@ -51,6 +51,7 @@
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.SourceResolver;
+import org.apache.log4j.Logger;
 import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
 import org.dspace.app.xmlui.wing.Message;
 import org.dspace.app.xmlui.wing.WingException;
@@ -64,6 +65,7 @@
 import org.dspace.app.xmlui.wing.element.Text;
 import org.dspace.content.Collection;
 import org.dspace.core.ConfigurationManager;
+import org.dspace.core.LogManager;
 import org.dspace.eperson.Group;
 //import org.dspace.eperson.Subscribe;
 import org.dspace.eperson.SubscriptionManager;
@@ -91,6 +93,8 @@
  */
 public class EditProfile extends AbstractDSpaceTransformer
 {
+    private static Logger log = Logger.getLogger(EditProfile.class);
+
     /** Language string used: */
     private static final Message T_title_create =
         message("xmlui.EPerson.EditProfile.title_create");
@@ -220,6 +224,9 @@
     
    public void addBody(Body body) throws WingException, SQLException 
    {
+       // Log that we are viewing a profile
+       log.info(LogManager.getHeader(context, "view_profile", ""));
+
        Request request = ObjectModelHelper.getRequest(objectModel);
        
        String defaultFirstName="",defaultLastName="",defaultPhone="";
@@ -228,7 +235,7 @@
            defaultFirstName = request.getParameter("first_name");
            defaultLastName = request.getParameter("last_name");
            defaultPhone = request.getParameter("phone");
-       } 
+       }
        else if (eperson != null)
        {
             defaultFirstName = eperson.getFirstName();

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/LicenseStep.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/LicenseStep.java	2008-09-09 10:25:48 UTC (rev 3099)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/LicenseStep.java	2008-09-09 10:54:18 UTC (rev 3100)
@@ -42,6 +42,7 @@
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.environment.SourceResolver;
+import org.apache.log4j.Logger;
 import org.dspace.app.xmlui.aspect.submission.AbstractSubmissionStep;
 import org.dspace.app.xmlui.utils.UIException;
 import org.dspace.app.xmlui.wing.Message;
@@ -53,6 +54,7 @@
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
 import org.dspace.license.CreativeCommons;
+import org.dspace.core.LogManager;
 import org.dspace.uri.IdentifierService;
 import org.xml.sax.SAXException;
 
@@ -65,43 +67,44 @@
  * step the user must agree to the collection's standard distribution
  * license. If the user can not agree to the license they they may either
  * save the submission untill a later time or remove the submission completely.
- * 
+ *
  * This step will include the full license text inside the page using the
  * HTML fragment method.
- * 
- * 
+ *
+ *
  * @author Scott Phillips
  * @author Tim Donohue (updated for Configurable Submission)
  */
 public class LicenseStep extends AbstractSubmissionStep
 {
+    private static final Logger log = Logger.getLogger(LicenseStep.class);
 
-	/** Language Strings **/
-    protected static final Message T_head = 
+    /** Language Strings **/
+    protected static final Message T_head =
         message("xmlui.Submission.submit.LicenseStep.head");
-    protected static final Message T_info1 = 
+    protected static final Message T_info1 =
         message("xmlui.Submission.submit.LicenseStep.info1");
-    protected static final Message T_info2 = 
+    protected static final Message T_info2 =
         message("xmlui.Submission.submit.LicenseStep.info2");
-    protected static final Message T_info3 = 
+    protected static final Message T_info3 =
         message("xmlui.Submission.submit.LicenseStep.info3");
-    protected static final Message T_decision_label = 
+    protected static final Message T_decision_label =
         message("xmlui.Submission.submit.LicenseStep.decision_label");
-    protected static final Message T_decision_checkbox = 
+    protected static final Message T_decision_checkbox =
         message("xmlui.Submission.submit.LicenseStep.decision_checkbox");
-    protected static final Message T_decision_error = 
+    protected static final Message T_decision_error =
         message("xmlui.Submission.submit.LicenseStep.decision_error");
-    protected static final Message T_submit_remove = 
+    protected static final Message T_submit_remove =
         message("xmlui.Submission.submit.LicenseStep.submit_remove");
-    protected static final Message T_submit_complete = 
+    protected static final Message T_submit_complete =
         message("xmlui.Submission.submit.LicenseStep.submit_complete");
-	
-    /** 
+
+    /**
      * Global reference to Creative Commons license page
      * (this is used when CC Licensing is enabled in dspace.cfg)
      **/
     private CCLicenseStep ccLicenseStep = null;
-    
+
     /**
 	 * Establish our required parameters, abstractStep will enforce these.
 	 */
@@ -110,17 +113,17 @@
 		this.requireSubmission = true;
 		this.requireStep = true;
 	}
-    
+
      /**
      * Check if this is actually the creative commons license step
      */
-    public void setup(SourceResolver resolver, Map objectModel, String src, Parameters parameters) 
+    public void setup(SourceResolver resolver, Map objectModel, String src, Parameters parameters)
         throws ProcessingException, SAXException, IOException
-    { 
+    {
         super.setup(resolver,objectModel,src,parameters);
-        
+
         //if Creative Commons licensing is enabled, and
-        //we are on the 1st page of Licensing, 
+        //we are on the 1st page of Licensing,
         //then this is the CC License page
         if (CreativeCommons.isEnabled() && this.getPage()==1)
         {
@@ -129,9 +132,9 @@
         }
         else
            ccLicenseStep = null;
-    
+
     }
-    
+
 	public void addBody(Body body) throws SAXException, WingException,
 	UIException, SQLException, IOException, AuthorizeException
 	{
@@ -144,40 +147,42 @@
            ccLicenseStep.addBody(body);
            return;
         }
-        
+
         // Get the full text for the actuial licese
 		Collection collection = submission.getCollection();
 		String actionURL = IdentifierService.getURL(collection).toString() + "/submit/" + knot.getId() + ".continue";
 		String licenseText = collection.getLicense();
-		
+
 		Division div = body.addInteractiveDivision("submit-license",actionURL, Division.METHOD_POST,"primary submission");
 		div.setHead(T_submission_head);
 		addSubmissionProgressList(div);
-		
+
 		Division inner = div.addDivision("submit-license-inner");
 		inner.setHead(T_head);
 		inner.addPara(T_info1);
 		inner.addPara(T_info2);
-		
-		
+
+
 		// Add the actual text of the license:
 		Division displayLicense = inner.addDivision("submit-license-standard-text","license-text");
 		displayLicense.addSimpleHTMLFragment(true, licenseText);
-		
+
 		inner.addPara(T_info3);
-		
+
 		List controls = inner.addList("submit-review", List.TYPE_FORM);
-		
+
 		CheckBox decision = controls.addItem().addCheckBox("decision");
 		decision.setLabel(T_decision_label);
 		decision.addOption("accept",T_decision_checkbox);
 
-		// If user did not check "I accept" checkbox 
+		// If user did not check "I accept" checkbox
 		if(this.errorFlag==org.dspace.submit.step.LicenseStep.STATUS_LICENSE_REJECTED)
 		{
+            log.info(LogManager.getHeader(context, "reject_license", submissionInfo.getSubmissionLogInfo()));
+
 			decision.addError(T_decision_error);
 		}
-		
+
 		//add standard control/paging buttons
         addControlButtons(controls);
 	}

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/workflow/RejectTaskStep.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/workflow/RejectTaskStep.java	2008-09-09 10:25:48 UTC (rev 3099)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/workflow/RejectTaskStep.java	2008-09-09 10:54:18 UTC (rev 3100)
@@ -41,6 +41,7 @@
 
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
+import org.apache.log4j.Logger;
 import org.dspace.app.xmlui.aspect.submission.AbstractStep;
 import org.dspace.app.xmlui.utils.UIException;
 import org.dspace.app.xmlui.wing.Message;
@@ -53,6 +54,7 @@
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
 import org.dspace.content.Item;
+import org.dspace.core.LogManager;
 import org.dspace.uri.IdentifierService;
 import org.xml.sax.SAXException;
 
@@ -63,27 +65,28 @@
  * This step is used when the user has selected to
  * reject the item. Here they are asked to enter
  * a reason why the item should be rejected.
- * 
+ *
  * @author Scott Phillips
  */
 public class RejectTaskStep extends AbstractStep
 {
-  
-	/** Language Strings **/
-    protected static final Message T_info1 = 
+    private static final Logger log = Logger.getLogger(RejectTaskStep.class);
+
+    /** Language Strings **/
+    protected static final Message T_info1 =
         message("xmlui.Submission.workflow.RejectTaskStep.info1");
-    protected static final Message T_reason = 
+    protected static final Message T_reason =
         message("xmlui.Submission.workflow.RejectTaskStep.reason");
-    protected static final Message T_reason_required = 
+    protected static final Message T_reason_required =
         message("xmlui.Submission.workflow.RejectTaskStep.reason_required");
-    protected static final Message T_submit_reject = 
+    protected static final Message T_submit_reject =
         message("xmlui.Submission.workflow.RejectTaskStep.submit_reject");
-    protected static final Message T_submit_cancel = 
+    protected static final Message T_submit_cancel =
         message("xmlui.general.cancel");
-	
-	
-	
-	
+
+
+
+
 	/**
 	 * Establish our required parameters, abstractStep will enforce these.
 	 */
@@ -91,61 +94,62 @@
 	{
 		this.requireWorkflow = true;
 	}
-	
+
     public void addBody(Body body) throws SAXException, WingException,
             UIException, SQLException, IOException, AuthorizeException
     {
     	Item item = submission.getItem();
 		Collection collection = submission.getCollection();
 		String actionURL = IdentifierService.getURL(collection).toString() + "/workflow";
-    	
+
     	Request request = ObjectModelHelper.getRequest(objectModel);
 		String showfull = request.getParameter("showfull");
-		
+
 		// if the user selected showsimple, remove showfull.
 		if (showfull != null && request.getParameter("showsimple") != null)
 			showfull = null;
-		
-		
 
+
+
     	Division div = body.addInteractiveDivision("reject-task", actionURL, Division.METHOD_POST, "primary workflow");
         div.setHead(T_workflow_head);
-    	
-    	
+
+
         if (showfull == null)
         {
 	        ReferenceSet referenceSet = div.addReferenceSet("narf",ReferenceSet.TYPE_SUMMARY_VIEW);
 	        referenceSet.addReference(item);
 	        div.addPara().addButton("showfull").setValue(T_showfull);
-        } 
+        }
         else
         {
             ReferenceSet referenceSet = div.addReferenceSet("narf",ReferenceSet.TYPE_DETAIL_VIEW);
             referenceSet.addReference(item);
             div.addPara().addButton("showsimple").setValue(T_showsimple);
-            
+
             div.addHidden("showfull").setValue("true");
         }
-        
 
+
         List form = div.addList("reject-workflow",List.TYPE_FORM);
-        
+
         form.addItem(T_info1);
-        
+
         TextArea reason = form.addItem().addTextArea("reason");
         reason.setLabel(T_reason);
         reason.setRequired();
         reason.setSize(15, 50);
         if (this.errorFields.contains("reason"))
         	reason.addError(T_reason_required);
-    	
+
         org.dspace.app.xmlui.wing.element.Item actions = form.addItem();
         actions.addButton("submit_reject").setValue(T_submit_reject);
         actions.addButton("submit_cancel").setValue(T_submit_cancel);
-        
-        div.addHidden("submission-continue").setValue(knot.getId()); 
+
+        div.addHidden("submission-continue").setValue(knot.getId());
+
+        log.info(LogManager.getHeader(context, "get_reject_reason",
+                "workflow_id=" + submission.getID() + ",item_id="
+                        + item.getID()));
     }
-    
-    
-   
 }

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/workflow/UnclaimTasksAction.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/workflow/UnclaimTasksAction.java	2008-09-09 10:25:48 UTC (rev 3099)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/workflow/UnclaimTasksAction.java	2008-09-09 10:54:18 UTC (rev 3100)
@@ -48,8 +48,10 @@
 import org.apache.cocoon.environment.Redirector;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.SourceResolver;
+import org.apache.log4j.Logger;
 import org.dspace.app.xmlui.utils.ContextUtil;
 import org.dspace.core.Context;
+import org.dspace.core.LogManager;
 import org.dspace.workflow.WorkflowItem;
 import org.dspace.workflow.WorkflowManager;
 
@@ -62,10 +64,12 @@
  */
 public class UnclaimTasksAction extends AbstractAction
 {
+    private static final Logger log = Logger.getLogger(UnclaimTasksAction.class);
 
     /**
-     * @param pattern
+     * @param redirector
      *            un-used.
+     * @param resolver
      * @param objectModel
      *            Cocoon's object model
      */
@@ -90,6 +94,7 @@
     				 state == WorkflowManager.WFSTATE_STEP2 || 
     				 state == WorkflowManager.WFSTATE_STEP3 )
     			{
+                    log.info(LogManager.getHeader(context, "unclaim_workflow", "workflow_id=" + workflowItem.getID()));
     				WorkflowManager.unclaim(context, workflowItem, context.getCurrentUser());
     			}
     		}

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java	2008-09-09 10:25:48 UTC (rev 3099)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java	2008-09-09 10:54:18 UTC (rev 3100)
@@ -132,7 +132,7 @@
 {
 
 	private static Logger log = Logger.getLogger(BitstreamReader.class);
-	
+
     /**
      * Messages to be sent when the user is not authorized to view
      * a particular bitstream. They will be redirected to the login
@@ -173,7 +173,7 @@
 
     /** The bitstream's name */
     protected String bitstreamName;
-    
+
     /**
      * Set up the bitstream reader.
      *
@@ -194,8 +194,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);
@@ -253,8 +253,15 @@
             }
 
             // Is there a User logged in and does the user have access to read it?
-            if (!AuthorizeManager.authorizeActionBoolean(context, bitstream, Constants.READ))
+            boolean isAuthorized = AuthorizeManager.authorizeActionBoolean(context, bitstream, Constants.READ);
+            if (item != null && item.isWithdrawn() && !AuthorizeManager.isAdmin(context))
             {
+                isAuthorized = false;
+                log.info(LogManager.getHeader(context, "view_bitstream", "handle=" + item.getHandle() + ",withdrawn=true"));
+            }
+
+            if (!isAuthorized)
+            {
             	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
@@ -299,7 +306,7 @@
             this.bitstreamSize = bitstream.getSize();
             this.bitstreamMimeType = bitstream.getFormat().getMIMEType();
             this.bitstreamName = bitstream.getName();
-            
+
             // Trim any path information from the bitstream
             if (bitstreamName != null && bitstreamName.length() >0 )
             {
@@ -314,10 +321,10 @@
             	// In-case there is no bitstream name...
             	bitstreamName = "bitstream";
             }
-    		
-            
+
+
             // Log that the bitstream has been viewed.
-			log.info(LogManager.getHeader(context, "view_bitstream", "bitstream_id=" + bitstream.getID()));
+            log.info(LogManager.getHeader(context, "view_bitstream", "bitstream_id=" + bitstream.getID()));
         }
         catch (SQLException sqle)
         {
@@ -461,13 +468,13 @@
 
         response.setDateHeader("Expires", System.currentTimeMillis()
                 + expires);
-    	
+
         // If this is a large bitstream then tell the browser it should treat it as a download.
         int threshold = ConfigurationManager.getIntProperty("xmlui.content_disposition_threshold");
         if (bitstreamSize > threshold && threshold != 0)
         {
 	    	String name  = bitstreamName;
-	    	
+
 	    	// Try and make the download file name formated for each browser.
 	    	try {
 		    	String agent = request.getHeader("USER-AGENT");


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

Revision: 3101
          http://dspace.svn.sourceforge.net/dspace/?rev=3101&view=rev
Author:   grahamtriggs
Date:     2008-09-09 11:17:33 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
integrated from branch 1.5
Make RequestInfo Serializable as it is stored in the current session - otherwise prevents clustering

Modified Paths:
--------------
    trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/FileUploadRequest.java
    trunk/dspace-jspui/dspace-jspui-webapp/src/main/webapp/WEB-INF/web.xml
    trunk/dspace-lni/dspace-lni-webapp/src/main/webapp/WEB-INF/web.xml
    trunk/dspace-oai/dspace-oai-webapp/src/main/webapp/WEB-INF/web.xml
    trunk/dspace-sword/dspace-sword-webapp/src/main/webapp/WEB-INF/web.xml
    trunk/pom.xml

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dspace-1_5_x:2946,2948
   + /branches/dspace-1_5_x:2946,2948,2951

Modified: trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/FileUploadRequest.java
===================================================================
--- trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/FileUploadRequest.java	2008-09-09 10:54:18 UTC (rev 3100)
+++ trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/FileUploadRequest.java	2008-09-09 11:17:33 UTC (rev 3101)
@@ -55,6 +55,8 @@
 
 import org.apache.commons.fileupload.DiskFileUpload;
 import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.dspace.core.ConfigurationManager;
 
 /**
@@ -98,11 +100,15 @@
         tempDir = ConfigurationManager.getProperty("upload.temp.dir");
         int maxSize = ConfigurationManager.getIntProperty("upload.max");
 
-        DiskFileUpload upload = new DiskFileUpload();
+        // Create a factory for disk-based file items
+        DiskFileItemFactory factory = new DiskFileItemFactory();
+        factory.setRepository(new File(tempDir));
 
+        // Create a new file upload handler
+        ServletFileUpload upload = new ServletFileUpload(factory);
+        
         try
         {
-            upload.setRepositoryPath(tempDir);
             upload.setSizeMax(maxSize);
             items = upload.parseRequest(req);
             for (Iterator i = items.iterator(); i.hasNext();)

Modified: trunk/dspace-jspui/dspace-jspui-webapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/dspace-jspui/dspace-jspui-webapp/src/main/webapp/WEB-INF/web.xml	2008-09-09 10:54:18 UTC (rev 3100)
+++ trunk/dspace-jspui/dspace-jspui-webapp/src/main/webapp/WEB-INF/web.xml	2008-09-09 11:17:33 UTC (rev 3101)
@@ -130,7 +130,7 @@
         org.apache.commons.fileupload.servlet.FileCleanerCleanup
      </listener-class>
   </listener>
-  
+
   <!-- Listener to initialise / clean up the application -->
   <listener>
      <listener-class>
@@ -165,10 +165,10 @@
 		<servlet-class>org.dspace.app.webui.servlet.admin.WithdrawnBrowserServlet</servlet-class>
 	</servlet>
 
-  <servlet>
+  <!-- servlet>
     <servlet-name>exportdownload</servlet-name>
     <servlet-class>org.dspace.app.webui.servlet.ItemExportArchiveServlet</servlet-class>
-  </servlet>
+  </servlet -->
 
   <servlet>
     <servlet-name>collection-wizard</servlet-name>
@@ -312,7 +312,7 @@
     <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>
@@ -409,10 +409,10 @@
     <url-pattern>/advanced-search</url-pattern>
   </servlet-mapping>
 
-  <servlet-mapping>
+  <!-- servlet-mapping>
     <servlet-name>exportdownload</servlet-name>
     <url-pattern>/exportdownload/*</url-pattern>
-  </servlet-mapping>
+  </servlet-mapping -->
 
   <servlet-mapping>
     <servlet-name>browse</servlet-name>
@@ -573,7 +573,7 @@
     <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>

Modified: trunk/dspace-lni/dspace-lni-webapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/dspace-lni/dspace-lni-webapp/src/main/webapp/WEB-INF/web.xml	2008-09-09 10:54:18 UTC (rev 3100)
+++ trunk/dspace-lni/dspace-lni-webapp/src/main/webapp/WEB-INF/web.xml	2008-09-09 11:17:33 UTC (rev 3101)
@@ -51,15 +51,15 @@
     </description>
   </context-param>
 
-  <!-- 
-   Listener to initialise DSpace configuration and clean up the application 
+  <!--
+   Listener to initialise DSpace configuration and clean up the application
   -->
   <listener>
      <listener-class>
         org.dspace.app.util.DSpaceContextListener
      </listener-class>
   </listener>
-  
+
   <!--  Servlets -->
 
   <servlet>

Modified: trunk/dspace-oai/dspace-oai-webapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/dspace-oai/dspace-oai-webapp/src/main/webapp/WEB-INF/web.xml	2008-09-09 10:54:18 UTC (rev 3100)
+++ trunk/dspace-oai/dspace-oai-webapp/src/main/webapp/WEB-INF/web.xml	2008-09-09 11:17:33 UTC (rev 3101)
@@ -70,8 +70,8 @@
     </description>
   </context-param>
 
-  <!-- 
-   Listener to initialise DSpace configuration and clean up the application 
+  <!--
+   Listener to initialise DSpace configuration and clean up the application
   -->
   <listener>
      <listener-class>

Modified: trunk/dspace-sword/dspace-sword-webapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/dspace-sword/dspace-sword-webapp/src/main/webapp/WEB-INF/web.xml	2008-09-09 10:54:18 UTC (rev 3100)
+++ trunk/dspace-sword/dspace-sword-webapp/src/main/webapp/WEB-INF/web.xml	2008-09-09 11:17:33 UTC (rev 3101)
@@ -60,7 +60,7 @@
       The SWORDServer class name
     </description>
   </context-param>
-  
+
   <context-param>
     <param-name>authentication-method</param-name>
     <param-value>Basic</param-value>
@@ -68,16 +68,16 @@
       The type of authentication used : [Basic|None]
     </description>
   </context-param>
-  
-   <!-- 
-   Listener to initialise DSpace configuration and clean up the application 
+
+   <!--
+   Listener to initialise DSpace configuration and clean up the application
    -->
    <listener>
       <listener-class>
          org.dspace.app.util.DSpaceContextListener
       </listener-class>
    </listener>
-    
+
   <!-- Servlets -->
   <servlet>
     <servlet-name>servicedocument</servlet-name>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-09-09 10:54:18 UTC (rev 3100)
+++ trunk/pom.xml	2008-09-09 11:17:33 UTC (rev 3101)
@@ -325,12 +325,12 @@
          <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.1.1</version>
+            <version>1.2.1</version>
          </dependency>
          <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>1.2</version>
+            <version>1.4</version>
          </dependency>
          <dependency>
             <groupId>commons-lang</groupId>


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

Revision: 3102
          http://dspace.svn.sourceforge.net/dspace/?rev=3102&view=rev
Author:   grahamtriggs
Date:     2008-09-09 12:45:34 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
integrated from branch 1.5
Statistics viewer for XMLUI, based on existing DStat. Note that this generates the view from the analysis files (.dat), does not require HTML report generation.

Modified Paths:
--------------
    trunk/dspace-api/src/main/java/org/dspace/app/statistics/HTMLReport.java
    trunk/dspace-api/src/main/java/org/dspace/app/statistics/Report.java
    trunk/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/Navigation.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/Navigation.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap
    trunk/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml
    trunk/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Reference/lib/style.css

Added Paths:
-----------
    trunk/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/StatisticsViewer.java

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dspace-1_5_x:2946,2948,2951
   + /branches/dspace-1_5_x:2946,2948,2951,2955

Modified: trunk/dspace-api/src/main/java/org/dspace/app/statistics/HTMLReport.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/app/statistics/HTMLReport.java	2008-09-09 11:17:33 UTC (rev 3101)
+++ trunk/dspace-api/src/main/java/org/dspace/app/statistics/HTMLReport.java	2008-09-09 12:45:34 UTC (rev 3102)
@@ -44,6 +44,7 @@
 import org.dspace.app.statistics.Stat;
 import org.dspace.app.statistics.Statistics;
 import org.dspace.app.statistics.ReportTools;
+import org.dspace.core.ConfigurationManager;
 
 import java.text.DateFormat;
 
@@ -54,13 +55,14 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.io.*;
 
 /**
  * This class provides HTML reports for the ReportGenerator class
  *
  * @author  Richard Jones
  */
-public class HTMLReport extends Report
+public class HTMLReport implements Report
 {
     // FIXME: all of these methods should do some content escaping before
     // outputting anything
@@ -79,6 +81,10 @@
     
     /** end date for report */
     private Date end = null;
+
+    /** the output file to which to write aggregation data */
+   private static String output = ConfigurationManager.getProperty("dspace.dir") +
+                            File.separator + "log" + File.separator + "report";
     
     /**
      * constructor for HTML reporting
@@ -87,6 +93,14 @@
     {
         // empty constructor
     }
+
+    public void setOutput(String newOutput)
+    {
+        if (newOutput != null)
+        {
+            output = newOutput;
+        }
+    }
     
     /**
      * return a string containing the report as generated by this class
@@ -119,6 +133,23 @@
         
         // output the footer and return
         frag.append(footer());
+
+        // NB: HTMLReport now takes responsibility to write the output file,
+        // so that the Report/ReportGenerator can have more general usage
+        // finally write the string into the output file
+        try
+        {
+        	FileOutputStream fos = new FileOutputStream(output);
+            OutputStreamWriter osr = new OutputStreamWriter(fos, "UTF-8");
+            PrintWriter out = new PrintWriter(osr);
+            out.write(frag.toString());
+            out.close();
+        }
+        catch (IOException e)
+        {
+            System.out.println("Unable to write to output file " + output);
+            System.exit(0);
+        }
         
         return frag.toString();
     }

Modified: trunk/dspace-api/src/main/java/org/dspace/app/statistics/Report.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/app/statistics/Report.java	2008-09-09 11:17:33 UTC (rev 3101)
+++ trunk/dspace-api/src/main/java/org/dspace/app/statistics/Report.java	2008-09-09 12:45:34 UTC (rev 3102)
@@ -48,30 +48,18 @@
 import java.util.List;
 
 /**
- * Abstract class to define an interface to a generic report generating
+ * Sn interface to a generic report generating
  * class, and to provide the polymorphism necessary to allow the report
  * generator to generate any number of different formats of report
  *
+ * Note: This used to be an abstract class, but has been made an interface as there wasn't
+ * any logic contained within it. It's also been made public, so that you can create a Report
+ * type without monkeying about in the statistics package.
+ *
  * @author  Richard Jones
  */
-abstract class Report 
+public interface Report
 {
-    
-    /** a list of the statistics blocks being managed by this class */
-    private List blocks = new ArrayList();
-    
-    /** the title for the page */
-    private String pageTitle = null;
-    
-    /** the main title for the page */
-    private String mainTitle = null;
-    
-    /** start date for report */
-    private Date start = null;
-    
-    /** end date for report */
-    private Date end = null;
-    
     /**
      * output any top headers that this page needs
      *

Modified: trunk/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java	2008-09-09 11:17:33 UTC (rev 3101)
+++ trunk/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java	2008-09-09 12:45:34 UTC (rev 3102)
@@ -70,6 +70,7 @@
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.sql.SQLException;
 
 /**
  * This class performs the action of coordinating a usage report being
@@ -172,16 +173,9 @@
     // report generator config data
     ////////////////
     
-    /** the format of the report to be output */
-    private static String format = null;
-    
     /** the input file to build the report from */
     private static String input = null;
     
-    /** the output file to which to write aggregation data */
-   private static String output = ConfigurationManager.getProperty("dspace.dir") + 
-                            File.separator + "log" + File.separator + "report";
-   
    /** the log file action to human readable action map */
    private static String map = ConfigurationManager.getProperty("dspace.dir") +
                             File.separator + "config" + File.separator + "dstat.map";
@@ -240,6 +234,9 @@
      * aggregation data and output a file containing the report in the
      * requested format
      *
+     * this method is retained for backwards compatibility, but delegates the actual
+     * wprk to a new method
+     *
      * @param   context     the DSpace context in which this action is performed
      * @param   myFormat    the desired output format (currently on HTML supported)
      * @param   myInput     the aggregation file to be turned into a report
@@ -250,6 +247,32 @@
                                      String myMap)
         throws Exception
     {
+        // create the relevant report type
+        // FIXME: at the moment we only support HTML report generation
+        Report report = null;
+        if (myFormat.equals("html"))
+        {
+            report = new HTMLReport();
+            ((HTMLReport)report).setOutput(myOutput);
+        }
+
+        if (myMap != null)
+        {
+            map = myMap;
+        }
+
+        ReportGenerator.processReport(context, report, myInput);
+    }
+
+    /**
+     * using the pre-configuration information passed here, read in the
+     * aggregation data and output a file containing the report in the
+     * requested format
+     */
+    public static void processReport(Context context, Report report,
+                                     String myInput)
+        throws Exception, SQLException
+    {
         startTime = new GregorianCalendar();
              
         /** instantiate aggregators */
@@ -264,7 +287,7 @@
         generalSummary = new ArrayList();
                 
         // set the parameters for this analysis
-        setParameters(myFormat, myInput, myOutput, myMap);
+        setParameters(myInput);
         
         // pre prepare our standard file readers and buffered readers
         FileReader fr = null;
@@ -276,14 +299,6 @@
         // load the log file action to human readable action map
         readMap(map);
         
-        // create the relevant report type
-        // FIXME: at the moment we only support HTML report generation
-        Report report = null;
-        if (format.equals("html"))
-        {
-            report = new HTMLReport();
-        }
-        
         report.setStartDate(startDate);
         report.setEndDate(endDate);
         report.setMainTitle(name, serverName);
@@ -352,7 +367,8 @@
         String info = null;
         for (i = 0; i < items.length; i++)
         {
-            if (i < itemLookup)
+            // Allow negative value to say that all items should be looked up
+            if (itemLookup < 0 || i < itemLookup)
             {
                 info = getItemInfo(context, items[i].getKey());
             }
@@ -459,22 +475,9 @@
         process.add(proc);
         
         report.addBlock(process);
+
+        report.render();
         
-        // finally write the string into the output file
-        try 
-        {
-        	FileOutputStream fos = new FileOutputStream(output);
-            OutputStreamWriter osr = new OutputStreamWriter(fos, "UTF-8");
-            PrintWriter out = new PrintWriter(osr);
-            out.write(report.render());
-            out.close();
-        } 
-        catch (IOException e) 
-        {
-            System.out.println("Unable to write to output file " + output);
-            System.exit(0);
-        }
-        
         return;
     }
     
@@ -595,34 +598,15 @@
      * the command line with args or calling the processReport method statically
      * from elsewhere
      *
-     * @param   myFormat    the log file directory to be analysed
      * @param   myInput     regex for log file names
-     * @param   myOutput    config file to use for dstat
-     * @param   myMap       the action map file to use for translations
      */
-    public static void setParameters(String myFormat, String myInput, 
-                                    String myOutput, String myMap)
+    public static void setParameters(String myInput)
     {
-        if (myFormat != null)
-        {
-            format = myFormat;
-        }
-        
         if (myInput != null)
         {
             input = myInput;
         }
         
-        if (myOutput != null)
-        {
-            output = myOutput;
-        }
-        
-        if (myMap != null)
-        {
-            map = myMap;
-        }
-        
         return;
     }
     
@@ -650,9 +634,13 @@
         catch (IOException e) 
         {  
             System.out.println("Failed to read input file: " + input);
-            System.exit(0);
+            return;
         } 
         
+        // first initialise a date format object to do our date processing
+        // if necessary
+        SimpleDateFormat sdf = new SimpleDateFormat("dd'/'MM'/'yyyy");
+
         // FIXME: although this works, it is not very elegant
         // loop through the aggregator file and read in the values
         while ((record = br.readLine()) != null) 
@@ -699,64 +687,48 @@
             }
             
             // if the line is real, then we carry on
-            
-            // first initialise a date format object to do our date processing
-            // if necessary
-            SimpleDateFormat sdf = new SimpleDateFormat("dd'/'MM'/'yyyy");
-            
             // read the analysis contents in
             if (section.equals("archive"))
             {
                 archiveStats.put(key, value);
             }
-            
-            if (section.equals("action"))
+            else if (section.equals("action"))
             {
                 actionAggregator.put(key, value);
             }
-            
-            if (section.equals("user"))
+            else if (section.equals("user"))
             {
                 userAggregator.put(key, value);
             }
-            
-            if (section.equals("search"))
+            else if (section.equals("search"))
             {
                 searchAggregator.put(key, value);
             }
-            
-            if (section.equals("item"))
+            else if (section.equals("item"))
             {
                 itemAggregator.put(key, value);
             }
-            
-            // read the config details used to make this report in
-            if (section.equals("user_email"))
+            else if (section.equals("user_email"))
             {
                 userEmail = value;
             }
-            
-            if (section.equals("item_floor"))
+            else if (section.equals("item_floor"))
             {
                 itemFloor = Integer.parseInt(value);
             }
-            
-            if (section.equals("search_floor"))
+            else if (section.equals("search_floor"))
             {
                 searchFloor = Integer.parseInt(value);
             }
-            
-            if (section.equals("host_url"))
+            else if (section.equals("host_url"))
             {
                 url = value;
             }
-
-            if (section.equals("item_lookup"))
+            else if (section.equals("item_lookup"))
             {
                 itemLookup = Integer.parseInt(value);
             }
-            
-            if (section.equals("avg_item_views"))
+            else if (section.equals("avg_item_views"))
             {
                 try 
                 {
@@ -767,43 +739,35 @@
                     avgItemViews = 0;
                 }
             }
-            
-            if (section.equals("server_name"))
+            else if (section.equals("server_name"))
             {
                 serverName = value;
             }
-            
-            if (section.equals("service_name"))
+            else if (section.equals("service_name"))
             {
                 name = value;
             }
-             
-            if (section.equals("start_date"))
+            else if (section.equals("start_date"))
             {
                 startDate = sdf.parse(value);
             }
-            
-            if (section.equals("end_date"))
+            else if (section.equals("end_date"))
             {
                 endDate = sdf.parse(value);
             }
-            
-            if (section.equals("analysis_process_time"))
+            else if (section.equals("analysis_process_time"))
             {
                 processTime = Integer.parseInt(value);
             }
-            
-            if (section.equals("general_summary"))
+            else if (section.equals("general_summary"))
             {
                 generalSummary.add(value);
             }
-            
-            if (section.equals("log_lines"))
+            else if (section.equals("log_lines"))
             {
                 logLines = Integer.parseInt(value);
             }
-            
-            if (section.equals("warnings"))
+            else if (section.equals("warnings"))
             {
                 warnings = Integer.parseInt(value);
             }

Copied: trunk/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java (from rev 2955, branches/dspace-1_5_x/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java)
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java	                        (rev 0)
+++ trunk/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java	2008-09-09 12:45:34 UTC (rev 3102)
@@ -0,0 +1,397 @@
+/*
+ * StatisticsLoader.java
+ *
+ * Version: $Revision: 1.0 $
+ *
+ * Date: $Date: 2007/08/28 10:00:00 $
+ *
+ * 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.statistics;
+
+import org.apache.commons.lang.time.DateUtils;
+import org.dspace.core.ConfigurationManager;
+
+import java.util.*;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+
+/**
+ * Helper class for loading the analysis / report files from the reports directory
+ */
+public class StatisticsLoader
+{
+    private static Map<String, StatsFile> monthlyAnalysis = null;
+    private static Map<String, StatsFile> monthlyReports = null;
+
+    private static StatsFile generalAnalysis = null;
+    private static StatsFile generalReport = null;
+
+    private static Date lastLoaded = null;
+    private static int fileCount   = 0;
+
+    private static Pattern analysisMonthlyPattern;
+    private static Pattern analysisGeneralPattern;
+    private static Pattern reportMonthlyPattern;
+    private static Pattern reportGeneralPattern;
+
+    private static SimpleDateFormat monthlySDF;
+    private static SimpleDateFormat generalSDF;
+
+    // one time initialisation of the regex patterns and formatters we will use
+    static
+    {
+        analysisMonthlyPattern = Pattern.compile("dspace-log-monthly-([0-9][0-9][0-9][0-9]-[0-9]+)\\.dat");
+        analysisGeneralPattern = Pattern.compile("dspace-log-general-([0-9]+-[0-9]+-[0-9]+)\\.dat");
+        reportMonthlyPattern   = Pattern.compile("report-([0-9][0-9][0-9][0-9]-[0-9]+)\\.html");
+        reportGeneralPattern   = Pattern.compile("report-general-([0-9]+-[0-9]+-[0-9]+)\\.html");
+
+        monthlySDF = new SimpleDateFormat("yyyy'-'M");
+        generalSDF = new SimpleDateFormat("yyyy'-'M'-'dd");
+    }
+
+    /**
+     * Get an array of the dates of the report files
+     * @return
+     */
+    public static Date[] getMonthlyReportDates()
+    {
+        return sortDatesDescending(getDatesFromMap(monthlyReports));
+    }
+
+    /**
+     * Get an array of the dates of the analysis files 
+     * @return
+     */
+    public static Date[] getMonthlyAnalysisDates()
+    {
+        return sortDatesDescending(getDatesFromMap(monthlyAnalysis));
+    }
+
+    /**
+     * Convert the formatted dates that are the keys of the map into a date array
+     * @param monthlyMap
+     * @return
+     */
+    protected static Date[] getDatesFromMap(Map<String, StatsFile> monthlyMap)
+    {
+        Set<String> keys = monthlyMap.keySet();
+        Date[] dates = new Date[keys.size()];
+        int i = 0;
+        for (String date : keys)
+        {
+            try
+            {
+                dates[i] = monthlySDF.parse(date);
+            }
+            catch (ParseException pe)
+            {
+            }
+
+            i++;
+        }
+
+        return dates;
+    }
+
+    /**
+     * Sort the date array in descending (reverse chronological) order
+     * @param dates
+     * @return
+     */
+    protected static Date[] sortDatesDescending(Date[] dates)
+    {
+        Arrays.sort(dates, new Comparator<Date>() {
+            SimpleDateFormat sdf = monthlySDF;
+            public int compare(Date d1, Date d2)
+            {
+                if (d1 == null && d2 == null)
+                    return 0;
+                else if (d1 == null)
+                    return -1;
+                else if (d2 == null)
+                    return 1;
+                else if (d1.before(d2))
+                    return 1;
+                else if (d2.before(d1))
+                    return -1;
+
+                return 0;
+            }
+        });
+        return dates;
+    }
+
+    /**
+     * Get the analysis file for a given date
+     * @param date
+     * @return
+     */
+    public static File getAnalysisFor(String date)
+    {
+        StatisticsLoader.syncFileList();
+        StatsFile sf = (monthlyAnalysis == null ? null : monthlyAnalysis.get(date));
+        return sf == null ? null : sf.file;
+    }
+
+    /**
+     * Get the report file for a given date
+     * @param date
+     * @return
+     */
+    public static File getReportFor(String date)
+    {
+        StatisticsLoader.syncFileList();
+        StatsFile sf = (monthlyReports == null ? null : monthlyReports.get(date));
+        return sf == null ? null : sf.file;
+    }
+
+    /**
+     * Get the current general analysis file
+     * @return
+     */
+    public static File getGeneralAnalysis()
+    {
+        StatisticsLoader.syncFileList();
+        return generalAnalysis == null ? null : generalAnalysis.file;
+    }
+
+    /**
+     * Get the current general report file
+     * @return
+     */
+    public static File getGeneralReport()
+    {
+        StatisticsLoader.syncFileList();
+        return generalReport == null ? null : generalReport.file;
+    }
+
+    /**
+     * Syncronize the cached list of analysis / report files with the reports directory
+     *
+     * We synchronize if:
+     *
+     * 1) The number of files is different (ie. files have been added or removed)
+     * 2) We haven't cached anything yet
+     * 3) The cache was last generate over an hour ago
+     */
+    private static void syncFileList()
+    {
+        // Get an array of all the analysis and report files present
+        File[] fileList = StatisticsLoader.getAnalysisAndReportFileList();
+
+        if (fileList != null && fileList.length != fileCount)
+            StatisticsLoader.loadFileList(fileList);
+        else if (lastLoaded == null)
+            StatisticsLoader.loadFileList(fileList);
+        else if (DateUtils.addHours(lastLoaded, 1).before(new Date()))
+            StatisticsLoader.loadFileList(fileList);
+    }
+
+    /**
+     * Generate the cached file list from the array of files
+     * @param fileList
+     */
+    private static synchronized void loadFileList(File[] fileList)
+    {
+        // If we haven't been passed an array of files, get one now
+        if (fileList == null || fileList.length == 0)
+        {
+            fileList = StatisticsLoader.getAnalysisAndReportFileList();
+        }
+
+        // Create new maps for the monthly analyis / reports
+        Map<String, StatsFile> newMonthlyAnalysis = new HashMap<String, StatsFile>();
+        Map<String, StatsFile> newMonthlyReports  = new HashMap<String, StatsFile>();
+
+        StatsFile newGeneralAnalysis = null;
+        StatsFile newGeneralReport = null;
+
+        if (fileList != null)
+        {
+            for (File thisFile : fileList)
+            {
+                StatsFile statsFile = null;
+
+                // If we haven't identified this file yet
+                if (statsFile == null)
+                {
+                    // See if it is a monthly analysis file
+                    statsFile = makeStatsFile(thisFile, analysisMonthlyPattern, monthlySDF);
+                    if (statsFile != null)
+                    {
+                        // If it is, add it to the map
+                        newMonthlyAnalysis.put(statsFile.dateStr, statsFile);
+                    }
+                }
+
+                // If we haven't identified this file yet
+                if (statsFile == null)
+                {
+                    // See if it is a monthly report file
+                    statsFile = makeStatsFile(thisFile, reportMonthlyPattern, monthlySDF);
+                    if (statsFile != null)
+                    {
+                        // If it is, add it to the map
+                        newMonthlyReports.put(statsFile.dateStr, statsFile);
+                    }
+                }
+
+                // If we haven't identified this file yet
+                if (statsFile == null)
+                {
+                    // See if it is a general analysis file
+                    statsFile = makeStatsFile(thisFile, analysisGeneralPattern, generalSDF);
+                    if (statsFile != null)
+                    {
+                        // If it is, ensure that we are pointing to the most recent file
+                        if (newGeneralAnalysis == null || statsFile.date.after(newGeneralAnalysis.date))
+                        {
+                            newGeneralAnalysis = statsFile;
+                        }
+                    }
+                }
+
+                // If we haven't identified this file yet
+                if (statsFile == null)
+                {
+                    // See if it is a general report file
+                    statsFile = makeStatsFile(thisFile, reportGeneralPattern, generalSDF);
+                    if (statsFile != null)
+                    {
+                        // If it is, ensure that we are pointing to the most recent file
+                        if (newGeneralReport == null || statsFile.date.after(newGeneralReport.date))
+                        {
+                            newGeneralReport = statsFile;
+                        }
+                    }
+                }
+            }
+        }
+
+        // Store the newly discovered values in the member cache
+        monthlyAnalysis = newMonthlyAnalysis;
+        monthlyReports  = newMonthlyReports;
+        generalAnalysis = newGeneralAnalysis;
+        generalReport   = newGeneralReport;
+        lastLoaded = new Date();
+    }
+
+    /**
+     * Generate a StatsFile entry for this file. The pattern and date formatters are used to
+     * identify the file as a particular type, and extract the relevant information.
+     * If the file is not identified by the formatter provided, then we return null
+     * @param thisFile
+     * @param thisPattern
+     * @param sdf
+     * @return
+     */
+    private static StatsFile makeStatsFile(File thisFile, Pattern thisPattern, SimpleDateFormat sdf)
+    {
+        Matcher matcher = thisPattern.matcher(thisFile.getName());
+        if (matcher.matches())
+        {
+            StatsFile sf = new StatsFile();
+            sf.file = thisFile;
+            sf.path = thisFile.getPath();
+            sf.dateStr = matcher.group(1).trim();
+
+            try
+            {
+                sf.date = sdf.parse(sf.dateStr);
+            }
+            catch (ParseException e)
+            {
+
+            }
+
+            return sf;
+        }
+        
+        return null;
+    }
+
+    /**
+     * Get an array of all the analysis and report files
+     * @return
+     */
+    private static File[] getAnalysisAndReportFileList()
+    {
+        File reportDir = new File(ConfigurationManager.getProperty("report.dir"));
+        if (reportDir != null)
+        {
+            return reportDir.listFiles(new AnalysisAndReportFilter());
+        }
+
+        return null;
+    }
+
+    /**
+     * Simple class for holding information about an analysis/report file
+     */
+    private static class StatsFile
+    {
+        File file;
+        String path;
+        Date date;
+        String dateStr;
+    }
+
+    /**
+     * Filter used to restrict files in the reports directory to just analysis or report types
+     */
+    private static class AnalysisAndReportFilter implements FilenameFilter
+    {
+        public boolean accept(File dir, String name)
+        {
+            if (analysisMonthlyPattern.matcher(name).matches())
+                return true;
+
+            if (analysisGeneralPattern.matcher(name).matches())
+                return true;
+
+            if (reportMonthlyPattern.matcher(name).matches())
+                return true;
+            
+            if (reportGeneralPattern.matcher(name).matches())
+                return true;
+
+            return false;
+        }
+    }
+}

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/Navigation.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/Navigation.java	2008-09-09 11:17:33 UTC (rev 3101)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/Navigation.java	2008-09-09 12:45:34 UTC (rev 3102)
@@ -73,10 +73,10 @@
 import java.util.Map;
 
 /**
- * 
- * Create the navigation options for everything in the administrative aspects. This includes 
+ *
+ * Create the navigation options for everything in the administrative aspects. This includes
  * Epeople, group, item, access control, and registry management.
- * 
+ *
  * @author Scott Phillips
  * @author Afonso Araujo Neto (internationalization)
  * @author Alexey Maslov
@@ -108,27 +108,29 @@
     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");
-   
-	
+
+    private static final Message T_statistics            	= message("xmlui.administrative.Navigation.statistics");
+
+
     /** exports available for download */
     java.util.List<String> availableExports = null;
 
     /** Cached validity object */
 	private SourceValidity validity;
-	
+
 	 /**
      * Generate the unique cache key.
      *
      * @return The generated key hashes the src
      */
-    public Serializable getKey() 
+    public Serializable getKey()
     {
         Request request = ObjectModelHelper.getRequest(objectModel);
-        
-        // Special case, don't cache anything if the user is logging 
+
+        // 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 
+        // 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 ||
@@ -136,7 +138,7 @@
         {
             return "0";
         }
-                
+
         String key;
         if (context.getCurrentUser() != null)
         {
@@ -149,17 +151,17 @@
         }
         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() 
+    public SourceValidity getValidity()
     {
     	if (this.validity == null)
     	{
@@ -168,17 +170,17 @@
     		{
 		        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.
@@ -191,8 +193,8 @@
     	}
     	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{
@@ -202,12 +204,12 @@
     		// nothing to do
     	}
     }
-    
+
     public void addOptions(Options options) throws SAXException, WingException,
             UIException, SQLException, IOException, AuthorizeException
     {
     	/* Create skeleton menu structure to ensure consistent order between aspects,
-    	 * even if they are never used 
+    	 * even if they are never used
     	 */
         options.addList("browse");
         List account = options.addList("account");
@@ -223,7 +225,7 @@
         DSpaceObject dso = URIUtil.resolve(objectModel);
         if (dso instanceof Item)
     	{
-    		
+
     		Item item = (Item) dso;
     		if (item.canEdit())
     		{
@@ -235,83 +237,84 @@
     	else if (dso instanceof Collection)
     	{
     		Collection collection = (Collection) dso;
-    		
-    		
+
+
     		// can they admin this collection?
             if (AuthorizeManager.authorizeActionBoolean(this.context, collection, Constants.COLLECTION_ADMIN))
             {
             	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/collection?collectionID=" + collection.getID(), T_context_edit_collection);
+            	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)
     	{
     		Community community = (Community) dso;
-    		
+
     		// can they admin this collection?
             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?
             if (AuthorizeManager.authorizeActionBoolean(this.context, community,Constants.ADD))
             {
             	context.setHead(T_context_head);
-            	context.addItemXref(contextPath+"/admin/collection?createNew&communityID=" + community.getID(), T_context_create_collection);         	
+            	context.addItemXref(contextPath+"/admin/collection?createNew&communityID=" + community.getID(), T_context_create_collection);
             }
-            
+
             // Only administrators can create communities
             if (AuthorizeManager.isAdmin(this.context))
             {
             	context.setHead(T_context_head);
-            	context.addItemXref(contextPath+"/admin/community?createNew&communityID=" + community.getID(), T_context_create_subcommunity);  	
+            	context.addItemXref(contextPath+"/admin/community?createNew&communityID=" + community.getID(), T_context_create_subcommunity);
             }
     	}
-    	
+
     	if ("community-list".equals(this.sitemapURI))
     	{
     		if (AuthorizeManager.isAdmin(this.context))
             {
             	context.setHead(T_context_head);
-    			context.addItemXref(contextPath+"/admin/community?createNew", T_context_create_community);    			
+    			context.addItemXref(contextPath+"/admin/community?createNew", T_context_create_community);
             }
     	}
-        
-        
+
+
         // System Administrator options!
         if (AuthorizeManager.isAdmin(this.context))
         {
 	        admin.setHead(T_administrative_head);
-	                
+
 	        List epeople = admin.addList("epeople");
 	        List registries = admin.addList("registries");
-	        
-	        epeople.setHead(T_administrative_access_control);	        
-	        epeople.addItemXref(contextPath+"/admin/epeople", T_administrative_people);	        
-	        epeople.addItemXref(contextPath+"/admin/groups", T_administrative_groups);	        
-	        epeople.addItemXref(contextPath+"/admin/authorize", T_administrative_authorizations);	        
-	        
-	        registries.setHead(T_administrative_registries);	        
-	        registries.addItemXref(contextPath+"/admin/metadata-registry",T_administrative_metadata);	        
-	        registries.addItemXref(contextPath+"/admin/format-registry",T_administrative_format);	        
-	        
-	        admin.addItemXref(contextPath+"/admin/item", T_administrative_items);	        
-            admin.addItemXref(contextPath+"/admin/withdrawn", T_administrative_withdrawn);	        
+
+	        epeople.setHead(T_administrative_access_control);
+	        epeople.addItemXref(contextPath+"/admin/epeople", T_administrative_people);
+	        epeople.addItemXref(contextPath+"/admin/groups", T_administrative_groups);
+	        epeople.addItemXref(contextPath+"/admin/authorize", T_administrative_authorizations);
+
+	        registries.setHead(T_administrative_registries);
+	        registries.addItemXref(contextPath+"/admin/metadata-registry",T_administrative_metadata);
+	        registries.addItemXref(contextPath+"/admin/format-registry",T_administrative_format);
+
+	        admin.addItemXref(contextPath+"/admin/item", T_administrative_items);
+            admin.addItemXref(contextPath+"/admin/withdrawn", T_administrative_withdrawn);
 	        admin.addItemXref(contextPath+"/admin/panel", T_administrative_control_panel);
+            admin.addItemXref(contextPath+"/statistics", T_statistics);
         }
     }
-    
-    
+
+
     public int addContextualOptions(List context) throws SQLException, WingException
     {
     	// How many options were added.
     	int options = 0;
-    	
+
     	DSpaceObject dso = URIUtil.resolve(objectModel);
     	
     	if (dso instanceof Item)

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/Navigation.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/Navigation.java	2008-09-09 11:17:33 UTC (rev 3101)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/Navigation.java	2008-09-09 12:45:34 UTC (rev 3102)
@@ -88,18 +88,6 @@
     private static final Message T_communities_and_collections =
         message("xmlui.ArtifactBrowser.Navigation.communities_and_collections");
     
-    private static final Message T_browse_titles =
-        message("xmlui.ArtifactBrowser.Navigation.browse_titles");
-    
-    private static final Message T_browse_authors = 
-        message("xmlui.ArtifactBrowser.Navigation.browse_authors");
-    
-    private static final Message T_browse_subjects = 
-        message("xmlui.ArtifactBrowser.Navigation.browse_subjects");
-    
-    private static final Message T_browse_dates = 
-        message("xmlui.ArtifactBrowser.Navigation.browse_dates");
-    
     private static final Message T_head_this_collection =
         message("xmlui.ArtifactBrowser.Navigation.head_this_collection");
     

Copied: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/StatisticsViewer.java (from rev 2955, branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/StatisticsViewer.java)
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/StatisticsViewer.java	                        (rev 0)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/StatisticsViewer.java	2008-09-09 12:45:34 UTC (rev 3102)
@@ -0,0 +1,640 @@
+/*
+ * Statistics.java
+ *
+ * Version: $Revision: 1.0 $
+ *
+ * Date: $Date: 2007/08/28 10:00:00 $
+ *
+ * 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.xmlui.aspect.artifactbrowser;
+
+import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
+import org.dspace.app.xmlui.wing.element.*;
+import org.dspace.app.xmlui.wing.element.List;
+import org.dspace.app.xmlui.wing.WingException;
+import org.dspace.app.xmlui.wing.Message;
+import org.dspace.app.xmlui.utils.UIException;
+import org.dspace.app.xmlui.utils.DSpaceValidity;
+import org.dspace.app.statistics.*;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.AuthorizeManager;
+import org.dspace.core.ConfigurationManager;
+import org.apache.cocoon.caching.CacheableProcessingComponent;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.excalibur.source.SourceValidity;
+import org.apache.log4j.Logger;
+import org.xml.sax.SAXException;
+
+import java.io.*;
+import java.io.File;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+
+/**
+ * Transformer to display statistics data in XML UI.
+ *
+ * Unlike the JSP interface that pre-generates HTML and stores in the reports folder,
+ * this class transforms the raw analysis data into a Wing representation
+ */
+public class StatisticsViewer extends AbstractDSpaceTransformer implements CacheableProcessingComponent
+{
+    private final static Logger log = Logger.getLogger(StatisticsViewer.class);
+
+    private final static Message T_dspace_home = message("xmlui.general.dspace_home");
+
+    private final static Message T_choose_report = message("xmlui.ArtifactBrowser.StatisticsViewer.choose_month");
+    private final static Message T_page_title    = message("xmlui.ArtifactBrowser.StatisticsViewer.report.title");
+
+    private final static Message T_empty_title   = message("xmlui.ArtifactBrowser.StatisticsViewer.no_report.title");
+    private final static Message T_empty_text    = message("xmlui.ArtifactBrowser.StatisticsViewer.no_report.text");
+
+    private final static SimpleDateFormat sdfDisplay = new SimpleDateFormat("MM'/'yyyy");
+    private final static SimpleDateFormat sdfLink    = new SimpleDateFormat("yyyy'-'M");
+
+    private boolean initialised = false;
+    private String reportDate = null;
+    private SourceValidity validity;
+
+    /**
+     * Get the caching key for this report
+     * @return
+     */
+    public Serializable getKey()
+    {
+        initialise();
+
+        if (reportDate != null)
+            return reportDate;
+
+        return "general";
+    }
+
+    /**
+     * Generate the validity for this cached entry
+     * @return
+     */
+    public SourceValidity getValidity()
+    {
+        if (validity == null)
+        {
+            try
+            {
+                initialise();
+                boolean showReport = ConfigurationManager.getBooleanProperty("report.public");
+
+                // If the report isn't public
+                if (!showReport)
+                {
+                    try
+                    {
+                        // Administrators can always view reports
+                        showReport = AuthorizeManager.isAdmin(context);
+                    }
+                    catch (SQLException sqle)
+                    {
+                        log.error("Unable to check for administrator", sqle);
+                    }
+                }
+
+                // Only generate a validity if the report is visible
+                if (showReport)
+                {
+                    File analysisFile = null;
+
+                    // Get a file for the report data
+                    if (reportDate != null)
+                        analysisFile = StatisticsLoader.getAnalysisFor(reportDate);
+                    else
+                        analysisFile = StatisticsLoader.getGeneralAnalysis();
+
+                    if (analysisFile != null)
+                    {
+                        // Generate the validity based on the properties of the report data file
+                        DSpaceValidity newValidity = new DSpaceValidity();
+                        newValidity.add(Long.toString(analysisFile.lastModified()));
+                        newValidity.add("-");
+                        newValidity.add(Long.toString(analysisFile.length()));
+                        validity = newValidity.complete();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                
+            }
+        }
+
+        return validity;
+    }
+
+    /**
+     * Add additional navigation options. This is to allow selection of a monthly report
+     * 
+     * @param options
+     * @throws SAXException
+     * @throws WingException
+     * @throws UIException
+     * @throws SQLException
+     * @throws IOException
+     * @throws AuthorizeException
+     */
+    public void addOptions(Options options) throws SAXException, WingException,
+            UIException, SQLException, IOException, AuthorizeException
+    {
+        Date[] monthlyDates = StatisticsLoader.getMonthlyAnalysisDates();
+
+        if (monthlyDates != null && monthlyDates.length > 0)
+        {
+            List statList = options.addList("statsreports");
+            statList.setHead(T_choose_report);
+
+            HashMap<String, String> params = new HashMap<String, String>();
+            for (Date date : monthlyDates)
+            {
+                params.put("date", sdfLink.format(date));
+                statList.addItemXref(super.generateURL("statistics", params), sdfDisplay.format(date));
+            }
+        }
+    }
+
+    /**
+     * Add title, etc. metadata
+     * 
+     * @param pageMeta
+     * @throws SAXException
+     * @throws WingException
+     * @throws UIException
+     * @throws SQLException
+     * @throws IOException
+     * @throws AuthorizeException
+     */
+    public void addPageMeta(PageMeta pageMeta) throws SAXException, WingException, UIException,
+                                                      SQLException, IOException, AuthorizeException
+    {
+        initialise();
+
+        pageMeta.addMetadata("title").addContent(T_page_title);
+        pageMeta.addTrailLink(contextPath + "/", T_dspace_home);
+        pageMeta.addTrail().addContent(T_page_title);
+    }
+
+    /**
+     * Output the body of the report
+     * 
+     * @param body
+     * @throws SAXException
+     * @throws WingException
+     * @throws UIException
+     * @throws SQLException
+     * @throws IOException
+     * @throws AuthorizeException
+     */
+    public void addBody(Body body) throws SAXException, WingException, UIException, SQLException,
+            IOException, AuthorizeException
+    {
+        initialise();
+        boolean publicise = ConfigurationManager.getBooleanProperty("report.public");
+
+        // Check that the reports are either public, or user is an administrator
+        if (!publicise && !AuthorizeManager.isAdmin(context))
+            throw new AuthorizeException();
+
+        // Retrieve the report data to display
+        File analysisFile;
+        if (reportDate != null)
+            analysisFile = StatisticsLoader.getAnalysisFor(reportDate);
+        else
+            analysisFile = StatisticsLoader.getGeneralAnalysis();
+
+        // Create the renderer for the results
+        Division div = body.addDivision("statistics", "primary");
+
+        if (analysisFile != null)
+        {
+            try
+            {
+                // Generate the XML stream
+                Report myRep = new XMLUIReport(div);
+                ReportGenerator.processReport(context, myRep, analysisFile.getCanonicalPath());
+            }
+            catch (Exception e)
+            {
+                throw new UIException(e);
+            }
+        }
+        else
+        {
+            div.setHead(T_empty_title);
+            div.addPara(T_empty_text);
+        }
+    }
+
+    /**
+     * Initialise the member variables from the request
+     */
+    private void initialise()
+    {
+        if (!initialised)
+        {
+            Request request = ObjectModelHelper.getRequest(objectModel);
+            reportDate = (String) request.getParameter("date");
+
+            initialised = true;
+        }
+    }
+
+    /**
+     * Clear the member variables so that the instance can be reused
+     */
+    public void recycle()
+    {
+        initialised = false;
+        reportDate = null;
+        validity = null;
+        super.recycle();
+    }
+
+    /**
+     * Implementation of the Report interface, to output the statistics data for xmlui
+     * Note that all methods that return Strings return 'null' in this implementation, as
+     * all the outputting is done directly using the Wing framework.
+     */
+    class XMLUIReport implements Report
+    {
+        private ArrayList<Statistics> blocks = new ArrayList<Statistics>();
+
+        private String mainTitle = null;
+        private String pageTitle = null;
+
+        /** start date for report */
+        private Date start = null;
+
+        /** end date for report */
+        private Date end = null;
+
+        private Division rootDiv;
+        private Division currDiv;
+
+        /**
+         * Hide the default constructor, so that you have to pass in a Division
+         */
+        private XMLUIReport() {}
+
+        /**
+         * Create instance, providing the Wing element that we will be adding to
+         *
+         * @param myDiv
+         */
+        public  XMLUIReport(Division myDiv)
+        {
+            rootDiv = myDiv;
+            currDiv = myDiv;
+        }
+
+        /**
+         * Get the header for the report - currently not supported
+         *
+         * @return
+         */
+        public String header()
+        {
+            return header("");
+        }
+
+        // Currently not supported
+        public String header(String title)
+        {
+            return "";
+        }
+
+        /**
+         * Add the main title to the report
+         * @return
+         */
+        public String mainTitle()
+        {
+            try
+            {
+                rootDiv.setHead(mainTitle);
+            }
+            catch (WingException we)
+            {
+                log.error("Error creating XML for report", we);
+            }
+            return null;
+        }
+
+        /**
+         * Output the date range for this report
+         * @return
+         */
+        public String dateRange()
+        {
+            StringBuilder content = new StringBuilder();
+            DateFormat df = DateFormat.getDateInstance();
+            if (start != null)
+            {
+                content.append(df.format(start));
+            }
+            else
+            {
+                content.append("from start of records ");
+            }
+
+            content.append(" to ");
+
+            if (end != null)
+            {
+                content.append(df.format(end));
+            }
+            else
+            {
+                content.append(" end of records");
+            }
+
+            try
+            {
+                rootDiv.addDivision("reportDate").addPara(content.toString());
+            }
+            catch (WingException we)
+            {
+                log.error("Error creating XML for report", we);
+            }
+
+            return null;
+        }
+
+        /**
+         * Output the section header
+         * @param title
+         * @return
+         */
+        public String sectionHeader(String title)
+        {
+            try
+            {
+                currDiv.setHead(title);
+            }
+            catch (WingException we)
+            {
+                log.error("Error creating XML for report", we);
+            }
+
+            return null;
+        }
+
+        /**
+         * Output the current statistics block
+         * @param content
+         * @return
+         */
+        public String statBlock(Statistics content)
+        {
+            Stat[] stats = content.getStats();
+            try
+            {
+                int rows = stats.length;
+                if (content.getStatName() != null || content.getResultName() != null)
+                    rows++;
+
+                Table block = currDiv.addTable("reportBlock", rows, 2);
+
+                // prepare the table headers
+                if (content.getStatName() != null || content.getResultName() != null)
+                {
+                    Row row = block.addRow();
+                    if (content.getStatName() != null)
+                    {
+                        row.addCellContent(content.getStatName());
+                    }
+                    else
+                    {
+                        row.addCellContent("&nbsp;");
+                    }
+
+                    if (content.getResultName() != null)
+                    {
+                        row.addCellContent(content.getResultName());
+                    }
+                    else
+                    {
+                        row.addCellContent("&nbsp;");
+                    }
+                }
+
+                // output the statistics in the table
+                for (int i = 0; i < stats.length; i++)
+                {
+                    Row row = block.addRow();
+                    if (stats[i].getReference() != null)
+                    {
+                        row.addCell().addXref(stats[i].getReference()).addContent(stats[i].getKey());
+                    }
+                    else
+                    {
+                        row.addCell().addContent(stats[i].getKey());
+                    }
+
+                    if (stats[i].getUnits() != null)
+                    {
+                        row.addCell(null, null, "right").addContent(stats[i].getValue() + " " + stats[i].getUnits());
+                    }
+                    else
+                    {
+                        row.addCell(null, null, "right").addContent(ReportTools.numberFormat(stats[i].getValue()));
+                    }
+                }
+            }
+            catch (WingException we)
+            {
+                log.error("Error creating XML for report", we);
+            }
+
+            return null;
+        }
+
+        /**
+         * Output any information about the lower boundary restriction for this section
+         * @param floor
+         * @return
+         */
+        public String floorInfo(int floor)
+        {
+            try
+            {
+                if (floor > 0)
+                {
+                    currDiv.addDivision("reportFloor").addPara("(more than " + ReportTools.numberFormat(floor) + " times)");
+                }
+            }
+            catch (WingException we)
+            {
+                log.error("Error creating XML for report", we);
+            }
+
+            return null;
+        }
+
+        /**
+         * Output an explanation for this section
+         * 
+         * @param explanation
+         * @return
+         */
+        public String blockExplanation(String explanation)
+        {
+            try
+            {
+                if (explanation != null)
+                {
+                    currDiv.addDivision("reportExplanation").addPara(explanation);
+                }
+            }
+            catch (WingException we)
+            {
+                log.error("Error creating XML for report", we);
+            }
+
+            return null;
+        }
+
+        /**
+         * Output the footer
+         * 
+         * @return
+         */
+        public String footer()
+        {
+            return "";
+        }
+
+        /**
+         * Set the main title for this report
+         * 
+         * @param name
+         * @param serverName
+         */
+        public void setMainTitle(String name, String serverName)
+        {
+            mainTitle = "Statistics for " + name;
+
+            if (ConfigurationManager.getBooleanProperty("report.show.server", true))
+                mainTitle += " on " + serverName;
+            
+            if (pageTitle == null)
+            {
+                pageTitle = mainTitle;
+            }
+            return;
+        }
+
+        /**
+         * Add a block to report on
+         *
+         * @param stat
+         */
+        public void addBlock(Statistics stat)
+        {
+            blocks.add(stat);
+            return;
+        }
+
+        /**
+         * Render the statistics into an XML stream
+         * @return
+         */
+        public String render()
+        {
+            Pattern space = Pattern.compile(" ");
+
+            // Output the heading information
+            header(pageTitle);
+            mainTitle();
+            dateRange();
+
+            // Loop through all the sections
+            for (Statistics stats : blocks)
+            {
+                // navigation();
+                try
+                {
+                    String title = stats.getSectionHeader();
+                    String aName = title.toLowerCase();
+                    Matcher matchSpace = space.matcher(aName);
+                    aName = matchSpace.replaceAll("_");
+
+                    // Create a new division for each section
+                    currDiv = rootDiv.addDivision(aName);
+                    sectionHeader(title);
+                    // topLink();
+                    blockExplanation(stats.getExplanation());
+                    floorInfo(stats.getFloor());
+                    statBlock(stats);
+                    currDiv = rootDiv;
+                }
+                catch (WingException we)
+                {
+                    log.error("Error creating XML for report", we);
+                }
+            }
+
+            return null;
+        }
+
+        /**
+         * Set the start date for this report
+         * @param start
+         */
+        public void setStartDate(Date start)
+        {
+            this.start = start;
+        }
+
+        /**
+         * Set the end date for this report
+         * @param end
+         */
+        public void setEndDate(Date end)
+        {
+            this.end = end;
+        }
+    }
+}

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap	2008-09-09 11:17:33 UTC (rev 3101)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap	2008-09-09 12:45:34 UTC (rev 3102)
@@ -64,15 +64,15 @@
 			<map:transformer name="Contact" src="org.dspace.app.xmlui.aspect.artifactbrowser.Contact"/>
 			<map:transformer name="RestrictedItem" src="org.dspace.app.xmlui.aspect.artifactbrowser.RestrictedItem"/>
 			<map:transformer name="FrontPageSearch" src="org.dspace.app.xmlui.aspect.artifactbrowser.FrontPageSearch"/>
-		</map:transformers>
+            <map:transformer name="Statistics" src="org.dspace.app.xmlui.aspect.artifactbrowser.StatisticsViewer"/>
+        </map:transformers>
 
-
 		<map:matchers default="wildcard">
 			<map:matcher name="HandleTypeMatcher" src="org.dspace.app.xmlui.aspect.general.HandleTypeMatcher"/>
 			<map:matcher name="HandleAuthorizedMatcher" src="org.dspace.app.xmlui.aspect.general.HandleAuthorizedMatcher"/>
 		</map:matchers>
-		
-		
+
+
 		<map:actions>
 			<map:action name="SendFeedbackAction" src="org.dspace.app.xmlui.aspect.artifactbrowser.SendFeedbackAction"/>
 		</map:actions>
@@ -81,49 +81,49 @@
     <map:selectors>
     	<map:selector name="AuthenticatedSelector" src="org.dspace.app.xmlui.aspect.general.AuthenticatedSelector"/>
     </map:selectors>
-		
+
 	</map:components>
 	<map:pipelines>
 		<map:pipeline>
-			
-			
+
+
 			<map:generate/>
-			
-			<!-- 
+
+			<!--
 					Add the basic navigation content to everypage. This includes:
-					
-					1) Metadata about the current page (really just what the current 
+
+					1) Metadata about the current page (really just what the current
 					   context path is)
 					2) Navigation links to browse the repository.
-					   - This includes links that are relative to the currently 
+					   - This includes links that are relative to the currently
 					     selected community or collection.
 					3) Metadata about the search urls.
 					-->
 			<map:transform type="Navigation"/>
-			
-			
+
+
 			<!--
-					Display the DSpace homepage. This includes the news.xml file 
-					along with a list of top level communities in DSpace. 
+					Display the DSpace homepage. This includes the news.xml file
+					along with a list of top level communities in DSpace.
 					-->
 			<map:match pattern="">
-			    <!-- 
+			    <!--
 			    	DSpacePropertyFileReader will read the DSpace property file and
-			    	place the selected properties' value in this scope 
+			    	place the selected properties' value in this scope
 			    -->
 				<map:act type="DSpacePropertyFileReader">
 					<map:parameter name="dspace.dir" value="dspace.dir" />
-					<map:transform type="Include" src="file://{dspace.dir}/config/news-xmlui.xml" /> 
-				</map:act>				
-				
+					<map:transform type="Include" src="file://{dspace.dir}/config/news-xmlui.xml" />
+				</map:act>
+
 				<map:transform type="FrontPageSearch"/>
 				<map:transform type="CommunityBrowser">
 					<map:parameter name="depth" value="1"/>
 				</map:transform>
 				<map:serialize type="xml"/>
 			</map:match>
-			
-			
+
+
 			<!-- List all communities & collections in DSpace -->
 			<map:match pattern="community-list">
 				<map:transform type="CommunityBrowser">
@@ -131,33 +131,33 @@
 				</map:transform>
 				<map:serialize type="xml"/>
 			</map:match>
-	
-			
+
+
 			<!-- Search -->
 			<map:match pattern="search">
 				<map:transform type="SimpleSearch"/>
 				<map:serialize type="xml"/>
-			</map:match>		
+			</map:match>
 			<map:match pattern="simple-search">
 				<map:transform type="SimpleSearch"/>
 				<map:serialize type="xml"/>
-			</map:match>	
+			</map:match>
 			<map:match pattern="advanced-search">
 				<map:transform type="AdvancedSearch"/>
 				<map:serialize type="xml"/>
-			</map:match>	
-			
-			
+			</map:match>
+
+
 			<!-- Browse (by anything) -->
 			<map:match pattern="browse">
 				<map:transform type="ConfigurableBrowse"/>
 				<map:serialize type="xml"/>
 			</map:match>
-			
+
 			  <!-- restricted resource -->
 			<map:match pattern="restricted-resource">
 				<map:transform type="RestrictedItem"/>
-				<map:serialize type="xml"/>	
+				<map:serialize type="xml"/>
 			</map:match>
 
             <!-- general identifier features -->
@@ -244,6 +244,12 @@
 			<!-- Handle specific features (legacy) -->
 			<map:match pattern="handle/*/**">
 
+                <!-- Display statistics -->
+                <map:match pattern="statistics">
+                    <map:transform type="Statistics"/>
+                    <map:serialize type="xml"/>
+                </map:match>
+
 				<!-- Inform the user that the item they are viewing is a restricted resource -->
 				<map:match pattern="handle/*/*/restricted-resource">
 					<map:transform type="RestrictedItem"/>

Modified: trunk/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml	2008-09-09 11:17:33 UTC (rev 3101)
+++ trunk/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/i18n/messages.xml	2008-09-09 12:45:34 UTC (rev 3102)
@@ -158,14 +158,14 @@
    <message key="xmlui.ArtifactBrowser.AdvancedSearch.and">AND</message>
    <message key="xmlui.ArtifactBrowser.AdvancedSearch.or">OR</message>
    <message key="xmlui.ArtifactBrowser.AdvancedSearch.not">NOT</message>
-	
-	
+
+
 	<!-- org.dspace.app.xmlui.artifactbrowser.ConfigureableBrowse.java -->
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.general.starts_with">Or enter first few letters:</message>
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.general.starts_with_help">Browse for items that begin with these letters</message>
-	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.general.jump_select">Jump to a point in the index:</message>	
-	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.general.choose_month">(Choose month)</message>	
-	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.general.choose_year">(Choose year)</message>	
+	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.general.jump_select">Jump to a point in the index:</message>
+	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.general.choose_month">(Choose month)</message>
+	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.general.choose_year">(Choose year)</message>
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.general.jump_year">Or type in a year: </message>
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.general.jump_year_help">Browse for items that are from the given year.</message>
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.general.sort_by"> Sort by: </message>
@@ -190,17 +190,17 @@
 
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.title.metadata.subject">Browsing {0} by Subject {1}</message>
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.trail.metadata.subject">Browsing {0} by Subject</message>
-	
+
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.title.item.title">Browsing {0} by Title {1}</message>
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.trail.item.title">Browsing {0} by Title</message>
-	
+
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.title.item.dateissued">Browsing {0} by Issue Date {1}</message>
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.trail.item.dateissued">Browsing {0} by Issue Date</message>
 
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.title.item.dateaccessioned">Browsing {0} by Submit Date {1}</message>
 	<message key="xmlui.ArtifactBrowser.ConfigurableBrowse.trail.item.dateaccessioned">Browsing {0} by Submit Date</message>
 
-	
+
 	<!-- org.dspace.app.xmlui.artifactbrowser.CollectionViewer.java -->
 	<message key="xmlui.ArtifactBrowser.CollectionViewer.search_scope">Search Scope</message>
 	<message key="xmlui.ArtifactBrowser.CollectionViewer.all_of_dspace">All of DSpace</message>
@@ -211,7 +211,7 @@
 	<message key="xmlui.ArtifactBrowser.CollectionViewer.browse_dates">Dates</message>
 	<message key="xmlui.ArtifactBrowser.CollectionViewer.advanced_search_link">Advanced Search</message>
 	<message key="xmlui.ArtifactBrowser.CollectionViewer.head_recent_submissions">Recent Submissions</message>
-	
+
 	<!-- org.dspace.app.xmlui.artifactbrowser.CommunityBrowser.java -->
 	<message key="xmlui.ArtifactBrowser.CommunityBrowser.title">Community List</message>
 	<message key="xmlui.ArtifactBrowser.CommunityBrowser.trail">Community List</message>
@@ -230,8 +230,8 @@
 	<message key="xmlui.ArtifactBrowser.CommunityViewer.head_sub_communities">Sub-communities within this community</message>
 	<message key="xmlui.ArtifactBrowser.CommunityViewer.head_sub_collections">Collections in this community</message>
 	<message key="xmlui.ArtifactBrowser.CommunityViewer.head_recent_submissions">Recent Submissions</message>
-	
-	
+
+
 	<!-- org.dspace.app.xmlui.artifactbrowser.Contact.java -->
 	<message key="xmlui.ArtifactBrowser.Contact.title">Contact us</message>
 	<message key="xmlui.ArtifactBrowser.Contact.trail">Contact us</message>
@@ -240,7 +240,7 @@
 	<message key="xmlui.ArtifactBrowser.Contact.feedback_label">On-line form</message>
 	<message key="xmlui.ArtifactBrowser.Contact.feedback_link">Feedback</message>
 	<message key="xmlui.ArtifactBrowser.Contact.email">Email</message>
-	
+
 	<!-- org.dspace.app.xmlui.artifactbrowser.FeedbackForm.java -->
 	<message key="xmlui.ArtifactBrowser.FeedbackForm.title">Give feedback</message>
 	<message key="xmlui.ArtifactBrowser.FeedbackForm.trail">Give feedback</message>
@@ -250,23 +250,23 @@
 	<message key="xmlui.ArtifactBrowser.FeedbackForm.email_help">This address will be used to follow up on your feedback.</message>
 	<message key="xmlui.ArtifactBrowser.FeedbackForm.comments">Comments</message>
 	<message key="xmlui.ArtifactBrowser.FeedbackForm.submit">Send Feedback</message>
-	
+
 	<!-- org.dspace.app.xmlui.artifactbrowser.FeedbackSent.java -->
 	<message key="xmlui.ArtifactBrowser.FeedbackSent.title">Give feedback</message>
 	<message key="xmlui.ArtifactBrowser.FeedbackSent.trail">Give feedback</message>
 	<message key="xmlui.ArtifactBrowser.FeedbackSent.head">Feedback sent</message>
 	<message key="xmlui.ArtifactBrowser.FeedbackSent.para1">Your comments have been received.</message>
-	
+
 	<!-- org.dspace.app.xmlui.artifactbrowser.FrontPageSearch.java -->
 	<message key="xmlui.ArtifactBrowser.FrontPageSearch.head">Search DSpace</message>
 	<message key="xmlui.ArtifactBrowser.FrontPageSearch.para1">Enter some text in the box below to search DSpace.</message>
-	
+
 	<!-- org.dspace.app.xmlui.artifactbrowser.ItemViewer.java -->
 	<message key="xmlui.ArtifactBrowser.ItemViewer.trail">View Item</message>
 	<message key="xmlui.ArtifactBrowser.ItemViewer.head_parent_collections">This item appears in the following Collection(s)</message>
 	<message key="xmlui.ArtifactBrowser.ItemViewer.show_simple">Show simple item record</message>
 	<message key="xmlui.ArtifactBrowser.ItemViewer.show_full">Show full item record</message>
-	
+
 	<!-- org.dspace.app.xmlui.artifactbrowser.Navigation.java -->
 	<message key="xmlui.ArtifactBrowser.Navigation.head_browse">Browse</message>
 	<message key="xmlui.ArtifactBrowser.Navigation.head_all_of_dspace">All of DSpace</message>
@@ -278,14 +278,14 @@
 	<message key="xmlui.ArtifactBrowser.Navigation.browse_dateaccessioned">By Submit Date</message>
 	<message key="xmlui.ArtifactBrowser.Navigation.head_this_collection">This Collection</message>
 	<message key="xmlui.ArtifactBrowser.Navigation.head_this_community">This Community</message>
-	
+
 	<!-- org.dspace.app.xmlui.artifactbrowser.SimpleSearch.java -->
 	<message key="xmlui.ArtifactBrowser.SimpleSearch.title">Search</message>
 	<message key="xmlui.ArtifactBrowser.SimpleSearch.trail">Search</message>
 	<message key="xmlui.ArtifactBrowser.SimpleSearch.head">Search</message>
 	<message key="xmlui.ArtifactBrowser.SimpleSearch.search_scope">Search Scope</message>
 	<message key="xmlui.ArtifactBrowser.SimpleSearch.full_text_search">Full Text Search</message>
-	
+
 	<!-- org.dspace.app.xmlui.artifactbrowser.RestrictedItem.java -->
 	<message key="xmlui.ArtifactBrowser.RestrictedItem.title">This resource is restricted</message>
 	<message key="xmlui.ArtifactBrowser.RestrictedItem.trail">Restricted</message>
@@ -305,9 +305,9 @@
 	<message key="xmlui.ArtifactBrowser.RestrictedItem.type_item">item</message>
 	<message key="xmlui.ArtifactBrowser.RestrictedItem.type_resource">resource</message>
 	<message key="xmlui.ArtifactBrowser.RestrictedItem.unknown">unknown</message>
-	
+
 	<!-- Authentication messages used at the top of the login page:  -->
-	<message key="xmlui.ArtifactBrowser.RestrictedItem.auth_header">The item is restricted</message>	
+	<message key="xmlui.ArtifactBrowser.RestrictedItem.auth_header">The item is restricted</message>
 	<message key="xmlui.ArtifactBrowser.RestrictedItem.auth_message">The item you are attempting to access is a restricted item and requires credentials to view. Please login below to access the item.</message>
 
     <message key="xmlui.ArtifactBrowser.StatisticsViewer.choose_month">Monthly Reports</message>
@@ -317,34 +317,34 @@
     <message key="xmlui.ArtifactBrowser.StatisticsViewer.no_report.text">There are currently no reports available for this service.  Please check back later.</message>
 
     <!-- Authentication messages used for bitstream authentication -->
-	<message key="xmlui.BitstreamReader.auth_header">The file is restricted</message>	
+	<message key="xmlui.BitstreamReader.auth_header">The file is restricted</message>
 	<message key="xmlui.BitstreamReader.auth_message">The file you are attempting to access is a restricted file and requires credentials to view. Please login below to access the file.</message>
-	
+
 	<!-- Export Archive download messages -->
 	<message key="xmlui.ItemExportDownloadReader.auth_header">This export archive is restricted.</message>
 	<message key="xmlui.ItemExportDownloadReader.auth_message">The export archive you are attempting to access is a restricted resource and requires credentials to view. Please login below to access the export archive.</message>
 
 	<!--!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-		
+
 		                EPerson Aspect
-		
+
 		!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!-->
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
 	<!-- General keys used by the EPerson aspect -->
 	<message key="xmlui.EPerson.trail_new_registration">New user registration</message>
 	<message key="xmlui.EPerson.trail_forgot_password">Forgot Password</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.CannotRegister.java -->
 	<message key="xmlui.EPerson.CannotRegister.title">Registration unavailable</message>
 	<message key="xmlui.EPerson.CannotRegister.head">Registration unavailable</message>
 	<message key="xmlui.EPerson.CannotRegister.para1">The configuration of this DSpace repository does not allow registration in this context. Please contact the <a href="../contact">site administrator</a> with questions or comments.</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.EditProfile.java -->
 	<message key="xmlui.EPerson.EditProfile.title_update">Update Profile</message>
 	<message key="xmlui.EPerson.EditProfile.title_create">Create Profile</message>
@@ -369,7 +369,7 @@
 	<message key="xmlui.EPerson.EditProfile.error_invalid_password">Choose a password at least 6 characters long</message>
 	<message key="xmlui.EPerson.EditProfile.error_unconfirmed_password">Please retype your password to confirm</message>
 	<message key="xmlui.EPerson.EditProfile.head_auth">Authorization groups you belong to</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.EPersonUtils.java -->
 	<message key="xmlui.EPerson.EPersonUtils.register_verify_email">Verify Email</message>
 	<message key="xmlui.EPerson.EPersonUtils.register_create_profile">Create Profile</message>
@@ -382,14 +382,14 @@
 	<message key="xmlui.EPerson.ForgotPasswordFinished.title">Password reset</message>
 	<message key="xmlui.EPerson.ForgotPasswordFinished.head">Password reset</message>
 	<message key="xmlui.EPerson.ForgotPasswordFinished.para1">Your password has been reset.</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.InvalidToken.java -->
 	<message key="xmlui.EPerson.InvalidToken.title">Invalid token</message>
 	<message key="xmlui.EPerson.InvalidToken.trail">Invalid token</message>
 	<message key="xmlui.EPerson.InvalidToken.head">Invalid token</message>
 	<message key="xmlui.EPerson.InvalidToken.para1">The URL you provided is invalid. The URL may have been broken across multiple lines in your email client, like this:</message>
 	<message key="xmlui.EPerson.InvalidToken.para2">If so, copy and paste the entire URL directly into your browser's address bar, rather than simply clicking on the link. The address bar should then contain something like:</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.Navigation.java -->
 	<message key="xmlui.EPerson.Navigation.my_account">My Account</message>
 	<message key="xmlui.EPerson.Navigation.profile">Profile</message>
@@ -410,7 +410,7 @@
 	<message key="xmlui.EPerson.PasswordLogin.head2">Register new user</message>
 	<message key="xmlui.EPerson.PasswordLogin.para1">Register an account to subscribe to collections for email updates, and submit new items to DSpace.</message>
 	<message key="xmlui.EPerson.PasswordLogin.register_link">Click here to register.</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.LDAPLogin.java -->
 	<message key="xmlui.EPerson.LDAPLogin.title">Sign in</message>
 	<message key="xmlui.EPerson.LDAPLogin.trail">Sign in</message>
@@ -420,7 +420,7 @@
 	<message key="xmlui.EPerson.LDAPLogin.error_bad_login">The user name and/or password supplied were not valid.</message>
 	<message key="xmlui.EPerson.LDAPLogin.password">Password</message>
 	<message key="xmlui.EPerson.LDAPLogin.submit">Sign in</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.LoginChooser.java -->
 	<message key="xmlui.EPerson.LoginChooser.title">Choose a Login Method</message>
 	<message key="xmlui.EPerson.LoginChooser.trail">Choose Login</message>
@@ -438,24 +438,24 @@
 	<message key="xmlui.EPerson.FailedAuthentication.title">Authentication Failed</message>
     <message key="xmlui.EPerson.FailedAuthentication.trail">Failed Authentication</message>
     <message key="xmlui.EPerson.FailedAuthentication.h1">Authentication Failed</message>
-	
+
 	<!-- Login xml files -->
 	<message key="xmlui.eperson.noAuthMethod.head">No Authentication Method Found</message>
 	<message key="xmlui.eperson.noAuthMethod.p1">No authentication method was found.  Please contact the site administrator.</message>
 	<message key="xmlui.eperson.shibbLoginFailure.head">Shibboleth Login Failed</message>
 	<message key="xmlui.eperson.shibbLoginFailure.p1">Shibboleth authentication not available at this time. Please contact the site administrator.</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.ProfileUpdated.java -->
 	<message key="xmlui.EPerson.ProfileUpdated.title">Profile updated</message>
 	<message key="xmlui.EPerson.ProfileUpdated.trail">Update profile</message>
 	<message key="xmlui.EPerson.ProfileUpdated.head">Profile updated</message>
 	<message key="xmlui.EPerson.ProfileUpdated.para1">Your profile information has been updated.</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.RegistrationFinished.java -->
 	<message key="xmlui.EPerson.RegistrationFinished.title">Registration finished</message>
 	<message key="xmlui.EPerson.RegistrationFinished.head">Registration Finished</message>
 	<message key="xmlui.EPerson.RegistrationFinished.para1">You're now registered to use the DSpace system.  You can subscribe to collections to receive email updates about new items.</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.ResetPassword.java -->
 	<message key="xmlui.EPerson.ResetPassword.title">Reset password</message>
 	<message key="xmlui.EPerson.ResetPassword.head">Reset password</message>
@@ -466,7 +466,7 @@
 	<message key="xmlui.EPerson.ResetPassword.submit">Reset password</message>
 	<message key="xmlui.EPerson.ResetPassword.error_invalid_password">Choose a password at least 6 characters long</message>
 	<message key="xmlui.EPerson.ResetPassword.error_unconfirmed_password">Please retype your password to confirm</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.StartForgotPassword.java -->
 	<message key="xmlui.EPerson.StartForgotPassword.title">Forgot Password</message>
 	<message key="xmlui.EPerson.StartForgotPassword.head">Forgot Password</message>
@@ -475,7 +475,7 @@
 	<message key="xmlui.EPerson.StartForgotPassword.email_address_help">Enter the same address used when registering.</message>
 	<message key="xmlui.EPerson.StartForgotPassword.error_not_found">Email address not found.</message>
 	<message key="xmlui.EPerson.StartForgotPassword.submit">Send info</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.StartRegistration.java -->
 	<message key="xmlui.EPerson.StartRegistration.title">New user registration</message>
 	<message key="xmlui.EPerson.StartRegistration.head1">Email already in use</message>
@@ -488,7 +488,7 @@
 	<message key="xmlui.EPerson.StartRegistration.email_address_help">This address will be verified and used as your login name.</message>
 	<message key="xmlui.EPerson.StartRegistration.error_bad_email">Unable to send email to this address.</message>
 	<message key="xmlui.EPerson.StartRegistration.submit_register">Register</message>
-	
+
 	<!-- org.dspace.app.xmlui.eperson.VerifyEmail.java -->
 	<message key="xmlui.EPerson.VerifyEmail.title">Verification email sent</message>
 	<message key="xmlui.EPerson.VerifyEmail.head">Verification email sent</message>
@@ -500,23 +500,23 @@
 
 
 	<!--!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-		
+
 		               Submission Aspect
-		
-		!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!-->	
-	
-	
 
+		!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!-->
 
 
 
 
+
+
+
 	<!-- general submission aspect messages -->
 	<message key="xmlui.Submission.general.mydspace_home">MyDSpace Home</message>
 	<message key="xmlui.Submission.general.go_mydspace">Go to MyDSpace Home</message>
 	<message key="xmlui.Submission.general.submission.title">Item submission</message>
 	<message key="xmlui.Submission.general.submission.trail">Item submission</message>
-	<message key="xmlui.Submission.general.submission.head">Item submission</message>	
+	<message key="xmlui.Submission.general.submission.head">Item submission</message>
 	<message key="xmlui.Submission.general.submission.previous">&lt; Previous</message>
 	<message key="xmlui.Submission.general.submission.save">Save &amp; Exit</message>
 	<message key="xmlui.Submission.general.submission.next">Next &gt;</message>
@@ -528,14 +528,14 @@
 	<message key="xmlui.Submission.general.showsimple">Show simple item record</message>
 	<message key="xmlui.Submission.general.default.title">Submission</message>
 	<message key="xmlui.Submission.general.default.trail">Submission</message>
-	
+
 	<!-- org.dspace.app.xmlui.submission.CollectiovViewer -->
 	<message key="xmlui.Submission.CollectionViewer.link1">Submit a new item to this collection</message>
-	
+
 	<!-- org.dspace.app.xmlui.submission.Navigation -->
 	<message key="xmlui.Submission.Navigation.submissions">Submissions</message>
 
-	
+
 	<!-- org.dspace.app.xmlui.Submission.submissions -->
 	<message key="xmlui.Submission.Submissions.title">Submissions &amp; Workflow</message>
 	<message key="xmlui.Submission.Submissions.trail">Submissions</message>
@@ -598,7 +598,7 @@
 	<message key="xmlui.Submission.submit.progressbar.creative-commons">Creative Commons</message>
 	<message key="xmlui.Submission.submit.progressbar.license">License</message>
 	<message key="xmlui.Submission.submit.progressbar.complete">Complete</message>
-	
+
 	<!-- org.dspace.app.xmlui.Submission.submit.ResumeStep -->
 	<message key="xmlui.Submission.submit.ResumeStep.submit_resume">Resume</message>
 
@@ -615,7 +615,7 @@
 	<message key="xmlui.Submission.submit.SaveOrRemoveStep.submit_save">Save it, I'll work on it later</message>
 	<message key="xmlui.Submission.submit.SaveOrRemoveStep.submit_remove">Remove the submission</message>
 
-	
+
 	<!-- org.dpspace.app.xmlui.Submission.submit.InitialQuestionsStep -->
 	<message key="xmlui.Submission.submit.InitialQuestionsStep.head">Initial Questions</message>
 	<message key="xmlui.Submission.submit.InitialQuestionsStep.important_note">Important Note: </message>
@@ -632,7 +632,7 @@
 	<message key="xmlui.Submission.submit.InitialQuestionsStep.date_issued">Date Issued</message>
 	<message key="xmlui.Submission.submit.InitialQuestionsStep.citation">Citation</message>
 	<message key="xmlui.Submission.submit.InitialQuestionsStep.publisher">Publisher</message>
-	
+
 	<!-- org.dspace.app.xmlui.Submission.submit.DescribeStep -->
 	<message key="xmlui.Submission.submit.DescribeStep.head">Describe Item</message>
 	<message key="xmlui.Submission.submit.DescribeStep.unknown_field">Error: Unknown field type</message>
@@ -669,7 +669,7 @@
 	<message key="xmlui.Submission.submit.UploadStep.submit_edit">Edit</message>
 	<message key="xmlui.Submission.submit.UploadStep.checksum">File checksum:</message>
 	<message key="xmlui.Submission.submit.UploadStep.submit_remove">Remove selected files</message>
-	
+
 	<!-- org.dspace.app.xmlui.Submission.submit.EditFileStep -->
 	<message key="xmlui.Submission.submit.EditFileStep.head">Edit File</message>
 	<message key="xmlui.Submission.submit.EditFileStep.file">File</message>
@@ -698,7 +698,7 @@
 	<message key="xmlui.Submission.submit.ReviewStep.unknown">unknown</message>
 	<message key="xmlui.Submission.submit.ReviewStep.known">known</message>
 	<message key="xmlui.Submission.submit.ReviewStep.supported">supported</message>
-	
+
 	<!-- org.dspace.app.xmlui.Submission.submit.CCLicenseStep -->
 	<message key="xmlui.Submission.submit.CCLicenseStep.head">Creative Commons License</message>
 	<message key="xmlui.Submission.submit.CCLicenseStep.info1">If you wish, you may add a <a href="http://creativecommons.org/">Creative Commons</a> License to your item. <strong>Creative Commons licenses govern what people who read your work may then do with it.</strong> If you wish to select a Creative Commons license click the button below. You will be taken to the Creative Commons website, where you will be presented with several licensing options.  After selecting a license, you will be returned to this page.</message>
@@ -719,13 +719,13 @@
 	<!-- org.dspace.app.xmlui.Submission.submit.RemovedStep -->
 	<message key="xmlui.Submission.submit.RemovedStep.head">Submission removed</message>
 	<message key="xmlui.Submission.submit.RemovedStep.info1">Your submission has been cancelled, and the incomplete item removed from the system.</message>
-	<message key="xmlui.Submission.submit.RemovedStep.go_submission">Go to the Submissions page</message>	
+	<message key="xmlui.Submission.submit.RemovedStep.go_submission">Go to the Submissions page</message>
 
 	<!-- org.dspace.app.xmlui.Submission.submit.CompletedStep -->
-	<message key="xmlui.Submission.submit.CompletedStep.head">Submission complete</message>	
-	<message key="xmlui.Submission.submit.CompletedStep.info1">Your submission will now go through the review process for this collection. You will receive e-mail notification as soon as your submission has joined the collection, or if there is a problem with your submission. You may also check on the status of your submission by visiting your submissions page.</message>	
-	<message key="xmlui.Submission.submit.CompletedStep.go_submission">Go to the Submissions page</message>	
-	<message key="xmlui.Submission.submit.CompletedStep.submit_again">Submit another item</message>		
+	<message key="xmlui.Submission.submit.CompletedStep.head">Submission complete</message>
+	<message key="xmlui.Submission.submit.CompletedStep.info1">Your submission will now go through the review process for this collection. You will receive e-mail notification as soon as your submission has joined the collection, or if there is a problem with your submission. You may also check on the status of your submission by visiting your submissions page.</message>
+	<message key="xmlui.Submission.submit.CompletedStep.go_submission">Go to the Submissions page</message>
+	<message key="xmlui.Submission.submit.CompletedStep.submit_again">Submit another item</message>
 
 	<!-- org.dspace.app.xmlui.Submission.workflow.PerformTaskStep -->
 	<message key="xmlui.Submission.workflow.PerformTaskStep.info1">Actions you may perform on this task:</message>
@@ -750,17 +750,17 @@
 	<message key="xmlui.Submission.workflow.RejectTaskStep.reason_required">The reason field is required</message>
 	<message key="xmlui.Submission.workflow.RejectTaskStep.submit_reject">Reject item</message>
 
-	
-	
-	
+
+
+
 	<!--!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-		
+
 		             Administrative Aspect
-		
+
 		!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!-->
-	
-	<!-- action-generated messages. These are referenced from the sitemap rather than a transformer --> 	
-	
+
+	<!-- action-generated messages. These are referenced from the sitemap rather than a transformer -->
+
 	<message key="xmlui.administrative.FlowEPersonUtils.add_eperson_success_notice">The user was added successfully.</message>
 	<message key="xmlui.administrative.FlowEPersonUtils.edit_eperson_success_notice">The user was edited successfully.</message>
 	<message key="xmlui.administrative.FlowEPersonUtils.reset_password_success_notice">An email message has been sent to the user containing a token that may be used to choose a new password.</message>
@@ -786,10 +786,10 @@
 	<message key="xmlui.administrative.FlowItemUtils.bitstream_delete">The selected bitstreams have been deleted.</message>
 	<message key="xmlui.administrative.FlowMapperUtils.map_items">The items were successfully mapped.</message>
 	<message key="xmlui.administrative.FlowMapperUtils.unmaped_items">The items have been unmapped.</message>
-	
+
 	<!-- general items for all of the eperson classes -->
 	<message key="xmlui.administrative.eperson.general.epeople_trail">Manage E-people</message>
-		
+
 	<!-- org.dspace.app.xmlui.administrative.Navigation -->
 	<!-- contextual menu items -->
 	<message key="xmlui.administrative.Navigation.context_head">Context</message>
@@ -803,7 +803,7 @@
 	<message key="xmlui.administrative.Navigation.context_export_item">Export Item</message>
     <message key="xmlui.administrative.Navigation.context_export_collection">Export Collection</message>
     <message key="xmlui.administrative.Navigation.context_export_community">Export Community</message>
-	
+
 	<!-- Site administrator options -->
 	<message key="xmlui.administrative.Navigation.administrative_head">Administrative</message>
 	<message key="xmlui.administrative.Navigation.administrative_access_control">Access Control</message>
@@ -820,8 +820,8 @@
 
     <!-- my account items -->
 	<message key="xmlui.administrative.Navigation.account_export">My Exports</message>
-	
-	
+
+
 	<!-- export item -->
 	<message key="xmlui.administrative.ItemExport.head">Export Archive</message>
 	<message key="xmlui.administrative.ItemExport.item.id.error">The item id provided is invalid.</message>
@@ -834,9 +834,9 @@
 	<message key="xmlui.administrative.ItemExport.collection.success">The collection was exported successfully.  You should receive an e-mail when the archive is ready for download.  You can also use the 'My Exports' link to view a list of your available archives.</message>
 	<message key="xmlui.administrative.ItemExport.community.success">The community was exported successfully.  You should receive an e-mail when the archive is ready for download.  You can also use the 'My Exports' link to view a list of your available archives.</message>
 	<message key="xmlui.administrative.ItemExport.available.head">Available export archives for download:</message>
-	
 
 
+
     <!-- org.dspace.app.xmlui.administrative.eperson.ManageEPeopleMain -->
 	<message key="xmlui.administrative.eperson.ManageEPeopleMain.title">Manage E-people</message>
 	<message key="xmlui.administrative.eperson.ManageEPeopleMain.main_head">E-person management</message>
@@ -855,8 +855,8 @@
 	<message key="xmlui.administrative.eperson.ManageEPeopleMain.search_column4">Email</message>
 	<message key="xmlui.administrative.eperson.ManageEPeopleMain.submit_delete">Delete E-People</message>
 	<message key="xmlui.administrative.eperson.ManageEPeopleMain.no_results">Your search found no results...</message>
-		
-		
+
+
 	<!-- org.dspace.app.xmlui.administrative.eperson.AddEPersonForm -->
 	<message key="xmlui.administrative.eperson.AddEPersonForm.title">Add E-Person</message>
 	<message key="xmlui.administrative.eperson.AddEPersonForm.trail">Add E-Person</message>
@@ -870,7 +870,7 @@
 	<message key="xmlui.administrative.eperson.AddEPersonForm.req_certs">Require Certificate</message>
 	<message key="xmlui.administrative.eperson.AddEPersonForm.can_log_in">Can Log In</message>
 	<message key="xmlui.administrative.eperson.AddEPersonForm.submit_create">Create E-Person</message>
-	
+
 	<!-- org.dspace.app.xmlui.administrative.eperson.EditEPersonForm -->
 	<message key="xmlui.administrative.eperson.EditEPersonForm.title">Edit E-Person</message>
 	<message key="xmlui.administrative.eperson.EditEPersonForm.trail">Edit E-Person</message>
@@ -887,19 +887,19 @@
 	<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 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>
 	<message key="xmlui.administrative.eperson.EditEPersonForm.delete_constraint.item">eperson has submitted one or more items</message>
 	<message key="xmlui.administrative.eperson.EditEPersonForm.delete_constraint.workflowitem">eperson has an active submission workflow</message>
 	<message key="xmlui.administrative.eperson.EditEPersonForm.delete_constraint.tasklistitem">eperson has a workflow task awaiting their attention</message>
 	<message key="xmlui.administrative.eperson.EditEPersonForm.delete_constraint.unknown">eperson has an unidentified constraint within the system</message>
-	
+
 	<message key="xmlui.administrative.eperson.EditEPersonForm.member_head">Groups this E-Person is a member of:</message>
 	<message key="xmlui.administrative.eperson.EditEPersonForm.indirect_member">(via group: {0})</message>
 	<message key="xmlui.administrative.eperson.EditEPersonForm.member_none">none</message>
-	
-	
+
+
 	<!-- org.dspace.app.xmlui.administrative.eperson.DeleteEPeopleConfirm -->
 	<message key="xmlui.administrative.eperson.DeleteEPeopleConfirm.title">Confirm E-Person Deletion</message>
 	<message key="xmlui.administrative.eperson.DeleteEPeopleConfirm.trail">Confirm Delete</message>
@@ -966,12 +966,12 @@
 	<message key="xmlui.administrative.group.EditGroupForm.members_column2">Name</message>
 	<message key="xmlui.administrative.group.EditGroupForm.members_column3">Email</message>
 	<message key="xmlui.administrative.group.EditGroupForm.members_column4"></message>
-	<message key="xmlui.administrative.group.EditGroupForm.members_group_name">group: {0}</message>	
+	<message key="xmlui.administrative.group.EditGroupForm.members_group_name">group: {0}</message>
 	<message key="xmlui.administrative.group.EditGroupForm.members_none">This group has no members.</message>
 	<message key="xmlui.administrative.group.EditGroupForm.members_pending">[pending]</message>
 	<message key="xmlui.administrative.group.EditGroupForm.instructions_para">Remove members</message>
 	<message key="xmlui.administrative.group.EditGroupForm.collection_link_para">Remove members</message>
-	
+
 	<!-- org.dspace.app.xmlui.administrative.group.DeleteGroupsConfirm -->
 	<message key="xmlui.administrative.group.DeleteGroupsConfirm.title">Confirm Group Deletion</message>
 	<message key="xmlui.administrative.group.DeleteGroupsConfirm.trail">Confirm Delete</message>
@@ -981,11 +981,11 @@
 	<message key="xmlui.administrative.group.DeleteGroupsConfirm.column2">Name</message>
 	<message key="xmlui.administrative.group.DeleteGroupsConfirm.column3">E-People</message>
 	<message key="xmlui.administrative.group.DeleteGroupsConfirm.column4">Groups</message>
-	
+
 	<!-- general items for all of the registries classes -->
 	<message key="xmlui.administrative.registries.general.format_registry_trail">Format registry</message>
-	<message key="xmlui.administrative.registries.general.metadata_registry_trail">Metadata registry</message>	
-	
+	<message key="xmlui.administrative.registries.general.metadata_registry_trail">Metadata registry</message>
+
 	<!-- org.dspace.app.xmlui.administrative.registries.DeleteBitstreamFormatsConfirm.java -->
 	<message key="xmlui.administrative.registries.DeleteBitstreamFormatsConfirm.title">Delete Bitstream Formats</message>
 	<message key="xmlui.administrative.registries.DeleteBitstreamFormatsConfirm.trail">Delete bitstream formats</message>
@@ -1112,13 +1112,13 @@
 	<message key="xmlui.administrative.registries.MoveMetadataField.para2">Move to schema: </message>
 	<message key="xmlui.administrative.registries.MoveMetadataField.submit_move">Move fields</message>
 
-	
-	
-	
+
+
+
 	<!-- general authorization keywords -->
 	<message key="xmlui.administrative.authorization.general.authorize_trail">Authorization</message>
 	<message key="xmlui.administrative.authorization.general.policyList_trail">Policy List</message>
-	
+
 	<!-- org.dspace.app.xmlui.administrative.authorization.AuthorizationMain -->
 	<message key="xmlui.administrative.authorization.AuthorizationMain.title">Administer Authorization Policies</message>
 	<message key="xmlui.administrative.authorization.AuthorizationMain.main_head">Administer Authorization Policies</message>
@@ -1131,9 +1131,9 @@
 	<message key="xmlui.administrative.authorization.AuthorizationMain.actions_advanced_link">Click here to go to the item wildcard policy admin tool</message>
 	<message key="xmlui.administrative.authorization.AuthorizationMain.containerList_head">Community/collection authorizations</message>
 	<message key="xmlui.administrative.authorization.AuthorizationMain.containerList_para">Click on a community or collection to edit its policies.</message>
-	
-	
-	
+
+
+
 	<!-- org.dspace.app.xmlui.administrative.authorization.EditContainerPolicies -->
 	<message key="xmlui.administrative.authorization.EditContainerPolicies.title">Edit Policies</message>
 	<message key="xmlui.administrative.authorization.EditContainerPolicies.trail">Policies List</message>
@@ -1146,9 +1146,9 @@
 	<message key="xmlui.administrative.authorization.EditContainerPolicies.head_group">Group</message>
 	<message key="xmlui.administrative.authorization.EditContainerPolicies.submit_delete">Delete Selected</message>
 	<message key="xmlui.administrative.authorization.EditContainerPolicies.group_edit">Edit</message>
-	
 
-	
+
+
 	<!-- org.dspace.app.xmlui.administrative.authorization.EditItemPolicies -->
 	<message key="xmlui.administrative.authorization.EditItemPolicies.title">Edit Item's Policies</message>
 	<message key="xmlui.administrative.authorization.EditItemPolicies.trail">Policies List</message>
@@ -1161,10 +1161,10 @@
 	<message key="xmlui.administrative.authorization.EditItemPolicies.add_itemPolicy_link">Add a new Item policy</message>
 	<message key="xmlui.administrative.authorization.EditItemPolicies.add_bundlePolicy_link">Add a new Bundle policy</message>
 	<message key="xmlui.administrative.authorization.EditItemPolicies.add_bitstreamPolicy_link">Add a new Bitstream policy</message>
-	
+
 	<message key="xmlui.administrative.authorization.EditContainerPolicies.no_policies">No policies found for this object.</message>
-	
-	
+
+
 	<!-- org.dspace.app.xmlui.administrative.authorization.EditPolicyForm -->
 	<message key="xmlui.administrative.authorization.EditPolicyForm.title">Edit Policy</message>
 	<message key="xmlui.administrative.authorization.EditPolicyForm.trail">Edit Policy</message>
@@ -1176,7 +1176,7 @@
 	<message key="xmlui.administrative.authorization.EditPolicyForm.groups_column1">ID</message>
 	<message key="xmlui.administrative.authorization.EditPolicyForm.groups_column2">Name</message>
 	<message key="xmlui.administrative.authorization.EditPolicyForm.groups_column3">Actions for this resource</message>
-	
+
 	<message key="xmlui.administrative.authorization.EditPolicyForm.set_group">Set</message>

@@ 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: 3107
          http://dspace.svn.sourceforge.net/dspace/?rev=3107&view=rev
Author:   grahamtriggs
Date:     2008-09-09 13:15:06 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
integrated from branch 1.5
Add missing key org.dspace.eperson.Subscribe.authors (subscriptions where the items have authors are broken otherwise)

Modified Paths:
--------------
    trunk/dspace-api/src/main/resources/Messages.properties

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958
   + /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963

Modified: trunk/dspace-api/src/main/resources/Messages.properties
===================================================================
--- trunk/dspace-api/src/main/resources/Messages.properties	2008-09-09 13:12:08 UTC (rev 3106)
+++ trunk/dspace-api/src/main/resources/Messages.properties	2008-09-09 13:15:06 UTC (rev 3107)
@@ -1342,7 +1342,8 @@
 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.authors                                            = Authors: 
+org.dspace.eperson.Subscribe.id                                                 = ID:
 org.dspace.eperson.Subscribe.new-items                                          = New Items:
 org.dspace.eperson.Subscribe.title                                              = Title:
 org.dspace.workflow.WorkflowManager.step1                                       = It requires reviewing.


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

Revision: 3108
          http://dspace.svn.sourceforge.net/dspace/?rev=3108&view=rev
Author:   grahamtriggs
Date:     2008-09-09 13:23:03 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
integrated from branch 1.5
Fix problem with SWORD not accepting multiple concurrent submissions
- DSpaceSWORDServer as originally written was not re-entrant (DSpace Context was stored as a member variable)

As the deposit / servicedocument servlets maintained a handle to an *instance* of the DSpaceSWORDServer as a private member,
this had the effect of making all concurrent requests use the same instance of DSpaceSWORDServer.

Each attempt to get the servicedocument or make a deposit would therefore overwrite the Context,
so requests currently processing would be attempting to use the wrong Context insance.

This revision moves the Context to variables within the servicedocument / deposit methods.
These are passed as parameters to the called private methods, making this class re-entrant.

Modified Paths:
--------------
    trunk/dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/DSpaceSWORDServer.java

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963
   + /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976

Modified: trunk/dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/DSpaceSWORDServer.java
===================================================================
--- trunk/dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/DSpaceSWORDServer.java	2008-09-09 13:15:06 UTC (rev 3107)
+++ trunk/dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/DSpaceSWORDServer.java	2008-09-09 13:23:03 UTC (rev 3108)
@@ -67,10 +67,7 @@
 {
 	/** Log4j logger */
 	public static Logger log = Logger.getLogger(DSpaceSWORDServer.class);
-	
-	/** DSpace context */
-	private Context context;
-		
+
 	// methods required by SWORDServer interface
 	////////////////////////////////////////////
 
@@ -80,26 +77,28 @@
 	public ServiceDocument doServiceDocument(ServiceDocumentRequest request)
 		throws SWORDAuthenticationException, SWORDException
 	{
+        Context context = constructContext(request.getIPAddress());
+
 		if (log.isDebugEnabled())
 		{
 			log.debug(LogManager.getHeader(context, "sword_do_service_document", ""));
 		}
-		
+
 		try
 		{
 			// first authenticate the request
 			// note: this will build our context for us
-			SWORDContext sc = this.authenticate(request);
-			
+			SWORDContext sc = this.authenticate(context, request);
+
 			// log the request
 			log.info(LogManager.getHeader(context, "sword_service_document_request", "username=" + request.getUsername() + ",on_behalf_of=" + request.getOnBehalfOf()));
-			
+
 			// prep the service request, then get the service document out of it
 			SWORDService service = new SWORDService();
 			service.setContext(context);
 			service.setSWORDContext(sc);
 			ServiceDocument doc = service.getServiceDocument();
-			
+
 			return doc;
 		}
 		catch (DSpaceSWORDException e)
@@ -116,40 +115,42 @@
 			}
 		}
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see org.purl.sword.SWORDServer#doSWORDDeposit(org.purl.sword.server.Deposit)
 	 */
 	public DepositResponse doDeposit(Deposit deposit)
 		throws SWORDAuthenticationException, SWORDException
 	{
+        Context context = constructContext(deposit.getIPAddress());
+
 		try
 		{
-			if (log.isDebugEnabled())
+            if (log.isDebugEnabled())
 			{
 				log.debug(LogManager.getHeader(context, "sword_do_deposit", ""));
 			}
-			
+
 			// first authenticate the request
 			// note: this will build our context for us
-			SWORDContext sc = this.authenticate(deposit);
-			
+			SWORDContext sc = this.authenticate(context, deposit);
+
 			// log the request
 			log.info(LogManager.getHeader(context, "sword_deposit_request", "username=" + deposit.getUsername() + ",on_behalf_of=" + deposit.getOnBehalfOf()));
-			
+
 			// prep and execute the deposit
 			DepositManager dm = new DepositManager();
 			dm.setContext(context);
 			dm.setDeposit(deposit);
 			dm.setSWORDContext(sc);
 			DepositResponse response = dm.deposit();
-			
+
 			// if something hasn't killed it already (allowed), then complete the transaction
 			if (context != null && context.isValid())
 			{
 				context.commit();
 			}
-			
+
 			return response;
 		}
 		catch (DSpaceSWORDException e)
@@ -172,72 +173,71 @@
 			}
 		}
 	}
-	
+
 	/**
 	 * Construct the context object member variable of this class
 	 * using the passed IP address as part of the loggable
 	 * information
-	 * 
+	 *
 	 * @param ip	the ip address of the incoming request
 	 * @throws SWORDException
 	 */
-	private void constructContext(String ip)
+	private Context constructContext(String ip)
 		throws SWORDException
 	{
 		try
 		{
-			this.context = new Context();
-		}
+            Context context = new Context();
+            // Set the session ID and IP address
+            context.setExtraLogInfo("session_id=0:ip_addr=" + ip);
+
+            return context;
+        }
 		catch (SQLException e)
 		{
 			log.error("caught exception: ", e);
 			throw new SWORDException("There was a problem with the database", e);
 		}
-		
-		// Set the session ID and IP address
-        this.context.setExtraLogInfo("session_id=0:ip_addr=" + ip);
 	}
-	
+
 	/**
 	 * Authenticate the incoming service document request.  Calls:
-	 * 
+	 *
 	 * authenticatate(username, password, onBehalfOf)
-	 * 
+	 *
 	 * @param request
 	 * @return	a SWORDContext object containing the relevant users
 	 * @throws SWORDAuthenticationException
 	 * @throws SWORDException
 	 */
-	private SWORDContext authenticate(ServiceDocumentRequest request)
+	private SWORDContext authenticate(Context context, ServiceDocumentRequest request)
 		throws SWORDAuthenticationException, SWORDException
 	{
-		this.constructContext(request.getIPAddress());
-		return this.authenticate(request.getUsername(), request.getPassword(), request.getOnBehalfOf());
+		return this.authenticate(context, request.getUsername(), request.getPassword(), request.getOnBehalfOf());
 	}
-	
+
 	/**
 	 * Authenticate the incoming deposit request.  Calls:
-	 * 
+	 *
 	 * authenticate(username, password, onBehalfOf)
-	 * 
+	 *
 	 * @param deposit
 	 * @return	a SWORDContext object containing the relevant users
 	 * @throws SWORDAuthenticationException
 	 * @throws SWORDException
 	 */
-	private SWORDContext authenticate(Deposit deposit)
+	private SWORDContext authenticate(Context context, Deposit deposit)
 		throws SWORDAuthenticationException, SWORDException
 	{
-		this.constructContext(deposit.getIPAddress());
-		return this.authenticate(deposit.getUsername(), deposit.getPassword(), deposit.getOnBehalfOf());
+		return this.authenticate(context, deposit.getUsername(), deposit.getPassword(), deposit.getOnBehalfOf());
 	}
-	
+
 	/**
 	 * Authenticate the given username/password pair, in conjunction with
 	 * the onBehalfOf user.  The rules are that the username/password pair
 	 * must successfully authenticate the user, and the onBehalfOf user
 	 * must exist in the user database.
-	 * 
+	 *
 	 * @param un
 	 * @param pw
 	 * @param obo
@@ -245,7 +245,7 @@
 	 * @throws SWORDAuthenticationException
 	 * @throws SWORDException
 	 */
-	private SWORDContext authenticate(String un, String pw, String obo)
+	private SWORDContext authenticate(Context context, String un, String pw, String obo)
 		throws SWORDAuthenticationException, SWORDException
 	{
 		// smooth out the OnBehalfOf request, so that empty strings are
@@ -254,7 +254,7 @@
 		{
 			obo = null;
 		}
-		
+
 		log.info(LogManager.getHeader(context, "sword_authenticate", "username=" + un + ",on_behalf_of=" + obo));
 
         // attempt to authenticate the primary user


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

Revision: 3109
          http://dspace.svn.sourceforge.net/dspace/?rev=3109&view=rev
Author:   grahamtriggs
Date:     2008-09-09 13:30:33 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
integrated from branch 1.5
Fix issue where the browse and search indexes will not be updated correctly if you move an Item, and the Collection you are moving it from is not the owning collection.

Modified Paths:
--------------
    trunk/dspace-api/src/main/java/org/dspace/content/Item.java

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976
   + /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976,2986

Modified: trunk/dspace-api/src/main/java/org/dspace/content/Item.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/Item.java	2008-09-09 13:23:03 UTC (rev 3108)
+++ trunk/dspace-api/src/main/java/org/dspace/content/Item.java	2008-09-09 13:30:33 UTC (rev 3109)
@@ -84,7 +84,7 @@
 /**
  * Class representing an item in DSpace. Note that everything is held in memory
  * until update() is called on the ItemDAO.
- * 
+ *
  * @author James Rutherford
  * @version $Revision$
  */
@@ -122,7 +122,7 @@
      * (to drive event mechanism)
      */
     private boolean modified;
-    
+
     public Item(Context context, int id)
     {
         this.id = id;
@@ -147,7 +147,7 @@
 
     /**
      * Find out if the item is part of the main archive
-     * 
+     *
      * @return true if the item is in the main archive
      */
     public boolean isArchived()
@@ -157,7 +157,7 @@
 
     /**
      * Only <code>WorkflowItem.archive()</code> should really set this.
-     * 
+     *
      * @param inArchive new value for the flag
      */
     public void setArchived(boolean inArchive)
@@ -167,7 +167,7 @@
 
     /**
      * Find out if the item has been withdrawn
-     * 
+     *
      * @return true if the item has been withdrawn
      */
     public boolean isWithdrawn()
@@ -183,7 +183,7 @@
     /**
      * Get the date the item was last modified, or the current date if
      * last_modified is null
-     * 
+     *
      * @return the date the item was last modified, or the current date if the
      *         column is null.
      */
@@ -200,7 +200,7 @@
 
     /**
      * Get the owning Collection for the item
-     * 
+     *
      * @return Collection that is the owner of the item
      */
     public Collection getOwningCollection()
@@ -211,7 +211,7 @@
 
     /**
      * List the owning Collection for the item
-     * 
+     *
      * @param owningCollection Collection
      */
     public void setOwningCollection(Collection owningCollection)
@@ -409,7 +409,7 @@
 
         return values.toArray(new DCValue[0]);
     }
-    
+
     /**
      * Retrieve metadata field values from a given metadata string
      * of the form <schema prefix>.<element>[.<qualifier>|.*]
@@ -421,7 +421,7 @@
     public DCValue[] getMetadata(String mdString)
     {
         StringTokenizer st = new StringTokenizer(mdString, ".");
-        
+
         String[] tokens = { "", "", "" };
         int i = 0;
         while(st.hasMoreTokens())
@@ -432,7 +432,7 @@
         String schema = tokens[0];
         String element = tokens[1];
         String qualifier = tokens[2];
-        
+
         DCValue[] values;
         if ("*".equals(qualifier))
         {
@@ -446,10 +446,10 @@
         {
             values = getMetadata(schema, element, qualifier, Item.ANY);
         }
-        
+
         return values;
     }
-    
+
     /**
      * Add metadata fields. These are appended to existing values.
      * Use <code>clearDC</code> to remove values. The ordering of values
@@ -504,7 +504,7 @@
                 continue;
 //                dcv.value = null;
             }
-            
+
             if (!metadata.contains(dcv))
             {
                 metadata.add(dcv);
@@ -628,7 +628,7 @@
 
     /**
      * Get the e-person that originally submitted this item
-     * 
+     *
      * @return the submitter
      */
     public EPerson getSubmitter()
@@ -641,7 +641,7 @@
      * method since it is handled by the WorkspaceItem class in the ingest
      * package. <code>update</code> must be called to write the change to the
      * database.
-     * 
+     *
      * @param submitter
      *            the submitter
      */
@@ -659,7 +659,7 @@
 
     /**
      * Get the bundles in this item.
-     * 
+     *
      * @return the bundles in an unordered array
      */
     public Bundle[] getBundles()
@@ -674,10 +674,10 @@
 
     /**
      * Get the bundles matching a bundle name (name corresponds roughly to type)
-     * 
+     *
      * @param name
      *            name of bundle (ORIGINAL/TEXT/THUMBNAIL)
-     * 
+     *
      * @return the bundles in an unordered array
      */
     public Bundle[] getBundles(String name)
@@ -695,7 +695,7 @@
 
     /**
      * Create a bundle in this item, with immediate effect
-     * 
+     *
      * @param name
      *            bundle name (ORIGINAL/TEXT/THUMBNAIL)
      * @return the newly created bundle
@@ -735,7 +735,7 @@
 
     /**
      * Add an existing bundle to this item. This has immediate effect.
-     * 
+     *
      * @param b
      *            the bundle to add
      */
@@ -765,7 +765,7 @@
      *
      * FIXME: Will this ever not be the case? Can multiple Items own the same
      * Bundle? (I think the answer is no).
-     * 
+     *
      * @param b
      *            the bundle to remove
      */
@@ -791,7 +791,7 @@
     /**
      * Create a single bitstream in a new bundle. Provided as a convenience
      * method for the most common use.
-     * 
+     *
      * @param is
      *            the stream to create the new bitstream from
      * @param name
@@ -818,7 +818,7 @@
 
     /**
      * Convenience method, calls createSingleBitstream() with name "ORIGINAL"
-     * 
+     *
      * @param is
      *            InputStream
      * @return created bitstream
@@ -835,7 +835,7 @@
      * Get all non-internal bitstreams in the item. This is mainly used for
      * auditing for provenance messages and adding format.* DC values. The order
      * is indeterminate.
-     * 
+     *
      * @return non-internal bitstreams.
      */
     public Bitstream[] getNonInternalBitstreams()
@@ -866,7 +866,7 @@
 
     /**
      * Store a copy of the license a user granted in this item.
-     * 
+     *
      * @param license
      *            the license the user granted
      * @param eperson
@@ -905,7 +905,7 @@
      * again (either the item was rejected, or resumed after saving)
      * <p>
      * This method is used by the org.dspace.submit.step.LicenseStep class
-     * 
+     *
      * @throws AuthorizeException
      * @throws IOException
      */
@@ -926,7 +926,7 @@
 
     /**
      * Remove all licenses from an item - it was rejected
-     * 
+     *
      * @throws AuthorizeException
      * @throws IOException
      */
@@ -965,7 +965,7 @@
     /**
      * Withdraw the item from the archive. It is kept in place, and the content
      * and metadata are not deleted, but it is not publicly accessible.
-     * 
+     *
      * @throws AuthorizeException
      * @throws IOException
      */
@@ -979,7 +979,7 @@
 
     /**
      * Reinstate a withdrawn item
-     * 
+     *
      * @throws AuthorizeException
      * @throws IOException
      */
@@ -992,7 +992,7 @@
 
     /**
      * Return true if the given Collection 'owns' this item.
-     * 
+     *
      * @param c Collection
      * @return true if this Collection owns this item
      */
@@ -1019,7 +1019,7 @@
 
     /**
      * Return type found in Constants
-     * 
+     *
      * @return int Constants.ITEM
      */
     public int getType()
@@ -1030,7 +1030,7 @@
     /**
      * remove all of the policies for item and replace them with a new list of
      * policies
-     * 
+     *
      * @param newpolicies -
      *            this will be all of the new policies for the item and its
      *            contents
@@ -1050,7 +1050,7 @@
     /**
      * remove all of the policies for item's bitstreams and bundles and replace
      * them with a new list of policies
-     * 
+     *
      * @param newpolicies -
      *            this will be all of the new policies for the bundle and
      *            bitstream contents
@@ -1090,7 +1090,7 @@
     /**
      * remove all of the policies for item's bitstreams and bundles that belong
      * to a given Group
-     * 
+     *
      * @param g
      *            Group referenced by policies that needs to be removed
      *
@@ -1128,7 +1128,7 @@
      * remove all policies on an item and its contents, and replace them with
      * the DEFAULT_ITEM_READ and DEFAULT_BITSTREAM_READ policies belonging to
      * the collection.
-     * 
+     *
      * @param c
      *            Collection
      * @throws AuthorizeException
@@ -1186,8 +1186,52 @@
     }
 
     /**
+     * Moves the item from one collection to another one
+     *
+     * @throws SQLException
+     * @throws AuthorizeException
+     * @throws IOException
+     */
+    public void move (Collection from, Collection to) throws SQLException, AuthorizeException, IOException
+    {
+        // Move the Item from one Collection to the other
+        to.addItem(this);
+        from.removeItem(this);
+
+        // If we are moving from the owning collection, update that too
+        if (isOwningCollection(from))
+    	{
+    		setOwningCollection(to);
+    		update();
+    	}
+        else
+        {
+            // Although we haven't actually updated anything within the item
+            // we'll tell the event system that it has, so that any consumers that
+            // care about the structure of the repository can take account of the move
+
+            // Note that updating the owning collection above will have the same effect,
+            // so we only do this here if the owning collection hasn't changed.
+
+            ourContext.addEvent(new Event(Event.MODIFY, Constants.ITEM, getID(), null));
+        }
+    }
+
+    /**
+     * Get the collections this item is not in.
+     *
+     * @return the collections this item is not in, if any.
+     * @throws SQLException
+     */
+    public Collection[] getCollectionsNotLinked() throws SQLException
+    {
+    	Collection[] allCollections = Collection.findAll(ourContext);
+       	Collection[] linkedCollections = getCollections();
+       	Collection[] notLinkedCollections = new Collection[allCollections.length - linkedCollections.length];
+
+    /**
      * return TRUE if context's user can edit item, false otherwise
-     * 
+     *
      * @return boolean true = current user can edit item
      */
     public boolean canEdit()
@@ -1312,12 +1356,12 @@
 
     /**
      * Get a thumbnail object out of the item.
-     * 
+     *
      * Warning: using this method actually instantiates an Item, which has a
      * corresponding performance hit on the database during browse listing
      * rendering.  That's your own fault for wanting to put images on your
      * browse page!
-     * 
+     *
      * @return
      */
     public Thumbnail getThumbnail()
@@ -1328,7 +1372,7 @@
         {
             return null;
         }
-        
+
         // if multiple bitstreams, check if the primary one is HTML
         boolean html = false;
         if (original[0].getBitstreams().length > 1)
@@ -1346,14 +1390,14 @@
 
         // now actually pull out the thumbnail (ouch!)
         Bundle[] thumbs = getBundles("THUMBNAIL");
-        
+
         // if there are thumbs and we're not dealing with an HTML item
         // then show the thumbnail
         if ((thumbs.length > 0) && !html)
         {
             Bitstream thumbnailBitstream;
             Bitstream originalBitstream;
-            
+
             if ((original[0].getBitstreams().length > 1) && (original[0].getPrimaryBitstreamID() > -1))
             {
                 originalBitstream = Bitstream.find(context, original[0].getPrimaryBitstreamID());
@@ -1364,7 +1408,7 @@
                 originalBitstream = original[0].getBitstreams()[0];
                 thumbnailBitstream = thumbs[0].getBitstreams()[0];
             }
-            
+
             if ((thumbnailBitstream != null)
                     && (AuthorizeManager.authorizeActionBoolean(context, thumbnailBitstream, Constants.READ)))
             {
@@ -1413,7 +1457,7 @@
         List<Item> items = dao.getItemsBySubmitter(eperson);
 
         ArrayList<Integer> list = new ArrayList<Integer>();
-        
+
         for (Item i : items)
         {
             list.add(i.getID());
@@ -1487,7 +1531,7 @@
     public void move (Collection from, Collection to) throws AuthorizeException, IOException
     {
         ArchiveManager.move(context, this, from, to);
-        
+
         /*
         if (isOwningCollection(from))
         {


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

Revision: 3110
          http://dspace.svn.sourceforge.net/dspace/?rev=3110&view=rev
Author:   grahamtriggs
Date:     2008-09-09 13:36:38 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
Fix compilation errors from previous merges

Modified Paths:
--------------
    trunk/dspace-api/src/main/java/org/dspace/content/Item.java
    trunk/dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/DSpaceSWORDServer.java

Modified: trunk/dspace-api/src/main/java/org/dspace/content/Item.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/Item.java	2008-09-09 13:30:33 UTC (rev 3109)
+++ trunk/dspace-api/src/main/java/org/dspace/content/Item.java	2008-09-09 13:36:38 UTC (rev 3110)
@@ -1186,50 +1186,6 @@
     }
 
     /**
-     * Moves the item from one collection to another one
-     *
-     * @throws SQLException
-     * @throws AuthorizeException
-     * @throws IOException
-     */
-    public void move (Collection from, Collection to) throws SQLException, AuthorizeException, IOException
-    {
-        // Move the Item from one Collection to the other
-        to.addItem(this);
-        from.removeItem(this);
-
-        // If we are moving from the owning collection, update that too
-        if (isOwningCollection(from))
-    	{
-    		setOwningCollection(to);
-    		update();
-    	}
-        else
-        {
-            // Although we haven't actually updated anything within the item
-            // we'll tell the event system that it has, so that any consumers that
-            // care about the structure of the repository can take account of the move
-
-            // Note that updating the owning collection above will have the same effect,
-            // so we only do this here if the owning collection hasn't changed.
-
-            ourContext.addEvent(new Event(Event.MODIFY, Constants.ITEM, getID(), null));
-        }
-    }
-
-    /**
-     * Get the collections this item is not in.
-     *
-     * @return the collections this item is not in, if any.
-     * @throws SQLException
-     */
-    public Collection[] getCollectionsNotLinked() throws SQLException
-    {
-    	Collection[] allCollections = Collection.findAll(ourContext);
-       	Collection[] linkedCollections = getCollections();
-       	Collection[] notLinkedCollections = new Collection[allCollections.length - linkedCollections.length];
-
-    /**
      * return TRUE if context's user can edit item, false otherwise
      *
      * @return boolean true = current user can edit item

Modified: trunk/dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/DSpaceSWORDServer.java
===================================================================
--- trunk/dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/DSpaceSWORDServer.java	2008-09-09 13:30:33 UTC (rev 3109)
+++ trunk/dspace-sword/dspace-sword-api/src/main/java/org/dspace/sword/DSpaceSWORDServer.java	2008-09-09 13:36:38 UTC (rev 3110)
@@ -262,7 +262,7 @@
         SWORDAuthentication auth = new SWORDAuthentication();
         EPerson ep = null;
         boolean authenticated = false;
-        if (auth.authenticates(this.context, un, pw))
+        if (auth.authenticates(context, un, pw))
         {
             // if authenticated, obtain the eperson object
             ep = EPerson.findByEmail(context, un);
@@ -278,7 +278,7 @@
             // authentication process fails
             if (obo != null)
             {
-                EPerson epObo= EPerson.findByEmail(this.context, obo);
+                EPerson epObo= EPerson.findByEmail(context, obo);
                 if (epObo != null)
                 {
                     sc.setOnBehalfOf(epObo);
@@ -293,7 +293,7 @@
         // deal with the context or throw an authentication exception
         if (ep != null && authenticated)
         {
-            this.context.setCurrentUser(ep);
+            context.setCurrentUser(ep);
             log.info(LogManager.getHeader(context, "sword_set_authenticated_user", "user_id=" + ep.getID()));
         }
         else


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

Revision: 3111
          http://dspace.svn.sourceforge.net/dspace/?rev=3111&view=rev
Author:   grahamtriggs
Date:     2008-09-09 13:45:44 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
integrated from branch 1.5
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:
--------------
    trunk/dspace/config/dspace.cfg

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976,2986
   + /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976,2986,2995

Modified: trunk/dspace/config/dspace.cfg
===================================================================
--- trunk/dspace/config/dspace.cfg	2008-09-09 13:36:38 UTC (rev 3110)
+++ trunk/dspace/config/dspace.cfg	2008-09-09 13:45:44 UTC (rev 3111)
@@ -673,8 +673,9 @@
 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---------------------#
  #---------------------------------------------------------------#


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

Revision: 3118
          http://dspace.svn.sourceforge.net/dspace/?rev=3118&view=rev
Author:   grahamtriggs
Date:     2008-09-10 15:55:35 +0000 (Wed, 10 Sep 2008)

Log Message:
-----------
integrated from branch 1.5
Fix #2034372 - Resorting in JSPUI gives no results

Modified Paths:
--------------
    trunk/dspace-jspui/dspace-jspui-webapp/src/main/webapp/search/results.jsp

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976,2986,2995
   + /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976,2986,2995,3027

Modified: trunk/dspace-jspui/dspace-jspui-webapp/src/main/webapp/search/results.jsp
===================================================================
--- trunk/dspace-jspui/dspace-jspui-webapp/src/main/webapp/search/results.jsp	2008-09-10 13:51:21 UTC (rev 3117)
+++ trunk/dspace-jspui/dspace-jspui-webapp/src/main/webapp/search/results.jsp	2008-09-10 15:55:35 UTC (rev 3118)
@@ -67,9 +67,10 @@
 
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 <%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
-<%@ page import="org.dspace.content.Collection" %>
-<%@ page import="org.dspace.content.Community" %>
-<%@ page import="org.dspace.content.Item" %>
+<%@ page import="java.net.URLEncoder"            %>
+<%@ page import="org.dspace.content.Community"   %>
+<%@ page import="org.dspace.content.Collection"  %>
+<%@ page import="org.dspace.content.Item"        %>
 <%@ page import="org.dspace.search.QueryResults" %>
 <%@ page import="org.dspace.uri.IdentifierService" %>
 <%@ page import="java.net.URLEncoder" %>
@@ -85,23 +86,23 @@
     String sortedBy = (so == null) ? null : so.getName();
 
     // Get the attributes
-    Community community = (Community) request.getAttribute("community" );
-    Collection collection = (Collection) request.getAttribute("collection");
-    Community[] communityArray = (Community[]) request.getAttribute("community.array");
+    Community   community        = (Community   ) request.getAttribute("community" );
+    Collection  collection       = (Collection  ) request.getAttribute("collection");
+    Community[] communityArray   = (Community[] ) request.getAttribute("community.array");
     Collection[] collectionArray = (Collection[]) request.getAttribute("collection.array");
 
-    Item[] items = (Item[]) request.getAttribute("items");
-    Community[] communities = (Community[] )request.getAttribute("communities");
+    Item      [] items       = (Item[]      )request.getAttribute("items");
+    Community [] communities = (Community[] )request.getAttribute("communities");
     Collection[] collections = (Collection[])request.getAttribute("collections");
 
     String query = (String) request.getAttribute("query");
 
     QueryResults qResults = (QueryResults)request.getAttribute("queryresults");
 
-    int pageTotal = ((Integer)request.getAttribute("pagetotal")).intValue();
+    int pageTotal   = ((Integer)request.getAttribute("pagetotal"  )).intValue();
     int pageCurrent = ((Integer)request.getAttribute("pagecurrent")).intValue();
-    int pageLast = ((Integer)request.getAttribute("pagelast")).intValue();
-    int pageFirst = ((Integer)request.getAttribute("pagefirst")).intValue();
+    int pageLast    = ((Integer)request.getAttribute("pagelast"   )).intValue();
+    int pageFirst   = ((Integer)request.getAttribute("pagefirst"  )).intValue();
     int rpp         = qResults.getPageSize();
     int etAl        = qResults.getEtAl();
 
@@ -217,10 +218,10 @@
    <div align="center">
    <form method="get" action="<%= request.getContextPath() + searchScope + "/simple-search" %>">
    <table border="0">
-   <tr><td>
-       <input type="hidden" name="query" value="<%= query %>" />
-       <fmt:message key="search.results.perpage"/>
-       <select name="rpp">
+       <tr><td>
+           <input type="hidden" name="query" value="<%= URLEncoder.encode(query,"UTF-8") %>" />
+           <fmt:message key="search.results.perpage"/>
+           <select name="rpp">
 <%
            for (int i = 5; i <= 100 ; i += 5)
            {


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

Revision: 3119
          http://dspace.svn.sourceforge.net/dspace/?rev=3119&view=rev
Author:   grahamtriggs
Date:     2008-09-10 16:12:05 +0000 (Wed, 10 Sep 2008)

Log Message:
-----------
integrated from branch 1.5
Replace URLEncoder with StringEscapeUtils for better fix of escaping the hidden query field

Modified Paths:
--------------
    trunk/dspace-jspui/dspace-jspui-webapp/src/main/webapp/search/results.jsp

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976,2986,2995,3027
   + /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976,2986,2995,3027,3033

Modified: trunk/dspace-jspui/dspace-jspui-webapp/src/main/webapp/search/results.jsp
===================================================================
--- trunk/dspace-jspui/dspace-jspui-webapp/src/main/webapp/search/results.jsp	2008-09-10 15:55:35 UTC (rev 3118)
+++ trunk/dspace-jspui/dspace-jspui-webapp/src/main/webapp/search/results.jsp	2008-09-10 16:12:05 UTC (rev 3119)
@@ -219,7 +219,7 @@
    <form method="get" action="<%= request.getContextPath() + searchScope + "/simple-search" %>">
    <table border="0">
        <tr><td>
-           <input type="hidden" name="query" value="<%= URLEncoder.encode(query,"UTF-8") %>" />
+           <input type="hidden" name="query" value="<%= StringEscapeUtils.escapeHtml(query) %>" />
            <fmt:message key="search.results.perpage"/>
            <select name="rpp">
 <%
@@ -342,7 +342,7 @@
     String prevURL =  request.getContextPath()
                     + searchScope
                     + "/simple-search?query="
-                    + URLEncoder.encode(query)
+                    + URLEncoder.encode(query,"UTF-8")
                     + "&amp;sort_by=" + (so != null ? so.getNumber() : 0)
                     + "&amp;order=" + order
                     + "&amp;rpp=" + rpp
@@ -370,7 +370,7 @@
                     + request.getContextPath()
                     + searchScope
                     + "/simple-search?query="
-                    + URLEncoder.encode(query)
+                    + URLEncoder.encode(query,"UTF-8")
                     + "&amp;sort_by=" + (so != null ? so.getNumber() : 0)
                     + "&amp;order=" + order
                     + "&amp;rpp=" + rpp


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

Revision: 3127
          http://dspace.svn.sourceforge.net/dspace/?rev=3127&view=rev
Author:   grahamtriggs
Date:     2008-09-11 15:06:38 +0000 (Thu, 11 Sep 2008)

Log Message:
-----------
integrated from branch 1.5
Fix various problems with resources potentially not being freed, and other minor fixes suggested by FindBugs

Modified Paths:
--------------
    trunk/dspace-api/src/main/java/org/dspace/app/mets/METSExport.java
    trunk/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
    trunk/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
    trunk/dspace-api/src/main/java/org/dspace/authorize/AuthorizeManager.java
    trunk/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOOracle.java
    trunk/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOPostgres.java
    trunk/dspace-api/src/main/java/org/dspace/content/Bitstream.java
    trunk/dspace-api/src/main/java/org/dspace/content/BitstreamFormat.java
    trunk/dspace-api/src/main/java/org/dspace/content/Bundle.java
    trunk/dspace-api/src/main/java/org/dspace/content/Collection.java
    trunk/dspace-api/src/main/java/org/dspace/content/Community.java
    trunk/dspace-api/src/main/java/org/dspace/content/FormatIdentifier.java
    trunk/dspace-api/src/main/java/org/dspace/content/MetadataField.java
    trunk/dspace-api/src/main/java/org/dspace/content/SupervisedItem.java
    trunk/dspace-api/src/main/java/org/dspace/content/WorkspaceItem.java
    trunk/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java
    trunk/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java
    trunk/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java
    trunk/dspace-api/src/main/java/org/dspace/core/LogManager.java
    trunk/dspace-api/src/main/java/org/dspace/core/PluginManager.java
    trunk/dspace-api/src/main/java/org/dspace/eperson/EPerson.java
    trunk/dspace-api/src/main/java/org/dspace/eperson/Group.java
    trunk/dspace-api/src/main/java/org/dspace/search/Harvest.java
    trunk/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java
    trunk/dspace-api/src/main/java/org/dspace/sort/SortOption.java
    trunk/dspace-api/src/main/java/org/dspace/storage/bitstore/BitstreamStorageManager.java
    trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java
    trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/TableRowIterator.java
    trunk/dspace-api/src/main/java/org/dspace/workflow/WorkflowItem.java
    trunk/dspace-api/src/main/java/org/dspace/workflow/WorkflowManager.java
    trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java
    trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/StatisticsServlet.java
    trunk/dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DIDLCrosswalk.java

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976,2986,2995,3027,3033
   + /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976,2986,2995,3027,3033,3036

Modified: trunk/dspace-api/src/main/java/org/dspace/app/mets/METSExport.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/app/mets/METSExport.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/app/mets/METSExport.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -299,9 +299,18 @@
                 + File.separator + "config" + File.separator + "dc2mods.cfg";
 
         // Read it in
-        InputStream is = new FileInputStream(configFile);
-        dcToMODS = new Properties();
-        dcToMODS.load(is);
+        InputStream is = null;
+        try
+        {
+            is = new FileInputStream(configFile);
+            dcToMODS = new Properties();
+            dcToMODS.load(is);
+        }
+        finally
+        {
+            if (is != null)
+                try { is.close(); } catch (IOException ioe) { }
+        }
     }
 
     /**

Modified: trunk/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -564,31 +564,42 @@
     {
         FileReader fr = null;
         BufferedReader br = null;
-        
-        // read in the map file, printing a warning if none is found
-        String record = null;
-        try 
-        {  
-            fr = new FileReader(map);
-            br = new BufferedReader(fr);
-        } 
-        catch (IOException e) 
-        {  
-            System.err.println("Failed to read map file: log file actions will be displayed without translation");
-            return;
-        } 
-        
-        // loop through the map file and read in the values
-        while ((record = br.readLine()) != null) 
+
+        try
         {
-            Matcher matchReal = real.matcher(record);
-            
-            // if the line is real then read it in
-            if (matchReal.matches())
+            // read in the map file, printing a warning if none is found
+            String record = null;
+            try
             {
-                actionMap.put(matchReal.group(1).trim(), matchReal.group(2).trim());
+                fr = new FileReader(map);
+                br = new BufferedReader(fr);
             }
+            catch (IOException e)
+            {
+                System.err.println("Failed to read map file: log file actions will be displayed without translation");
+                return;
+            }
+
+            // loop through the map file and read in the values
+            while ((record = br.readLine()) != null)
+            {
+                Matcher matchReal = real.matcher(record);
+
+                // if the line is real then read it in
+                if (matchReal.matches())
+                {
+                    actionMap.put(matchReal.group(1).trim(), matchReal.group(2).trim());
+                }
+            }
         }
+        finally
+        {
+            if (br != null)
+                try { br.close(); } catch (IOException ioe) { }
+
+            if (fr != null)
+                try { fr.close(); } catch (IOException ioe) { }
+        }
     }
     
     

Modified: trunk/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -139,12 +139,13 @@
         // First look for keystore full of trusted certs.
         if (keystorePath != null)
         {
+            FileInputStream fis = null;
             if (keystorePassword == null)
                 keystorePassword = "";
             try {
                 KeyStore ks = KeyStore.getInstance("JKS");
-                ks.load(new FileInputStream(keystorePath),
-                                     keystorePassword.toCharArray());
+                fis = new FileInputStream(keystorePath);
+                ks.load(fis, keystorePassword.toCharArray());
                 caCertKeyStore = ks;
             }
             catch (IOException e)
@@ -157,14 +158,22 @@
                 log.error("X509Authentication: Failed to extract CA keystore, file="+
                             keystorePath+", error="+e.toString());
             }
+            finally
+            {
+                if (fis != null)
+                    try { fis.close(); } catch (IOException ioe) { }
+            }
         }
 
         // Second, try getting public key out of CA cert, if that's configured.
         if (caCertPath != null)
         {
+            InputStream is = null;
+            FileInputStream fis = null;
             try
             {
-                InputStream is = new BufferedInputStream(new FileInputStream(caCertPath));
+                fis = new FileInputStream(caCertPath);
+                is = new BufferedInputStream(fis);
                 X509Certificate cert = (X509Certificate) CertificateFactory
                                        .getInstance("X.509").generateCertificate(is);
                 if (cert != null)
@@ -180,6 +189,14 @@
                 log.error("X509Authentication: Failed to extract CA cert, file="+
                             caCertPath+", error="+e.toString());
             }
+            finally
+            {
+                if (is != null)
+                    try { is.close(); } catch (IOException ioe) { }
+
+                if (fis != null)
+                    try { fis.close(); } catch (IOException ioe) { }
+            }
         }
     }
 

Modified: trunk/dspace-api/src/main/java/org/dspace/authorize/AuthorizeManager.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/authorize/AuthorizeManager.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/authorize/AuthorizeManager.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -77,7 +77,7 @@
      * Utility method, checks that the current user of the given context can
      * perform all of the specified actions on the given object. An
      * <code>AuthorizeException</code> if all the authorizations fail.
-     * 
+     *
      * @param c
      *            context with the current user
      * @param o
@@ -118,14 +118,14 @@
      * Checks that the context's current user can perform the given action on
      * the given object. Throws an exception if the user is not authorized,
      * otherwise the method call does nothing.
-     * 
+     *
      * @param c
      *            context
      * @param o
      *            a DSpaceObject
      * @param action
      *            action to perform from <code>org.dspace.core.Constants</code>
-     * 
+     *
      * @throws AuthorizeException
      *             if the user is denied
      */
@@ -203,7 +203,7 @@
     /**
      * same authorize, returns boolean for those who don't want to deal with
      * catching exceptions.
-     * 
+     *
      * @param c
      *            DSpace context, containing current user
      * @param o
@@ -211,7 +211,7 @@
      * @param a
      *            action being attempted, from
      *            <code>org.dspace.core.Constants</code>
-     * 
+     *
      * @return <code>true</code> if the current user in the context is
      *         authorized to perform the given action on the given object
      */
@@ -241,7 +241,7 @@
      * Check to see if the given user can perform the given action on the given
      * object. Always returns true if the ignore authorization flat is set in
      * the current context.
-     * 
+     *
      * @param c
      *            current context. User is irrelevant; "ignore authorization"
      *            flag is relevant
@@ -323,10 +323,10 @@
      * Check to see if the current user is an admin. Always return
      * <code>true</code> if c.ignoreAuthorization is set. Anonymous users
      * can't be Admins (EPerson set to NULL)
-     * 
+     *
      * @param c
      *            current context
-     * 
+     *
      * @return <code>true</code> if user is an admin or ignore authorization
      *         flag set
      */
@@ -359,7 +359,7 @@
 
     /**
      * Add a policy for an individual eperson
-     * 
+     *
      * @param c
      *            context. Current user irrelevant
      * @param o
@@ -368,7 +368,7 @@
      *            ID of action from <code>org.dspace.core.Constants</code>
      * @param e
      *            eperson who can perform the action
-     * 
+     *
      * @throws AuthorizeException
      *             if current user in context is not authorized to add policies
      */
@@ -387,7 +387,7 @@
 
     /**
      * Add a policy for a group
-     * 
+     *
      * @param c
      *            current context
      * @param o
@@ -414,10 +414,10 @@
 
     /**
      * Return a List of the policies for an object
-     * 
+     *
      * @param c  current context
      * @param o  object to retrieve policies for
-     * 
+     *
      * @return List of <code>ResourcePolicy</code> objects
      */
     @Deprecated
@@ -438,10 +438,10 @@
     {
         return ResourcePolicyDAOFactory.getInstance(c).getPolicies(g);
     }
-    
+
     /**
      * Return a list of policies for an object that match the action
-     * 
+     *
      * @param c
      *            context
      * @param o
@@ -457,7 +457,7 @@
 
     /**
      * Add policies to an object to match those from a previous object
-     * 
+     *
      * @param c  context
      * @param src
      *            source of policies
@@ -479,7 +479,7 @@
 
     /**
      * Copies policies from a list of resource policies to a given DSpaceObject
-     * 
+     *
      * @param c
      *            DSpace context
      * @param policies
@@ -514,7 +514,7 @@
 
     /**
      * removes ALL policies for an object.  FIXME doesn't check authorization
-     * 
+     *
      * @param c
      *            DSpace context
      * @param o
@@ -533,7 +533,7 @@
     /**
      * Remove all policies from an object that match a given action. FIXME
      * doesn't check authorization
-     * 
+     *
      * @param context
      *            current context
      * @param dso
@@ -564,7 +564,7 @@
     /**
      * Removes all policies relating to a particular group. FIXME doesn't check
      * authorization
-     * 
+     *
      * @param c
      *            current context
      * @param groupID
@@ -590,7 +590,7 @@
     /**
      * Removes all policies from a group for a particular object that belong to
      * a Group. FIXME doesn't check authorization
-     * 
+     *
      * @param c
      *            current context
      * @param o
@@ -611,7 +611,7 @@
     /**
      * Returns all groups authorized to perform an action on an object. Returns
      * empty array if no matches.
-     * 
+     *
      * @param c
      *            current context
      * @param o

Modified: trunk/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOOracle.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOOracle.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOOracle.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -96,11 +96,12 @@
 	public void collectionCount(Collection collection, int count) 
 		throws ItemCountException
 	{
-		try
+        TableRowIterator tri = null;
+        try
 		{
 			// first find out if we have a record
 			Object[] sparams = { new Integer(collection.getID()) };
-			TableRowIterator tri = DatabaseManager.query(context, collectionSelect, sparams);
+			tri = DatabaseManager.query(context, collectionSelect, sparams);
 			
 			if (tri.hasNext())
 			{
@@ -112,15 +113,18 @@
 				Object[] params = { new Integer(collection.getID()), new Integer(count) };
 				DatabaseManager.updateQuery(context, collectionInsert, params);
 			}
-			
-			tri.close();
 		}
 		catch (SQLException e)
 		{
 			log.error("caught exception: ", e);
 			throw new ItemCountException(e);
 		}
-	}
+        finally
+        {
+            if (tri != null)
+                tri.close();
+        }
+    }
 
 	/**
 	 * Store the count of the given community
@@ -132,11 +136,12 @@
 	public void communityCount(Community community, int count) 
 		throws ItemCountException
 	{
-		try
+        TableRowIterator tri = null;
+        try
 		{
 			// first find out if we have a record
 			Object[] sparams = { new Integer(community.getID()) };
-			TableRowIterator tri = DatabaseManager.query(context, communitySelect, sparams);
+			tri = DatabaseManager.query(context, communitySelect, sparams);
 			
 			if (tri.hasNext())
 			{
@@ -148,15 +153,18 @@
 				Object[] params = { new Integer(community.getID()), new Integer(count) };
 				DatabaseManager.updateQuery(context, communityInsert, params);
 			}
-			
-			tri.close();
 		}
 		catch (SQLException e)
 		{
 			log.error("caught exception: ", e);
 			throw new ItemCountException(e);
 		}
-	}
+        finally
+        {
+            if (tri != null)
+                tri.close();
+        }
+    }
 
 	/**
 	 * Set the dspace context to use
@@ -268,10 +276,11 @@
 	private int getCollectionCount(Collection collection)
 		throws ItemCountException
 	{
-		try
+        TableRowIterator tri = null;
+        try
 		{
 			Object[] params = { new Integer(collection.getID()) };
-			TableRowIterator tri = DatabaseManager.query(context, collectionSelect, params);
+			tri = DatabaseManager.query(context, collectionSelect, params);
 			
 			if (!tri.hasNext())
 			{
@@ -284,9 +293,7 @@
 			{
 				throw new ItemCountException("More than one count row in the database");
 			}
-			
-			tri.close();
-			
+
 			return tr.getIntColumn("count");
 		}
 		catch (SQLException e)
@@ -294,7 +301,12 @@
 			log.error("caught exception: ", e);
 			throw new ItemCountException(e);
 		}
-	}
+        finally
+        {
+            if (tri != null)
+                tri.close();
+        }
+    }
 	
 	/**
 	 * get the count for the given community
@@ -306,10 +318,11 @@
 	private int getCommunityCount(Community community)
 		throws ItemCountException
 	{
-		try
+        TableRowIterator tri = null;
+        try
 		{
 			Object[] params = { new Integer(community.getID()) };
-			TableRowIterator tri = DatabaseManager.query(context, communitySelect, params);
+			tri = DatabaseManager.query(context, communitySelect, params);
 			
 			if (!tri.hasNext())
 			{
@@ -322,9 +335,7 @@
 			{
 				throw new ItemCountException("More than one count row in the database");
 			}
-			
-			tri.close();
-			
+
 			return tr.getIntColumn("count");
 		}
 		catch (SQLException e)
@@ -332,5 +343,10 @@
 			log.error("caught exception: ", e);
 			throw new ItemCountException(e);
 		}
-	}
+        finally
+        {
+            if (tri != null)
+                tri.close();
+        }
+    }
 }

Modified: trunk/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOPostgres.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOPostgres.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOPostgres.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -96,11 +96,12 @@
 	public void collectionCount(Collection collection, int count) 
 		throws ItemCountException
 	{
-		try
+        TableRowIterator tri = null;
+        try
 		{
 			// first find out if we have a record
 			Object[] sparams = { new Integer(collection.getID()) };
-			TableRowIterator tri = DatabaseManager.query(context, collectionSelect, sparams);
+			tri = DatabaseManager.query(context, collectionSelect, sparams);
 			
 			if (tri.hasNext())
 			{
@@ -112,15 +113,18 @@
 				Object[] params = { new Integer(collection.getID()), new Integer(count) };
 				DatabaseManager.updateQuery(context, collectionInsert, params);
 			}
-			
-			tri.close();
 		}
 		catch (SQLException e)
 		{
 			log.error("caught exception: ", e);
 			throw new ItemCountException(e);
 		}
-	}
+        finally
+        {
+            if (tri != null)
+                tri.close();
+        }
+    }
 
 	/**
 	 * Store the count of the given community
@@ -132,11 +136,12 @@
 	public void communityCount(Community community, int count) 
 		throws ItemCountException
 	{
-		try
+        TableRowIterator tri = null;
+        try
 		{
 			// first find out if we have a record
 			Object[] sparams = { new Integer(community.getID()) };
-			TableRowIterator tri = DatabaseManager.query(context, communitySelect, sparams);
+			tri = DatabaseManager.query(context, communitySelect, sparams);
 			
 			if (tri.hasNext())
 			{
@@ -148,15 +153,18 @@
 				Object[] params = { new Integer(community.getID()), new Integer(count) };
 				DatabaseManager.updateQuery(context, communityInsert, params);
 			}
-			
-			tri.close();
 		}
 		catch (SQLException e)
 		{
 			log.error("caught exception: ", e);
 			throw new ItemCountException(e);
 		}
-	}
+        finally
+        {
+            if (tri != null)
+                tri.close();
+        }
+    }
 
 	/**
 	 * Set the dspace context to use
@@ -268,10 +276,11 @@
 	private int getCollectionCount(Collection collection)
 		throws ItemCountException
 	{
-		try
+        TableRowIterator tri = null;
+        try
 		{
 			Object[] params = { new Integer(collection.getID()) };
-			TableRowIterator tri = DatabaseManager.query(context, collectionSelect, params);
+			tri = DatabaseManager.query(context, collectionSelect, params);
 			
 			if (!tri.hasNext())
 			{
@@ -284,9 +293,7 @@
 			{
 				throw new ItemCountException("More than one count row in the database");
 			}
-			
-			tri.close();
-			
+
 			return tr.getIntColumn("count");
 		}
 		catch (SQLException e)
@@ -294,7 +301,12 @@
 			log.error("caught exception: ", e);
 			throw new ItemCountException(e);
 		}
-	}
+        finally
+        {
+            if (tri != null)
+                tri.close();
+        }
+    }
 	
 	/**
 	 * get the count for the given community
@@ -306,10 +318,11 @@
 	private int getCommunityCount(Community community)
 		throws ItemCountException
 	{
-		try
+        TableRowIterator tri = null;
+        try
 		{
 			Object[] params = { new Integer(community.getID()) };
-			TableRowIterator tri = DatabaseManager.query(context, communitySelect, params);
+			tri = DatabaseManager.query(context, communitySelect, params);
 			
 			if (!tri.hasNext())
 			{
@@ -322,9 +335,7 @@
 			{
 				throw new ItemCountException("More than one count row in the database");
 			}
-			
-			tri.close();
-			
+
 			return tr.getIntColumn("count");
 		}
 		catch (SQLException e)
@@ -332,5 +343,10 @@
 			log.error("caught exception: ", e);
 			throw new ItemCountException(e);
 		}
-	}
+        finally
+        {
+            if (tri != null)
+                tri.close();
+        }
+    }
 }

Modified: trunk/dspace-api/src/main/java/org/dspace/content/Bitstream.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/Bitstream.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/content/Bitstream.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -62,7 +62,7 @@
  * When modifying the bitstream metadata, changes are not reflected in the
  * database until <code>update</code> is called. Note that you cannot alter
  * the contents of a bitstream; you need to create a new bitstream.
- * 
+ *
  * @author Robert Tansley
  * @version $Revision$
  */
@@ -139,7 +139,7 @@
     /**
      * Get the name of this bitstream - typically the filename, without any path
      * information
-     * 
+     *
      * @return the name of the bitstream
      */
     public String getName()
@@ -158,7 +158,7 @@
      * Get the source of this bitstream - typically the filename with path
      * information (if originally provided) or the name of the tool that
      * generated this bitstream
-     * 
+     *
      * @return the source of the bitstream
      */
     public String getSource()
@@ -187,7 +187,7 @@
 
     /**
      * Get the checksum of the content of the bitstream.
-     * 
+     *
      * @return the checksum
      */
     public String getChecksum()
@@ -203,7 +203,7 @@
 
     /**
      * Get the algorithm used to calculate the checksum
-     * 
+     *
      * @return the algorithm, e.g. "MD5"
      */
     public String getChecksumAlgorithm()
@@ -219,7 +219,7 @@
 
     /**
      * Get the size of the bitstream
-     * 
+     *
      * @return the size in bytes
      */
     public long getSize()
@@ -236,7 +236,7 @@
     /**
      * Set the user's format description. This implies that the format of the
      * bitstream is uncertain, and the format is set to "unknown."
-     * 
+     *
      * @param desc the user's description of the format
      */
     public void setUserFormatDescription(String desc)
@@ -250,7 +250,7 @@
     /**
      * Get the user's format description. Returns null if the format is known by
      * the system.
-     * 
+     *
      * @return the user's format description.
      */
     public String getUserFormatDescription()
@@ -261,7 +261,7 @@
     /**
      * Get the description of the format - either the user's or the description
      * of the format defined by the system.
-     * 
+     *
      * @return a description of the format.
      */
     public String getFormatDescription()
@@ -284,7 +284,7 @@
 
     /**
      * Get the format of the bitstream
-     * 
+     *
      * @return the format of this bitstream
      */
     public BitstreamFormat getFormat()
@@ -296,7 +296,7 @@
      * Set the format of the bitstream. If the user has supplied a type
      * description, it is cleared. Passing in <code>null</code> sets the type
      * of this bitstream to "unknown".
-     * 
+     *
      * @param f
      *            the format of this bitstream, or <code>null</code> for
      *            unknown
@@ -330,7 +330,7 @@
 
     /**
      * Retrieve the contents of the bitstream
-     * 
+     *
      * @return a stream from which the bitstream can be read.
      * @throws AuthorizeException
      */
@@ -341,20 +341,20 @@
 
         return BitstreamStorageManager.retrieve(context, getID());
     }
-    
+
     /**
      * Determine if this bitstream is registered
-     * 
+     *
      * @return true if the bitstream is registered, false otherwise
      */
     public boolean isRegisteredBitstream()
     {
         return BitstreamStorageManager.isRegisteredBitstream(internalID);
     }
-    
+
     /**
      * Get the asset store number where this bitstream is stored
-     * 
+     *
      * @return the asset store number of the bitstream
      */
     public int getStoreNumber()
@@ -407,7 +407,7 @@
     static Bitstream register(Context context, int assetstore,
             String bitstreamPath) throws AuthorizeException, IOException
     {
-        
+
         Bitstream bitstream =  BitstreamDAOFactory.getInstance(context).register(assetstore,
                 bitstreamPath);
         context.addEvent(new Event(Event.CREATE, Constants.BITSTREAM, bitstream.getID(), "REGISTER"));
@@ -418,7 +418,7 @@
     public void update() throws AuthorizeException
     {
         dao.update(this);
-        
+
         if (modified)
          {
              context.addEvent(new Event(Event.MODIFY, Constants.BITSTREAM, getID(), null));

Modified: trunk/dspace-api/src/main/java/org/dspace/content/BitstreamFormat.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/BitstreamFormat.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/content/BitstreamFormat.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -140,10 +140,10 @@
         {
 			// No short_description='Unknown' found in bitstreamformatregistry
 			// table. On first load of registries this is expected because it
-			// hasn't been inserted yet! So, catch but ignore this runtime 
+			// hasn't been inserted yet! So, catch but ignore this runtime
 			// exception thrown by method findUnknown.
 		}
-		
+
         // If the exception was thrown, unknown will == null so go ahead and
         // load the new description. If not, check that the unknown's
         // registry's name is not being reset.

Modified: trunk/dspace-api/src/main/java/org/dspace/content/Bundle.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/Bundle.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/content/Bundle.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -114,7 +114,6 @@
     {
         this.name = name;
         modifiedMetadata = true;
-        modifiedMetadata = true;
     }
 
     public void unsetPrimaryBitstreamID()
@@ -210,7 +209,7 @@
         AuthorizeManager.inheritPolicies(context, this, b);
 
         bitstreams.add(b);
-        
+
         context.addEvent(new Event(Event.ADD, Constants.BUNDLE, getID(), Constants.BITSTREAM, b.getID(), String.valueOf(b.getSequenceID())));
     }
 
@@ -223,7 +222,7 @@
             if (bitstream.getID() == b.getID())
             {
                 i.remove();
-                
+
                 context.addEvent(new Event(Event.REMOVE, Constants.BUNDLE, getID(), Constants.BITSTREAM, b.getID(), String.valueOf(b.getSequenceID())));
             }
         }
@@ -260,7 +259,7 @@
     public void update() throws AuthorizeException
     {
         dao.update(this);
-        
+
          if (modified)
         {
             context.addEvent(new Event(Event.MODIFY, Constants.BUNDLE, getID(), null));

Modified: trunk/dspace-api/src/main/java/org/dspace/content/Collection.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/Collection.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/content/Collection.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -110,7 +110,7 @@
 
     /** Flag set when metadata is modified, for events */
     private boolean modifiedMetadata;
-    
+
     // FIXME: Maybe we should be smart about this and only store the IDs. OTOH,
     // Groups aren't that heavyweight, and cacheing them may be a good thing
     // for performance. A proxy implementation that retrieved them on demand
@@ -173,7 +173,7 @@
         setSubmitters(submitters);
 
         AuthorizeManager.addPolicy(context, this, Constants.ADD, submitters);
-        
+
 		modified = true;
         return submitters;
     }
@@ -227,7 +227,7 @@
 
     public void setMetadata(String field, String value)
     {
-        if ((field.trim()).equals("name") 
+        if ((field.trim()).equals("name")
                 && (value == null || value.trim().equals("")))
         {
             try
@@ -449,7 +449,7 @@
     public String getLicense()
     {
         String license = getMetadata("license");
-        
+
         if ((license == null) || license.equals(""))
         {
             // Fallback to site-wide default
@@ -623,7 +623,7 @@
     public void update() throws AuthorizeException
     {
         dao.update(this);
-        
+
         if (modified)
         {
             context.addEvent(new Event(Event.MODIFY, Constants.COLLECTION, getID(), null));

Modified: trunk/dspace-api/src/main/java/org/dspace/content/Community.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/Community.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/content/Community.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -125,7 +125,7 @@
 
     public void setMetadata(String field, String value)
     {
-        if ((field.trim()).equals("name") 
+        if ((field.trim()).equals("name")
                 && (value == null || value.trim().equals("")))
         {
             try
@@ -142,7 +142,7 @@
         modifiedMetadata = true;
         addDetails(field);
     }
-    
+
     public String getName()
     {
         return getMetadata("name");
@@ -151,7 +151,7 @@
     /**
      * Get the logo for the community. <code>null</code> is return if the
      * community does not have a logo.
-     * 
+     *
      * @return the logo of the community, or <code>null</code>
      */
     public Bitstream getLogo()
@@ -330,11 +330,11 @@
             ArchiveManager.move(context, community, null, parent);
             context.addEvent(
                     new Event(
-                            Event.ADD, 
-                            Constants.COMMUNITY, 
+                            Event.ADD,
+                            Constants.COMMUNITY,
                             parent.getID(),
-                            Constants.COMMUNITY, 
-                            community.getID(), 
+                            Constants.COMMUNITY,
+                            community.getID(),
                             community.getIdentifier().getCanonicalForm()
                             ));
         }
@@ -342,16 +342,16 @@
         {
             context.addEvent(
                     new Event(
-                            Event.ADD, 
-                            Constants.SITE, 
-                            Site.SITE_ID, 
-                            Constants.COMMUNITY, 
-                            community.getID(), 
+                            Event.ADD,
+                            Constants.SITE,
+                            Site.SITE_ID,
+                            Constants.COMMUNITY,
+                            community.getID(),
                             community.getIdentifier().getCanonicalForm()
                             ));
         }
-        
-        
+
+
         return community;
     }
 
@@ -438,7 +438,7 @@
     public void update() throws AuthorizeException
     {
         dao.update(this);
-        
+
 		if (modified)
         {
             context.addEvent(new Event(Event.MODIFY, Constants.COMMUNITY, getID(), null));

Modified: trunk/dspace-api/src/main/java/org/dspace/content/FormatIdentifier.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/FormatIdentifier.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/content/FormatIdentifier.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -50,7 +50,7 @@
  * registry in the database. For the moment, the format identifier simply uses
  * file extensions stored in the "BitstreamFormatIdentifier" table. This
  * probably isn't a particularly satisfactory long-term solution.
- * 
+ *
  * @author Robert Tansley
  * @version $Revision$
  */
@@ -59,10 +59,10 @@
     /**
      * Attempt to identify the format of a particular bitstream. If the format
      * is unknown, null is returned.
-     * 
+     *
      * @param bitstream
      *            the bitstream to identify the format of
-     * 
+     *
      * @return a format from the bitstream format registry, or null
      */
     public static BitstreamFormat guessFormat(Context context,
@@ -105,7 +105,7 @@
         if (!formats.isEmpty())
         {
             // We can do no better than guess the first if there are multiple
-            // results. 
+            // results.
             retFormat = formats.get(0);
         }
 

Modified: trunk/dspace-api/src/main/java/org/dspace/content/MetadataField.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/MetadataField.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/content/MetadataField.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -216,7 +216,7 @@
      * Return the HTML FORM key for the given field.
      *
      * FIXME: This is so utterly horrid and wrong I can't quite find the words.
-     * 
+     *
      * @param schema
      * @param element
      * @param qualifier

Modified: trunk/dspace-api/src/main/java/org/dspace/content/SupervisedItem.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/SupervisedItem.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/content/SupervisedItem.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -63,7 +63,7 @@
 {
     private GroupDAO groupDAO;
     private WorkspaceItemDAO wsiDAO;
-    
+
     public SupervisedItem(Context context, int id)
     {
         // construct a new workspace item
@@ -81,7 +81,7 @@
 
         return items.toArray(new SupervisedItem[0]);
     }
-    
+
     @Deprecated
     public static SupervisedItem[] findbyEPerson(Context context, EPerson ep)
     {
@@ -90,7 +90,7 @@
 
         return items.toArray(new SupervisedItem[0]);
     }
-    
+
     @Deprecated
     public Group[] getSupervisorGroups(Context context, int id)
     {
@@ -99,7 +99,7 @@
 
         return groups.toArray(new Group[0]);
     }
-    
+
     @Deprecated
     public Group[] getSupervisorGroups()
     {

Modified: trunk/dspace-api/src/main/java/org/dspace/content/WorkspaceItem.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/WorkspaceItem.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/content/WorkspaceItem.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -62,7 +62,7 @@
  * aren't fully instantiated unless explicitly required. Could be wasted
  * effort, however, as the number of workspace items in memory at any given
  * time will typically be very low.
- * 
+ *
  * @author Robert Tansley
  * @version $Revision$
  */
@@ -93,7 +93,7 @@
 
         dao = WorkspaceItemDAOFactory.getInstance(context);
     }
-    
+
     public int getID()
     {
         return id;

Modified: trunk/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -260,9 +260,11 @@
                 File.separator + "config" + File.separator;
             File propsFile = new File(parent, propsFilename);
             Properties modsConfig = new Properties();
+            FileInputStream pfs = null;
             try
             {
-                modsConfig.load(new FileInputStream(propsFile));
+                pfs = new FileInputStream(propsFile);
+                modsConfig.load(pfs);
             }
             catch (IOException e)
             {
@@ -270,6 +272,12 @@
                 throw new CrosswalkInternalException("MODS crosswalk cannot "+
                     "open config file: "+e.toString());
             }
+            finally
+            {
+                if (pfs != null)
+                    try { pfs.close(); } catch (IOException ioe) { }
+            }
+
             modsMap = new HashMap();
             Enumeration pe = modsConfig.propertyNames();
             while (pe.hasMoreElements())

Modified: trunk/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -280,7 +280,17 @@
             File.separator + "config" + File.separator;
         File propsFile = new File(parent, propsFilename);
         Properties qdcProps = new Properties();
-        qdcProps.load(new FileInputStream(propsFile));
+        FileInputStream pfs = null;
+        try
+        {
+            pfs = new FileInputStream(propsFile);
+            qdcProps.load(pfs);
+        }
+        finally
+        {
+            if (pfs != null)
+                try { pfs.close(); } catch (IOException ioe) { }
+        }
 
         // grovel properties to initialize qdc->element and element->qdc maps.
         // evaluate the XML fragment with a wrapper including namespaces.

Modified: trunk/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -120,7 +120,16 @@
 
         // Read in configuration
         Properties crosswalkProps = new Properties();
-        crosswalkProps.load(new FileInputStream(config));
+        FileInputStream fis = new FileInputStream(config);
+        try
+        {
+            crosswalkProps.load(fis);
+        }
+        finally
+        {
+            if (fis != null)
+                try { fis.close(); } catch (IOException ioe) { }
+        }
 
         Enumeration e = crosswalkProps.keys();
         while (e.hasMoreElements())

Modified: trunk/dspace-api/src/main/java/org/dspace/core/LogManager.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/core/LogManager.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/core/LogManager.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -84,6 +84,8 @@
             contextExtraInfo = "no_context";
         }
 
-        return email + ":" + contextExtraInfo + ":" + action + ":" + extrainfo;
+        StringBuilder result = new StringBuilder();
+        result.append(email).append(":").append(contextExtraInfo).append(":").append(action).append(":").append(extrainfo);
+        return result.toString();
     }
 }

Modified: trunk/dspace-api/src/main/java/org/dspace/core/PluginManager.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/core/PluginManager.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/core/PluginManager.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -564,6 +564,9 @@
     public static void checkConfiguration()
         throws IOException
     {
+        FileReader fr = null;
+        BufferedReader cr = null;
+
         /*  XXX TODO:  (maybe) test that implementation class is really a
          *  subclass or impl of the plugin "interface"
          */
@@ -574,52 +577,64 @@
         Map namedKey = new HashMap();
         Map selfnamedKey = new HashMap();
         Map reusableKey = new HashMap();
+        HashMap keyMap = new HashMap();
 
         // 1. First pass -- grovel the actual config file to check for
         //    duplicate keys, since Properties class hides them from us.
         //    Also build lists of each type of key, check for misspellings.
         File config = ConfigurationManager.getConfigurationFile();
-        BufferedReader cr = new BufferedReader(new FileReader(config));
-        String line = null;
-        boolean continued = false;
-        HashMap keyMap = new HashMap();
-        Pattern keyPattern = Pattern.compile("([^\\s\\=\\:]+)");
-        while ((line = cr.readLine()) != null)
+        try
         {
-            line = line.trim();
-            if (line.startsWith("!") || line.startsWith("#"))
-                continued = false;
-            else
+            fr = new FileReader(config);
+            cr = new BufferedReader(fr);
+            String line = null;
+            boolean continued = false;
+            Pattern keyPattern = Pattern.compile("([^\\s\\=\\:]+)");
+            while ((line = cr.readLine()) != null)
             {
-                if (!continued && line.startsWith("plugin."))
+                line = line.trim();
+                if (line.startsWith("!") || line.startsWith("#"))
+                    continued = false;
+                else
                 {
-                    Matcher km = keyPattern.matcher(line);
-                    if (km.find())
+                    if (!continued && line.startsWith("plugin."))
                     {
-                        String key = line.substring(0, km.end(1));
-                        if (keyMap.containsKey(key))
-                            log.error("Duplicate key \""+key+"\" in DSpace configuration file="+config.toString());
-                        else
-                            keyMap.put(key, key);
+                        Matcher km = keyPattern.matcher(line);
+                        if (km.find())
+                        {
+                            String key = line.substring(0, km.end(1));
+                            if (keyMap.containsKey(key))
+                                log.error("Duplicate key \""+key+"\" in DSpace configuration file="+config.toString());
+                            else
+                                keyMap.put(key, key);
 
-                        if (key.startsWith(SINGLE_PREFIX))
-                            singleKey.put(key.substring(SINGLE_PREFIX.length()), key);
-                        else if (key.startsWith(SEQUENCE_PREFIX))
-                            sequenceKey.put(key.substring(SEQUENCE_PREFIX.length()), key);
-                        else if (key.startsWith(NAMED_PREFIX))
-                            namedKey.put(key.substring(NAMED_PREFIX.length()), key);
-                        else if (key.startsWith(SELFNAMED_PREFIX))
-                            selfnamedKey.put(key.substring(SELFNAMED_PREFIX.length()), key);
-                        else if (key.startsWith(REUSABLE_PREFIX))
-                            reusableKey.put(key.substring(REUSABLE_PREFIX.length()), key);
-                        else
-                            log.error("Key with unknown prefix \""+key+"\" in DSpace configuration file="+config.toString());
+                            if (key.startsWith(SINGLE_PREFIX))
+                                singleKey.put(key.substring(SINGLE_PREFIX.length()), key);
+                            else if (key.startsWith(SEQUENCE_PREFIX))
+                                sequenceKey.put(key.substring(SEQUENCE_PREFIX.length()), key);
+                            else if (key.startsWith(NAMED_PREFIX))
+                                namedKey.put(key.substring(NAMED_PREFIX.length()), key);
+                            else if (key.startsWith(SELFNAMED_PREFIX))
+                                selfnamedKey.put(key.substring(SELFNAMED_PREFIX.length()), key);
+                            else if (key.startsWith(REUSABLE_PREFIX))
+                                reusableKey.put(key.substring(REUSABLE_PREFIX.length()), key);
+                            else
+                                log.error("Key with unknown prefix \""+key+"\" in DSpace configuration file="+config.toString());
+                        }
                     }
+                    continued = line.length() > 0 && line.charAt(line.length()-1) == '\\';
                 }
-                continued = line.length() > 0 && line.charAt(line.length()-1) == '\\';
             }
         }
+        finally
+        {
+            if (cr != null)
+                try { cr.close(); } catch (IOException ioe) { }
 
+            if (fr != null)
+                try { fr.close(); } catch (IOException ioe) { }
+        }
+
         // 1.1 Sanity check, make sure keyMap == set of keys from Configuration
         Enumeration pne = ConfigurationManager.propertyNames();
         HashSet pn = new HashSet();

Modified: trunk/dspace-api/src/main/java/org/dspace/eperson/EPerson.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/eperson/EPerson.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/eperson/EPerson.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -87,7 +87,7 @@
 
     /** Flag set when metadata is modified, for events */
     private boolean modifiedMetadata;
-    
+
     public enum EPersonMetadataField
     {
         FIRSTNAME ("firstname"),
@@ -136,7 +136,7 @@
             String>(EPersonMetadataField.class);
 
         context.cache(this, id);
-                
+
         modified = modifiedMetadata = false;
         clearDetails();
     }
@@ -212,7 +212,7 @@
     }
 
     // end identifier handling methos
-    
+
     /**
      * Get the e-person's full name, combining first and last name in a
      * displayable string.
@@ -278,7 +278,6 @@
     {
         this.requireCertificate = requireCertificate;
         modified = true;
-        modified = true;
     }
 
     public boolean getRequireCertificate()
@@ -290,7 +289,6 @@
     {
         this.selfRegistered = selfRegistered;
         modified = true;
-        modified = true;
     }
 
     public boolean getSelfRegistered()
@@ -328,7 +326,6 @@
     {
         metadata.put(EPersonMetadataField.PASSWORD, Utils.getMD5(password));
         modified = true;
-        modified = true;
     }
 
     public boolean checkPassword(String attempt)
@@ -434,7 +431,5 @@
     {
         dao.delete(getID());
         context.addEvent(new Event(Event.DELETE, Constants.EPERSON, getID(), getEmail()));
-
-        
     }
 }

Modified: trunk/dspace-api/src/main/java/org/dspace/eperson/Group.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/eperson/Group.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/eperson/Group.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -89,7 +89,7 @@
 
     /** Flag set when metadata is modified, for events */
     private boolean modifiedMetadata;
-    
+
     public Group(Context context, int id)
     {
         this.id = id;
@@ -249,9 +249,9 @@
     {
         GroupDAO dao = GroupDAOFactory.getInstance(context);
         Group group = dao.create();
-        
+
 		context.addEvent(new Event(Event.CREATE, Constants.GROUP, group.getID(), null));
-        
+
         return group;
     }
 
@@ -259,7 +259,7 @@
     public void update() throws AuthorizeException
     {
         dao.update(this);
-        
+
         if (modifiedMetadata)
         {
             context.addEvent(new Event(Event.MODIFY_METADATA, Constants.GROUP, getID(), getDetails()));
@@ -273,7 +273,7 @@
     {
         dao.delete(this.getID());
         context.addEvent(new Event(Event.DELETE, Constants.GROUP, getID(), getName()));
-        
+
     }
 
     @Deprecated

Modified: trunk/dspace-api/src/main/java/org/dspace/search/Harvest.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/search/Harvest.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/search/Harvest.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -62,7 +62,7 @@
  * Utility class for extracting information about items, possibly just within a
  * certain community or collection, that have been created, modified or
  * withdrawn within a particular range of dates.
- * 
+ *
  * @author Robert Tansley
  * @version $Revision$
  */
@@ -70,7 +70,7 @@
 {
     /** log4j logger */
     private static Logger log = Logger.getLogger(Harvest.class);
-    
+
     /**
      * Obtain information about items that have been created, modified or
      * withdrawn within a given date range. You can also specify 'offset' and
@@ -80,7 +80,7 @@
      * (and OAI-PMH).
      * <P>
      * FIXME: Assumes all in_archive items have public metadata
-     * 
+     *
      * @param context
      *            DSpace context
      * @param scope
@@ -135,7 +135,7 @@
                     && ((limit == 0) || (index < (offset + limit))))
             {
                 HarvestedItemInfo itemInfo = new HarvestedItemInfo();
-                
+
                 itemInfo.context = context;
                 itemInfo.identifier = item.getIdentifier();
                 itemInfo.itemID = item.getID();
@@ -165,7 +165,7 @@
     /**
      * Get harvested item info for a single item. <code>item</code> field in
      * returned <code>HarvestedItemInfo</code> object is always filled out.
-     * 
+     *
      * @param context
      *            DSpace context
      * @param identifier
@@ -174,7 +174,7 @@
      *            if <code>true</code> the <code>collectionIdentifiers</code>
      *            field of the <code>HarvestedItemInfo</code> object is filled
      *            out
-     * 
+     *
      * @return <code>HarvestedItemInfo</code> object for the single item, or
      *         <code>null</code>
      */
@@ -218,7 +218,7 @@
 
     /**
      * Fill out the containers field of the HarvestedItemInfo object
-     * 
+     *
      * @param context
      *            DSpace context
      * @param itemInfo

Modified: trunk/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -107,24 +107,24 @@
         	{
         		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);
+            // 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);
+            }
     	}
 
-    	if (type.equalsIgnoreCase(OrderFormat.TEXT) && textDelegate != null)
-    	{
-    		return textDelegate.makeSortString(value, language);
-    	}
-    	
     	return value;
     }
 

Modified: trunk/dspace-api/src/main/java/org/dspace/sort/SortOption.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/sort/SortOption.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/sort/SortOption.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -304,16 +304,21 @@
     {
         if (SortOption.sortOptionsMap != null)
             return SortOption.sortOptionsMap;
-        
-        SortOption.sortOptionsMap = new HashMap<Integer, SortOption>();
-        synchronized (SortOption.sortOptionsMap)
+
+        synchronized (SortOption.class)
         {
-            for (SortOption so : SortOption.getSortOptions())
+            if (SortOption.sortOptionsMap == null)
             {
-                SortOption.sortOptionsMap.put(new Integer(so.getNumber()), so);
+                Map<Integer, SortOption> newSortOptionsMap = new HashMap<Integer, SortOption>();
+                for (SortOption so : SortOption.getSortOptions())
+                {
+                    newSortOptionsMap.put(new Integer(so.getNumber()), so);
+                }
+
+                SortOption.sortOptionsMap = newSortOptionsMap;
             }
         }
-        
+
     	return SortOption.sortOptionsMap;
     }
 
@@ -327,17 +332,22 @@
         if (SortOption.sortOptionsSet != null)
             return SortOption.sortOptionsSet;
         
-        SortOption.sortOptionsSet = new HashSet<SortOption>();
-        synchronized (SortOption.sortOptionsSet)
+        synchronized (SortOption.class)
         {
-            int idx = 1;
-            String option;
+            if (SortOption.sortOptionsSet == null)
+            {
+                Set<SortOption> newSortOptionsSet = new HashSet<SortOption>();
+                int idx = 1;
+                String option;
 
-            while ( ((option = ConfigurationManager.getProperty("webui.itemlist.sort-option." + idx))) != null)
-            {
-                SortOption so = new SortOption(idx, option);
-                SortOption.sortOptionsSet.add(so);
-                idx++;
+                while ( ((option = ConfigurationManager.getProperty("webui.itemlist.sort-option." + idx))) != null)
+                {
+                    SortOption so = new SortOption(idx, option);
+                    newSortOptionsSet.add(so);
+                    idx++;
+                }
+
+                SortOption.sortOptionsSet = newSortOptionsSet;
             }
         }
 

Modified: trunk/dspace-api/src/main/java/org/dspace/storage/bitstore/BitstreamStorageManager.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/storage/bitstore/BitstreamStorageManager.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/storage/bitstore/BitstreamStorageManager.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -71,7 +71,7 @@
  * <P>
  * Stores, retrieves and deletes bitstreams.
  * </P>
- * 
+ *
  * <P>
  * Presently, asset stores are specified in <code>dspace.cfg</code>. Since
  * Java does not offer a way of detecting free disk space, the asset store to
@@ -80,17 +80,17 @@
  * available space in the asset stores, and DSpace (Tomcat) has to be restarted
  * when the asset store for new ('incoming') bitstreams is changed.
  * </P>
- * 
+ *
  * <P>
  * Mods by David Little, UCSD Libraries 12/21/04 to allow the registration of
  * files (bitstreams) into DSpace.
  * </P>
- * 
- * <p>Cleanup integration with checker package by Nate Sarr 2006-01. N.B. The 
- * dependency on the checker package isn't ideal - a Listener pattern would be 
+ *
+ * <p>Cleanup integration with checker package by Nate Sarr 2006-01. N.B. The
+ * dependency on the checker package isn't ideal - a Listener pattern would be
  * better but was considered overkill for the purposes of integrating the checker.
- * It would be worth re-considering a Listener pattern if another package needs to 
- * be notified of BitstreamStorageManager actions.</p> 
+ * It would be worth re-considering a Listener pattern if another package needs to
+ * be notified of BitstreamStorageManager actions.</p>
  *
  * @author Peter Breton, Robert Tansley, David Little, Nathan Sarr
  * @version $Revision$
@@ -149,7 +149,7 @@
 		// 'assetstore.dir' is always store number 0
 		String sAssetstoreDir = ConfigurationManager
 				.getProperty("assetstore.dir");
- 
+
 		// see if conventional assetstore or srb
 		if (sAssetstoreDir != null) {
 			stores.add(sAssetstoreDir); // conventional (non-srb)
@@ -244,22 +244,22 @@
 
     /**
      * Store a stream of bits.
-     * 
+     *
      * <p>
      * If this method returns successfully, the bits have been stored, and RDBMS
      * metadata entries are in place (the context still needs to be completed to
      * finalize the transaction).
      * </p>
-     * 
+     *
      * <p>
      * If this method returns successfully and the context is aborted, then the
      * bits will be stored in the asset store and the RDBMS metadata entries
      * will exist, but with the deleted flag set.
      * </p>
-     * 
+     *
      * If this method throws an exception, then any of the following may be
      * true:
-     * 
+     *
      * <ul>
      * <li>Neither bits nor RDBMS metadata entries have been stored.
      * <li>RDBMS metadata entries with the deleted flag set have been stored,
@@ -267,14 +267,14 @@
      * <li>RDBMS metadata entries with the deleted flag set have been stored,
      * and some or all of the bits have also been stored.
      * </ul>
-     * 
+     *
      * @param context
      *            The current context
      * @param is
      *            The stream of bits to store
      * @exception IOException
      *                If a problem occurs while storing the bits
-     * 
+     *
      * @return The ID of the stored bitstream
      */
     public static void store(Context context, Bitstream bitstream,
@@ -327,8 +327,11 @@
 
         bitstream.setSize(file.length());
 
-        bitstream.setChecksum(Utils.toHex(dis.getMessageDigest().digest()));
-        bitstream.setChecksumAlgorithm("MD5");
+        if (dis != null)
+        {
+            bitstream.setChecksum(Utils.toHex(dis.getMessageDigest().digest()));
+            bitstream.setChecksumAlgorithm("MD5");
+        }
         bitstream.setDeleted(false);
 
         dao.update(bitstream);
@@ -371,60 +374,60 @@
 		//
 		// DSpace refers to checksum, writes it in METS, and uses it as an
 		// AIP filename (!), but never seems to validate with it. Furthermore,
-		// DSpace appears to hardcode the algorithm to MD5 in some places--see 
+		// DSpace appears to hardcode the algorithm to MD5 in some places--see
 		// METSExport.java.
 		//
-		// To remain compatible with DSpace we calculate an MD5 checksum on 
-		// LOCAL registered files. But for REMOTE (e.g. SRB) files we 
-		// calculate an MD5 on just the fileNAME. The reasoning is that in the 
+		// To remain compatible with DSpace we calculate an MD5 checksum on
+		// LOCAL registered files. But for REMOTE (e.g. SRB) files we
+		// calculate an MD5 on just the fileNAME. The reasoning is that in the
 		// case of a remote file, calculating an MD5 on the file itself will
-		// generate network traffic to read the file's bytes. In this case it 
-		// would be better have a proxy process calculate MD5 and store it as 
+		// generate network traffic to read the file's bytes. In this case it
+		// would be better have a proxy process calculate MD5 and store it as
 		// an SRB metadata attribute so it can be retrieved simply from SRB.
 		//
 		// TODO set this up as a proxy server process so no net activity
-		
+
 		// FIXME this is a first class HACK! for the reasons described above
-		if (file instanceof LocalFile) 
+		if (file instanceof LocalFile)
 		{
 
 			// get MD5 on the file for local file
 			DigestInputStream dis = null;
-			try 
+			try
 			{
-				dis = new DigestInputStream(FileFactory.newFileInputStream(file), 
+				dis = new DigestInputStream(FileFactory.newFileInputStream(file),
 						MessageDigest.getInstance("MD5"));
-			} 
-			catch (NoSuchAlgorithmException e) 
+			}
+			catch (NoSuchAlgorithmException e)
 			{
 				log.warn("Caught NoSuchAlgorithmException", e);
 				throw new IOException("Invalid checksum algorithm");
 			}
-			catch (IOException e) 
+			catch (IOException e)
 			{
-				log.error("File: " + file.getAbsolutePath() 
+				log.error("File: " + file.getAbsolutePath()
 						+ " to be registered cannot be opened - is it "
 						+ "really there?");
 				throw e;
 			}
 			final int BUFFER_SIZE = 1024 * 4;
 			final byte[] buffer = new byte[BUFFER_SIZE];
-			while (true) 
+			while (true)
 			{
 				final int count = dis.read(buffer, 0, BUFFER_SIZE);
-				if (count == -1) 
+				if (count == -1)
 				{
 					break;
 				}
 			}
             bitstream.setChecksum(Utils.toHex(dis.getMessageDigest().digest()));
 			dis.close();
-		} 
+		}
 		else if (file instanceof SRBFile)
 		{
 			if (!file.exists())
 			{
-				log.error("File: " + file.getAbsolutePath() 
+				log.error("File: " + file.getAbsolutePath()
 						+ " is not in SRB MCAT");
 				throw new IOException("File is not in SRB MCAT");
 			}
@@ -433,11 +436,11 @@
 			int iLastSlash = bitstreamPath.lastIndexOf('/');
 			String sFilename = bitstreamPath.substring(iLastSlash + 1);
 			MessageDigest md = null;
-			try 
+			try
 			{
 				md = MessageDigest.getInstance("MD5");
-			} 
-			catch (NoSuchAlgorithmException e) 
+			}
+			catch (NoSuchAlgorithmException e)
 			{
 				log.error("Caught NoSuchAlgorithmException", e);
 				throw new IOException("Invalid checksum algorithm");
@@ -457,7 +460,7 @@
 
         dao.update(bitstream);
 
-		if (log.isDebugEnabled()) 
+		if (log.isDebugEnabled())
 		{
 			log.debug("Stored bitstream " + bitstream.getID() + " in file "
 					+ file.getAbsolutePath());
@@ -473,7 +476,7 @@
 	 */
 	public static boolean isRegisteredBitstream(String internalId) {
 	    if (internalId.substring(0, REGISTERED_FLAG.length())
-	            .equals(REGISTERED_FLAG)) 
+	            .equals(REGISTERED_FLAG))
 	    {
 	        return true;
 	    }
@@ -483,14 +486,14 @@
     /**
      * Retrieve the bits for the bitstream with ID. If the bitstream does not
      * exist, or is marked deleted, returns null.
-     * 
+     *
      * @param context
      *            The current context
      * @param id
      *            The ID of the bitstream to retrieve
      * @exception IOException
      *                If a problem occurs while retrieving the bits
-     * 
+     *
      * @return The stream of bits, or null
      */
     public static InputStream retrieve(Context context, int id)
@@ -511,9 +514,9 @@
      * Clean up the bitstream storage area. This method deletes any bitstreams
      * which are more than 1 hour old and marked deleted. The deletions cannot
      * be undone.
-     * 
+     *
      * @param deleteDbRecords if true deletes the database records otherwise it
-     * 	           only deletes the files and directories in the assetstore  
+     * 	           only deletes the files and directories in the assetstore
      * @exception IOException
      *                If a problem occurs while cleaning up
      */
@@ -593,7 +596,7 @@
 
                 // if the file was deleted then
                 // try deleting the parents
-                // Otherwise the cleanup script is set to 
+                // Otherwise the cleanup script is set to
                 // leave the db records then the file
                 // and directories have already been deleted
                 // if this is turned off then it still looks like the
@@ -602,7 +605,7 @@
                 {
                     deleteParents(file);
                 }
-                
+
                 // Make sure to commit our outstanding work every 100
                 // iterations. Otherwise you risk losing the entire transaction
                 // if we hit an exception, which isn't useful at all for large
@@ -639,7 +642,7 @@
 
     /**
      * Return true if this file is too recent to be deleted, false otherwise.
-     * 
+     *
      * @param file
      *            The file to check
      * @return True if this file is too recent to be deleted
@@ -660,7 +663,7 @@
 
     /**
      * Delete empty parent directories.
-     * 
+     *
      * @param file
      *            The file with parent directories to delete
      */
@@ -670,7 +673,7 @@
         {
             return;
         }
- 
+
 		GeneralFile tmp = file;
 
         for (int i = 0; i < directoryLevels; i++)
@@ -693,12 +696,12 @@
     /**
      * Return the file corresponding to a bitstream. It's safe to pass in
      * <code>null</code>.
-     * 
+     *
      * @param storeNumber the store number that the bitstream is in
      * @param sInternalID the internal id of the bitstream
-     * 
+     *
      * @return The corresponding file in the file system, or <code>null</code>
-     * 
+     *
      * @exception IOException
      *                If a problem occurs while determining the file
      */
@@ -729,7 +732,7 @@
 			sIntermediatePath = "";
 		}
         else
-        {	
+        {
 			// Sanity Check: If the internal ID contains a
 			// pathname separator, it's probably an attempt to
 			// make a path traversal attack, so ignore the path
@@ -740,7 +743,7 @@
 				sInternalId = sInternalId.substring(
                         sInternalId.lastIndexOf(File.separator)+1);
             }
-			
+
 			sIntermediatePath = getIntermediatePath(sInternalId);
 		}
 

Modified: trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -276,10 +276,19 @@
     public static TableRow querySingle(Context context, String query,
             Object... parameters) throws SQLException
     {
-        TableRowIterator iterator = query(context, query, parameters);
+        TableRow retRow = null;
+        TableRowIterator iterator = null;
+        try
+        {
+            iterator = query(context, query, parameters);
+            retRow = (!iterator.hasNext()) ? null : iterator.next();
+        }
+        finally
+        {
+            if (iterator != null)
+                iterator.close();
+        }
 
-        TableRow retRow = (!iterator.hasNext()) ? null : iterator.next();
-        iterator.close();
         return (retRow);
     }
     
@@ -304,10 +313,18 @@
     public static TableRow querySingleTable(Context context, String table,
             String query, Object... parameters) throws SQLException
     {
+        TableRow retRow = null;
         TableRowIterator iterator = queryTable(context, canonicalize(table), query, parameters);
 
-        TableRow retRow = (!iterator.hasNext()) ? null : iterator.next();
-        iterator.close();
+        try
+        {
+            retRow = (!iterator.hasNext()) ? null : iterator.next();
+        }
+        finally
+        {
+            if (iterator != null)
+                iterator.close();
+        }
         return (retRow);
     }
     
@@ -564,27 +581,45 @@
     public static void insert(Context context, TableRow row)
             throws SQLException
     {
+        int newID = -1;
         String table = canonicalize(row.getTable());
+        Statement statement = null;
+        ResultSet rs = null;
 
-        // Get an ID (primary key) for this row by using the "getnextid"
-        // SQL function in Postgres, or directly with sequences in Oracle
-        String myQuery = "SELECT getnextid('" + table + "') AS result";
-
-        if ("oracle".equals(ConfigurationManager.getProperty("db.name")))
+        try
         {
-            myQuery = "SELECT " + table + "_seq" + ".nextval FROM dual";
-        }
+            // Get an ID (primary key) for this row by using the "getnextid"
+            // SQL function in Postgres, or directly with sequences in Oracle
+            String myQuery = "SELECT getnextid('" + table + "') AS result";
 
-        Statement statement = context.getDBConnection().createStatement();
-        ResultSet rs = statement.executeQuery(myQuery);
+            if ("oracle".equals(ConfigurationManager.getProperty("db.name")))
+            {
+                myQuery = "SELECT " + table + "_seq" + ".nextval FROM dual";
+            }
 
-        rs.next();
+            statement = context.getDBConnection().createStatement();
+            rs = statement.executeQuery(myQuery);
 
-        int newID = rs.getInt(1);
-        rs.close();
+            rs.next();
 
-        statement.close();
+            newID = rs.getInt(1);
+        }
+        finally
+        {
+            if (rs != null)
+            {
+                try { rs.close(); } catch (SQLException sqle) { }
+            }
 
+            if (statement != null)
+            {
+                try { statement.close(); } catch (SQLException sqle) { }
+            }
+        }
+
+        if (newID < 0)
+            throw new SQLException("Unable to retrieve sequence ID");
+
         // Set the ID in the table row object
         row.setColumn(getPrimaryKeyColumn(table), newID);
 
@@ -1354,7 +1389,9 @@
     private static Map retrieveColumnInfo(String table) throws SQLException
     {
         Connection connection = null;
-
+        ResultSet pkcolumns = null;
+        ResultSet columns = null;
+        
         try
         {
             String schema = ConfigurationManager.getProperty("db.schema");
@@ -1367,13 +1404,13 @@
             String tname = (table.length() >= max) ? table
                     .substring(0, max - 1) : table;
 
-            ResultSet pkcolumns = metadata.getPrimaryKeys(null, schema, tname);
+            pkcolumns = metadata.getPrimaryKeys(null, schema, tname);
             Set pks = new HashSet();
 
             while (pkcolumns.next())
                 pks.add(pkcolumns.getString(4));
 
-            ResultSet columns = metadata.getColumns(null, schema, tname, null);
+            columns = metadata.getColumns(null, schema, tname, null);
 
             while (columns.next())
             {
@@ -1394,9 +1431,19 @@
         }
         finally
         {
+            if (pkcolumns != null)
+            {
+                try { pkcolumns.close(); } catch (SQLException sqle) { }
+            }
+
+            if (columns != null)
+            {
+                try { columns.close(); } catch (SQLException sqle) { }
+            }
+
             if (connection != null)
             {
-                connection.close();
+                try { connection.close(); } catch (SQLException sqle) { }
             }
         }
     }

Modified: trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/TableRowIterator.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/TableRowIterator.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/TableRowIterator.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -108,7 +108,7 @@
     /**
      * Finalize -- this method is called when this object is GC-ed.
      */
-    public void finalize()
+    protected void finalize()
     {
         close();
     }

Modified: trunk/dspace-api/src/main/java/org/dspace/workflow/WorkflowItem.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/workflow/WorkflowItem.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/workflow/WorkflowItem.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -55,7 +55,7 @@
 
 /**
  * Class representing an item going through the workflow process in DSpace
- * 
+ *
  * @author Robert Tansley
  * @version $Revision$
  */
@@ -109,7 +109,7 @@
 
     /**
      * get owner of WorkflowItem
-     * 
+     *
      * @return EPerson owner
      */
     public EPerson getOwner()
@@ -132,7 +132,7 @@
 
     /**
      * Set the state of WorkflowItem.
-     * 
+     *
      * @param state new state (from <code>WorkflowManager</code>)
      */
     public void setState(int state)
@@ -145,7 +145,7 @@
     {
         return item;
     }
-    
+
     public void setItem(Item item)
     {
         this.item = item;
@@ -155,7 +155,7 @@
     {
         return collection;
     }
-    
+
     public void setCollection(Collection collection)
     {
         this.collection = collection;

Modified: trunk/dspace-api/src/main/java/org/dspace/workflow/WorkflowManager.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/workflow/WorkflowManager.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-api/src/main/java/org/dspace/workflow/WorkflowManager.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -74,26 +74,26 @@
 
 /**
  * Workflow state machine
- * 
+ *
  * Notes:
- * 
+ *
  * Determining item status from the database:
- * 
+ *
  * When an item has not been submitted yet, it is in the user's personal
  * workspace (there is a row in PersonalWorkspace pointing to it.)
- * 
+ *
  * When an item is submitted and is somewhere in a workflow, it has a row in the
  * WorkflowItem table pointing to it. The state of the workflow can be
  * determined by looking at WorkflowItem.getState()
- * 
+ *
  * When a submission is complete, the WorkflowItem pointing to the item is
  * destroyed and the archive() method is called, which hooks the item up to the
  * archive.
- * 
+ *
  * Notification: When an item enters a state that requires notification,
  * (WFSTATE_STEP1POOL, WFSTATE_STEP2POOL, WFSTATE_STEP3POOL,) the workflow needs
  * to notify the appropriate groups that they have a pending task to claim.
- * 
+ *
  * Revealing lists of approvers, editors, and reviewers. A method could be added
  * to do this, but it isn't strictly necessary. (say public List
  * getStateEPeople( WorkflowItem wi, int state ) could return people affected by
@@ -162,7 +162,7 @@
     /**
      * startWorkflow() begins a workflow - in a single transaction do away with
      * the PersonalWorkspace entry and turn it into a WorkflowItem.
-     * 
+     *
      * @param c
      *            Context
      * @param wsi
@@ -211,7 +211,7 @@
      * getOwnedTasks() returns a List of WorkflowItems containing the tasks
      * claimed and owned by an EPerson. The GUI displays this info on the
      * MyDSpace page.
-     * 
+     *
      * @param e
      *            The EPerson we want to fetch owned tasks for.
      */
@@ -224,7 +224,7 @@
     /**
      * getPooledTasks() returns a List of WorkflowItems an EPerson could claim
      * (as a reviewer, etc.) for display on a user's MyDSpace page.
-     * 
+     *
      * @param e
      *            The Eperson we want to fetch the pooled tasks for.
      */
@@ -244,7 +244,7 @@
 
     /**
      * claim() claims a workflow task for an EPerson
-     * 
+     *
      * @param wi
      *            WorkflowItem to do the claim on
      * @param e
@@ -295,7 +295,7 @@
      * the item arrives at the submit state, then remove the WorkflowItem and
      * call the archive() method to put it in the archive, and email notify the
      * submitter of a successful submission
-     * 
+     *
      * @param c
      *            Context
      * @param wi
@@ -349,7 +349,7 @@
 
     /**
      * unclaim() returns an owned task/item to the pool
-     * 
+     *
      * @param c
      *            Context
      * @param wi
@@ -400,7 +400,7 @@
      * abort() aborts a workflow, completely deleting it (administrator do this)
      * (it will basically do a reject from any state - the item ends up back in
      * the user's PersonalWorkspace
-     * 
+     *
      * @param c
      *            Context
      * @param wi
@@ -455,7 +455,7 @@
             {
                 // get a list of all epeople in group (or any subgroups)
                 EPerson[] epa = Group.allMembers(c, mygroup);
-                
+
                 // there were reviewers, change the state
                 //  and add them to the list
                 createTasks(c, wi, epa);
@@ -496,7 +496,7 @@
             {
                 //get a list of all epeople in group (or any subgroups)
                 EPerson[] epa = Group.allMembers(c, mygroup);
-                
+
                 // there were approvers, change the state
                 //  timestamp, and add them to the list
                 createTasks(c, wi, epa);
@@ -532,7 +532,7 @@
             {
                 // get a list of all epeople in group (or any subgroups)
                 EPerson[] epa = Group.allMembers(c, mygroup);
-                
+
                 // there were editors, change the state
                 //  timestamp, and add them to the list
                 createTasks(c, wi, epa);
@@ -594,7 +594,7 @@
      * Commit the contained item to the main archive. The item is associated
      * with the relevant collection, added to the search index, and any other
      * tasks such as assigning dates are performed.
-     * 
+     *
      * @return the fully archived item.
      */
     private static Item archive(Context c, WorkflowItem wfi)
@@ -633,7 +633,7 @@
             Email email = ConfigurationManager.getEmail(
                     I18nUtil.getEmailFilename(supportedLocale,
                         "submit_archive"));
-            
+
             // Here, we try to get an external identifier for the item to send
             // in the notification email. If no external identifier exists, we
             // just send the "local" item URL.
@@ -684,7 +684,7 @@
     /**
      * Return the workflow item to the workspace of the submitter. The workflow
      * item is removed, and a workspace item created.
-     * 
+     *
      * @param c
      *            Context
      * @param wfi
@@ -715,7 +715,7 @@
      * rejects an item - rejection means undoing a submit - WorkspaceItem is
      * created, and the WorkflowItem is removed, user is emailed
      * rejection_message.
-     * 
+     *
      * @param c
      *            Context
      * @param wi
@@ -825,17 +825,17 @@
                     {
                         case WFSTATE_STEP1POOL:
                             message = messages.getString("org.dspace.workflow.WorkflowManager.step1");
-                            
+
                             break;
-                            
+
                         case WFSTATE_STEP2POOL:
                             message = messages.getString("org.dspace.workflow.WorkflowManager.step2");
-                            
+
                             break;
-                            
+
                         case WFSTATE_STEP3POOL:
                             message = messages.getString("org.dspace.workflow.WorkflowManager.step3");
-                            
+
                             break;
                     }
                     email.addArgument(message);
@@ -856,7 +856,7 @@
     /**
      * Add all the specified people to the list of email recipients,
      * and send it
-     * 
+     *
      * @param c
      *            Context
      * @param epeople
@@ -925,7 +925,7 @@
 
     /**
      * get the title of the item in this workflow
-     * 
+     *
      * @param wi  the workflow item object
      */
     public static String getItemTitle(WorkflowItem wi)
@@ -946,7 +946,7 @@
 
     /**
      * get the name of the eperson who started this workflow
-     * 
+     *
      * @param wi  the workflow item
      */
     public static String getSubmitterName(WorkflowItem wi)

Modified: trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java
===================================================================
--- trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -93,7 +93,7 @@
  * Servlet for handling requests for a syndication feed. The URI of the collection
  * or community is extracted from the URL, e.g: <code>/feed/rss_1.0/xyz:1234/5678</code>.
  * Currently supports only RSS feed formats.
- * 
+ *
  * @author Ben Bosman, Richard Rodgers, James Rutherford
  * @version $Revision$
  */
@@ -101,14 +101,14 @@
 {
 	//	key for site-wide feed
 	public static final String SITE_FEED_KEY = "site";
-	
+
 	// one hour in milliseconds
 	private static final long HOUR_MSECS = 60 * 60 * 1000;
     /** log4j category */
     private static Logger log = Logger.getLogger(FeedServlet.class);
     private String clazz = "org.dspace.app.webui.servlet.FeedServlet";
 
-    
+
     // are syndication feeds enabled?
     private static boolean enabled = false;
     // number of DSpace items per feed
@@ -121,19 +121,19 @@
     private static int cacheAge = 0;
     // supported syndication formats
     private static List formats = null;
-    
+
     // localized resource bundle
     private static ResourceBundle labels = null;
-    
+
     //default fields to display in item description
     private static String defaultDescriptionFields = "dc.title, dc.contributor.author, dc.contributor.editor, dc.description.abstract, dc.description";
 
-    
+
     static
     {
     	enabled = ConfigurationManager.getBooleanProperty("webui.feed.enable");
     }
-    
+
     public void init()
     {
     	// read rest of config info if enabled
@@ -193,7 +193,7 @@
             //as long as this is not a site wide feed,
             //attempt to retrieve the Collection or Community object
             if(!uri.equals(SITE_FEED_KEY))
-            { 	
+            {
                 // Determine if the URI is a valid reference
                 ResolvableIdentifier di = IdentifierService.resolve(context, uri);
                 dso = (DSpaceObject) IdentifierService.getResource(context, di);
@@ -272,7 +272,7 @@
             throw new ServletException(e);
         }
     }
-       
+
     private boolean itemsChanged(Context context, DSpaceObject dso, long timeStamp)
             throws SQLException
     {
@@ -283,7 +283,7 @@
         // convert dates to ISO 8601, stripping the time
         String startDate = dcStartDate.toString().substring(0, 10);
         String endDate = dcEndDate.toString().substring(0, 10);
-        
+
         // this invocation should return a non-empty list if even 1 item has changed
         try {
         	return (Harvest.harvest(context, dso, startDate, endDate,
@@ -295,15 +295,15 @@
         	return false;
         }
     }
-    
+
     /**
      * Generate a syndication feed for a collection or community
      * or community
-     * 
+     *
      * @param context	the DSpace context object
-     * 
+     *
      * @param dso		DSpace object - collection or community
-     * 
+     *
      * @return		an object representing the feed
      */
     private Channel generateFeed(Context context, DSpaceObject dso)
@@ -311,7 +311,7 @@
     {
     	try
     	{
-    		// container-level elements  	
+    		// container-level elements
     		String dspaceUrl = ConfigurationManager.getProperty("dspace.url");
     		String type = null;
     		String description = null;
@@ -319,7 +319,7 @@
     		Bitstream logo = null;
     		// browse scope
     		// BrowseScope scope = new BrowseScope(context);
-    		
+
     		// new method of doing the browse:
     		String idx = ConfigurationManager.getProperty("recent.submissions.sort-option");
     		if (idx == null)
@@ -331,7 +331,7 @@
     		{
     			throw new IOException("There is no browse index with the name: " + idx);
     		}
-    		
+
     		BrowserScope scope = new BrowserScope(context);
     		scope.setBrowseIndex(bix);
             for (SortOption so : SortOption.getSortOptions())
@@ -340,11 +340,11 @@
                     scope.setSortBy(so.getNumber());
             }
             scope.setOrder(SortOption.DESCENDING);
-    		
+
     		// the feed
     		Channel channel = new Channel();
-    		
-    		//Special Case: if DSpace Object passed in is null, 
+
+    		//Special Case: if DSpace Object passed in is null,
     		//generate a feed for the entire DSpace site!
     		if(dso == null)
     		{
@@ -361,8 +361,8 @@
     				description = col.getMetadata("short_description");
     				title = col.getMetadata("name");
     				logo = col.getLogo();
-    				// scope.setScope(col); 
-    				scope.setBrowseContainer(col); 
+    				// scope.setScope(col);
+    				scope.setBrowseContainer(col);
     			}
     			else if (dso.getType() == Constants.COMMUNITY)
     			{
@@ -371,10 +371,10 @@
     				description = comm.getMetadata("short_description");
     				title = comm.getMetadata("name");
     				logo = comm.getLogo();
-    				// scope.setScope(comm); 
-    				scope.setBrowseContainer(comm); 
+    				// scope.setScope(comm);
+    				scope.setBrowseContainer(comm);
     			}
-    			
+
                         String objectUrl = "";
                         if (dso.getExternalIdentifier() != null)
                         {
@@ -389,13 +389,13 @@
                         }
 
     			// put in container-level data
-    			channel.setDescription(description.replaceAll("\\p{Cntrl}", ""));
+    			channel.setDescription(description == null ? "" : description.replaceAll("\\p{Cntrl}", ""));
     			channel.setLink(objectUrl);
     			//build channel title by passing in type and title
     			String channelTitle = MessageFormat.format(labels.getString(clazz + ".feed.title"),
     					new Object[]{type, title});
     			channel.setTitle(channelTitle);
-    			
+
     			//if collection or community has a logo
     			if (logo != null)
     			{
@@ -408,7 +408,7 @@
     				channel.setImage(image);
     			}
     		}
-    		
+
     		// this is a direct link to the search-engine of dspace. It searches
     		// in the current collection. Since the current version of DSpace
     		// can't search within collections anymore, this works only in older
@@ -416,9 +416,9 @@
     		TextInput input = new TextInput();
     		input.setLink(dspaceUrl + "/simple-search");
     		input.setDescription( labels.getString(clazz + ".search.description") );
-    		
-    		String searchTitle = ""; 
-    		
+
+    		String searchTitle = "";
+
     		//if a "type" of feed was specified, build search title off that
     		if(type!=null)
     		{
@@ -429,14 +429,14 @@
     		{
     			searchTitle = labels.getString(clazz + ".search.title.default");
     		}
-    		
+
     		input.setTitle(searchTitle);
     		input.setName(labels.getString(clazz + ".search.name"));
     		channel.setTextInput(input);
-    		
+
     		// gather & add items to the feed.
     		scope.setResultsPerPage(itemCount);
-    		
+
     		BrowseEngine be = new BrowseEngine(context);
     		BrowseInfo bi = be.browseMini(scope);
     		Item[] results = bi.getBrowseItemResults(context);
@@ -445,7 +445,7 @@
     		{
     			items.add(itemFromDSpaceItem(context, results[i]));
     		}
-    		
+
     		channel.setItems(items);
 
             // If the description is null, replace it with an empty string
@@ -466,36 +466,36 @@
     		throw new IOException(e.getMessage());
     	}
     }
-    
+
     /**
      * The metadata fields of the given item will be added to the given feed.
-     * 
+     *
      * @param context	DSpace context object
-     * 
+     *
      * @param dspaceItem	DSpace Item
-     * 
+     *
      * @return an object representing a feed entry
      */
     private com.sun.syndication.feed.rss.Item itemFromDSpaceItem(Context context,
     		                                                     Item dspaceItem)
     	throws SQLException
     {
-        com.sun.syndication.feed.rss.Item rssItem = 
+        com.sun.syndication.feed.rss.Item rssItem =
         	new com.sun.syndication.feed.rss.Item();
-        
+
         //get the title and date fields
         String titleField = ConfigurationManager.getProperty("webui.feed.item.title");
         if (titleField == null)
         {
             titleField = "dc.title";
         }
-        
+
         String dateField = ConfigurationManager.getProperty("webui.feed.item.date");
         if (dateField == null)
         {
             dateField = "dc.date.issued";
-        }   
-        
+        }
+
         //Set item URI
     	String link = ConfigurationManager.getBooleanProperty("webui.feed.localresolve")
             ? IdentifierService.getURL(dspaceItem).toString()

Modified: trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/StatisticsServlet.java
===================================================================
--- trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/StatisticsServlet.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/StatisticsServlet.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -122,6 +122,7 @@
         HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException, SQLException, AuthorizeException
     {
+        StringBuffer report = new StringBuffer();
         String date = (String) request.getParameter("date");
         request.setAttribute("date", date);
         
@@ -135,123 +136,135 @@
         FileInputStream fir = null;
         InputStreamReader ir = null;
         BufferedReader br = null;
-        
-        List monthsList = new ArrayList();
-        
-        Pattern monthly = Pattern.compile("report-([0-9][0-9][0-9][0-9]-[0-9]+)\\.html");
-        Pattern general = Pattern.compile("report-general-([0-9]+-[0-9]+-[0-9]+)\\.html");
-        
-        // FIXME: this whole thing is horribly inflexible and needs serious
-        // work; but as a basic proof of concept will suffice
-        
-        // if no date is passed then we want to get the most recent general
-        // report
-        if (date == null)
+
+        try
         {
-            request.setAttribute("general", new Boolean(true));
-            
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy'-'M'-'dd");
-            Date mostRecentDate = null;
-            
+            List monthsList = new ArrayList();
+
+            Pattern monthly = Pattern.compile("report-([0-9][0-9][0-9][0-9]-[0-9]+)\\.html");
+            Pattern general = Pattern.compile("report-general-([0-9]+-[0-9]+-[0-9]+)\\.html");
+
+            // FIXME: this whole thing is horribly inflexible and needs serious
+            // work; but as a basic proof of concept will suffice
+
+            // if no date is passed then we want to get the most recent general
+            // report
+            if (date == null)
+            {
+                request.setAttribute("general", new Boolean(true));
+
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy'-'M'-'dd");
+                Date mostRecentDate = null;
+
+                for (int i = 0; i < reports.length; i++)
+                {
+                    Matcher matchGeneral = general.matcher(reports[i].getName());
+                    if (matchGeneral.matches())
+                    {
+                        Date parsedDate = null;
+
+                        try
+                        {
+                             parsedDate = sdf.parse(matchGeneral.group(1).trim());
+                        }
+                        catch (ParseException e)
+                        {
+                            // FIXME: currently no error handling
+                        }
+
+                        if (mostRecentDate == null)
+                        {
+                            mostRecentDate = parsedDate;
+                            reportFile = reports[i];
+                        }
+
+                        if (parsedDate != null && parsedDate.compareTo(mostRecentDate) > 0)
+                        {
+                            mostRecentDate = parsedDate;
+                            reportFile = reports[i];
+                        }
+                    }
+                }
+            }
+
+            // if a date is passed then we want to get the file for that month
+            if (date != null)
+            {
+                String desiredReport = "report-" + date + ".html";
+
+                for (int i = 0; i < reports.length; i++)
+                {
+                    if (reports[i].getName().equals(desiredReport))
+                    {
+                        reportFile = reports[i];
+                    }
+                }
+            }
+
+            if (reportFile == null)
+            {
+                JSPManager.showJSP(request, response, "statistics/no-report.jsp");
+            }
+
+            // finally, build the list of report dates
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy'-'M");
             for (int i = 0; i < reports.length; i++)
             {
-                Matcher matchGeneral = general.matcher(reports[i].getName());
-                if (matchGeneral.matches())
+                Matcher matchReport = monthly.matcher(reports[i].getName());
+                if (matchReport.matches())
                 {
                     Date parsedDate = null;
 
-                    try 
+                    try
                     {
-                         parsedDate = sdf.parse(matchGeneral.group(1).trim());
+                         parsedDate = sdf.parse(matchReport.group(1).trim());
                     }
                     catch (ParseException e)
                     {
                         // FIXME: currently no error handling
                     }
-                    
-                    if (mostRecentDate == null)
-                    {
-                        mostRecentDate = parsedDate;
-                        reportFile = reports[i];
-                    }
-                    
-                    if (parsedDate.compareTo(mostRecentDate) > 0)
-                    {
-                        mostRecentDate = parsedDate;
-                        reportFile = reports[i];
-                    }
+
+                    monthsList.add(parsedDate);
                 }
             }
-        }
-        
-        // if a date is passed then we want to get the file for that month
-        if (date != null)
-        {
-            String desiredReport = "report-" + date + ".html";
-        
-            for (int i = 0; i < reports.length; i++)
+
+            Date[] months = new Date[monthsList.size()];
+            months = (Date[]) monthsList.toArray(months);
+
+            Arrays.sort(months);
+
+            request.setAttribute("months", months);
+
+            try
             {
-                if (reports[i].getName().equals(desiredReport))
-                {
-                    reportFile = reports[i];
-                }
+                fir = new FileInputStream(reportFile.getPath());
+                ir = new InputStreamReader(fir, "UTF-8");
+                br = new BufferedReader(ir);
             }
-        }
-        
-        if (reportFile == null)
-        {
-            JSPManager.showJSP(request, response, "statistics/no-report.jsp");
-        }
-        
-        // finally, build the list of report dates
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy'-'M");
-        for (int i = 0; i < reports.length; i++)
-        {
-            Matcher matchReport = monthly.matcher(reports[i].getName());
-            if (matchReport.matches())
+            catch (IOException e)
             {
-                Date parsedDate = null;
-                
-                try 
-                {
-                     parsedDate = sdf.parse(matchReport.group(1).trim());
-                }
-                catch (ParseException e)
-                {
-                    // FIXME: currently no error handling
-                }
-                
-                monthsList.add(parsedDate);
+                // FIXME: no error handing yet
+                throw new RuntimeException(e.getMessage(),e);
             }
+
+            // FIXME: there's got to be a better way of doing this
+            String line = null;
+            while ((line = br.readLine()) != null)
+            {
+                report.append(line);
+            }
         }
-        
-        Date[] months = new Date[monthsList.size()];
-        months = (Date[]) monthsList.toArray(months);
-        
-        Arrays.sort(months);
-        
-        request.setAttribute("months", months);
-        
-        try 
-        {  
-        	fir = new FileInputStream(reportFile.getPath());
-            ir = new InputStreamReader(fir, "UTF-8");
-            br = new BufferedReader(ir);
-        } 
-        catch (IOException e) 
+        finally
         {
-            // FIXME: no error handing yet
-            throw new RuntimeException(e.getMessage(),e);
-        } 
-        
-        // FIXME: there's got to be a better way of doing this
-        StringBuffer report = new StringBuffer();
-        String line = null;
-        while ((line = br.readLine()) != null)
-        {
-            report.append(line);
+            if (br != null)
+                try { br.close(); } catch (IOException ioe) { }
+
+            if (ir != null)
+                try { ir.close(); } catch (IOException ioe) { }
+
+            if (fir != null)
+                try { fir.close(); } catch (IOException ioe) { }
         }
-        
         // set the report to be displayed
         request.setAttribute("report", report.toString());
         

Modified: trunk/dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DIDLCrosswalk.java
===================================================================
--- trunk/dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DIDLCrosswalk.java	2008-09-11 01:18:03 UTC (rev 3126)
+++ trunk/dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DIDLCrosswalk.java	2008-09-11 15:06:38 UTC (rev 3127)
@@ -56,10 +56,10 @@
 
 /**
  * DSpace Item DIDL crosswalk.
- * 
- * Development of this code was part of the aDORe repository project 
+ *
+ * Development of this code was part of the aDORe repository project
  * by the Research Library of the Los Alamos National Laboratory.
- * 
+ *
  * @author Henry Jerez
  * @author Los Alamos National Laboratory
  */
@@ -70,32 +70,32 @@
     {
     	super("urn:mpeg:mpeg21:2002:02-DIDL-NS http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-21_schema_files/did/didl.xsd ");
     }
-    
-    
+
+
     public boolean isAvailableFor(Object nativeItem)
     {
         // We have DC for everything
         return true;
     }
-    
-    
+
+
     public String createMetadata(Object nativeItem)
         throws CannotDisseminateFormatException
     {
         Item item = ((HarvestedItemInfo) nativeItem).item;
-       
+
         Date d = ((HarvestedItemInfo) nativeItem).datestamp;
         String ITEMDATE = new DCDate(d).toString();
-        
+
         // Get all the DC
         DCValue[] allDC = item.getDC(Item.ANY, Item.ANY, Item.ANY);
-        
+
         StringBuffer metadata = new StringBuffer();
         StringBuffer metadata1 = new StringBuffer();
         String itemURI=item.getIdentifier().getCanonicalForm();
-        int maxsize=  Integer.parseInt(ConfigurationManager.getProperty("oai.didl.maxresponse")); 
+        int maxsize=  Integer.parseInt(ConfigurationManager.getProperty("oai.didl.maxresponse"));
         String currdate=ServerVerb.createResponseDate(new Date());
-        
+
         metadata.append("<didl:DIDL ")
             .append(" xmlns:didl=\"urn:mpeg:mpeg21:2002:02-DIDL-NS\"  ")
             .append(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ")
@@ -115,7 +115,7 @@
             .append("</didl:Descriptor>");
         metadata.append("<didl:Descriptor>")
             .append("<didl:Statement mimeType=\"application/xml; charset=utf-8\">");
-					
+
         for (int i = 0; i < allDC.length; i++)
         {
             // Do not include description.provenance
@@ -144,7 +144,7 @@
                         "&lt;" +
                         value.substring(c + 1);
                 }
-                
+
                 while ((c = value.indexOf(">")) > -1)
                 {
                     value = value.substring(0, c) +
@@ -161,48 +161,48 @@
                     .append(">");
             }
         }
-        
+
         metadata.append("<oai_dc:dc xmlns:oai_dc=\"http://www.openarchives.org/OAI/2.0/oai_dc/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd\">");
-        				
+
         metadata.append(metadata1);
-        
+
         metadata.append("</oai_dc:dc>")
             .append("</didl:Statement>")
-            .append("</didl:Descriptor>");				
-        
+            .append("</didl:Descriptor>");
+
         /**putfirst item here**/
-        
-        
+
+
         //**CYCLE HERE!!!!**//
-       
-        Bundle[] bundles= item.getBundles("ORIGINAL");    
-        
+
+        Bundle[] bundles= item.getBundles("ORIGINAL");
+
         if (bundles.length == 0)
         {
             metadata.append("<P>There are no files associated with this item.</P>");
         }
         else
-        {  
+        {
             /**cycle bundles**/
             for (int i = 0; i < bundles.length; i++)
-            { 
-                int flag=0;			
+            {
+                int flag=0;
                 Bitstream[] bitstreams = bundles[i].getBitstreams();
-                
+
                 /**cycle bitstreams**/
                 for (int k = 0; k < bitstreams.length ; k++)
                 {
                     // Skip internal types
                     if (!bitstreams[k].getFormat().isInternal())
                     {
-                        if (flag==0)	
+                        if (flag==0)
                         {
                             flag=1;
                         }
-                        
+
                         metadata.append("<didl:Component id=" + "\"uuid-"+ UUIDFactory.generateUUID().toString() + "\">");
-                       
-                       if (bitstreams[k].getSize()> maxsize) 
+
+                       if (bitstreams[k].getSize()> maxsize)
                        {
                            metadata.append("<didl:Resource ref=\""+ConfigurationManager.getProperty("dspace.url")+"/bitstream/"+itemURI+"/"+bitstreams[k].getSequenceID()+"/"+bitstreams[k].getName() );
                            metadata.append("\" mimeType=\"");
@@ -211,34 +211,47 @@
                            metadata.append("</didl:Resource>");
                        }
                        else
-                       {    
-                        
+                       {
+
                             try
                             {
                                 metadata.append("<didl:Resource mimeType=\"");
                                 metadata.append(bitstreams[k].getFormat().getMIMEType());
                                 metadata.append("\" encoding=\"base64\">");
-                                                                   
+
                                 /*

@@ 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: 3129
          http://dspace.svn.sourceforge.net/dspace/?rev=3129&view=rev
Author:   grahamtriggs
Date:     2008-09-11 16:19:47 +0000 (Thu, 11 Sep 2008)

Log Message:
-----------
integrated from branch 1.5
Add missing close() calls to use of TableRowIterator, also add close() to ItemIterator (to close underlying TableRowIterator)

Modified Paths:
--------------
    trunk/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java
    trunk/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java
    trunk/dspace-api/src/main/java/org/dspace/app/mets/METSExport.java
    trunk/dspace-api/src/main/java/org/dspace/app/sitemap/GenerateSitemaps.java
    trunk/dspace-api/src/main/java/org/dspace/authorize/PolicySet.java
    trunk/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOOracle.java
    trunk/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOPostgres.java
    trunk/dspace-api/src/main/java/org/dspace/content/ItemIterator.java
    trunk/dspace-api/src/main/java/org/dspace/eperson/EPerson.java
    trunk/dspace-api/src/main/java/org/dspace/search/DSIndexer.java
    trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java
    trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/TableRowIterator.java
    trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/MyDSpaceServlet.java
    trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/admin/ItemMapServlet.java
    trunk/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCollection.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/BrowseItemForm.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/MapperMain.java

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976,2986,2995,3027,3033,3036-3037
   + /branches/dspace-1_5_x:2946,2948,2951,2955,2957-2958,2963,2976,2986,2995,3027,3033,3036-3038

Modified: trunk/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -132,9 +132,9 @@
      * used for export download
      */
     public static final String COMPRESSED_EXPORT_MIME_TYPE = "application/zip";
-    
+
     /*
-     *  
+     *
      */
     public static void main(String[] argv) throws Exception
     {
@@ -245,7 +245,7 @@
             ExternalIdentifier eid = ExternalIdentifierService.parseCanonicalForm(c, myIDString);
             oi = eid.getObjectIdentifier();
         }
-        
+
         /*
         // First, add the namespace if necessary
         if (myIDString.indexOf('/') != -1)
@@ -314,9 +314,16 @@
             System.out.println("Exporting from collection: " + myIDString);
 
             // it's a collection, so do a bunch of items
-            ItemIterator i = mycollection.getItems();
-
-            exportItem(c, i, destDirName, seqStart);
+			ItemIterator i = mycollection.getItems();
+            try
+            {
+                exportItem(c, i, destDirName, seqStart);
+            }
+            finally
+            {
+                if (i != null)
+                    i.close();
+            }
         }
 
         c.complete();
@@ -440,7 +447,7 @@
         } else {
             filename = "metadata_" + schema + ".xml";
         }
-        
+
         File outFile = new File(destDir, filename);
 
         System.out.println("Attempting to create file " + outFile);
@@ -527,11 +534,11 @@
      * 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 
+     * @throws Exception if there is any problem writing to the export
      * 		directory
      */
     private static void writeBitstreams(Context c, Item i, File destDir)
@@ -579,8 +586,8 @@
 
                             // write the manifest file entry
                             if (b.isRegisteredBitstream()) {
-                                out.println("-r -s " + b.getStoreNumber() 
-                                		+ " -f " + myName 
+                                out.println("-r -s " + b.getStoreNumber()
+                                		+ " -f " + myName
 										+ "\tbundle:" + bundleName);
                             } else {
                                 out.println(myName + "\tbundle:" + bundleName);
@@ -612,7 +619,7 @@
     /**
      * Convenience methot to create export a single Community, Collection, or
      * Item
-     * 
+     *
      * @param dso -
      *            the dspace object to export
      * @param context -
@@ -631,7 +638,7 @@
     /**
      * Convenience method to export a List of dspace objects (Community,
      * Collection or Item)
-     * 
+     *
      * @param dsObjects -
      *            List containing dspace objects
      * @param context -
@@ -648,7 +655,7 @@
     /**
      * Convenience methot to create export a single Community, Collection, or
      * Item
-     * 
+     *
      * @param dso -
      *            the dspace object to export
      * @param context -
@@ -667,7 +674,7 @@
     /**
      * Convenience method to export a List of dspace objects (Community,
      * Collection or Item)
-     * 
+     *
      * @param dsObjects -
      *            List containing dspace objects
      * @param context -
@@ -685,7 +692,7 @@
      * 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 -
@@ -714,40 +721,50 @@
     			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());
-    				}
+					ItemIterator iitems = collection.getItems();
+                    try {
+                        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());
+                        }
+                    } finally {
+                        if (iitems != null)
+                            iitems.close();
+                    }
     			}
     		} 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());
-    			}
+                ItemIterator iitems = collection.getItems();
+                try {
+                    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());
+                    }
+                } finally {
+                    if (iitems != null)
+                        iitems.close();
+                }
     		} else if (dso.getType() == Constants.ITEM) {
     			Item item = (Item) dso;
     			// get all the bundles in the item
@@ -791,12 +808,13 @@
     		Thread go = new Thread() {
     			public void run() {
     				Context context;
+                    ItemIterator iitems = null;
     				try {
     					// create a new dspace context
     					context = new Context();
     					// ignore auths
     					context.setIgnoreAuthorization(true);
-    					ItemIterator iitems = new ItemIterator(context, items);
+    					iitems = new ItemIterator(context, items);
     					String fileName = assembleFileName("item",eperson, new Date());
     					String workDir = getExportWorkDirectory()
     					+ System.getProperty("file.separator")
@@ -839,6 +857,10 @@
     					}
     					throw new RuntimeException(e1);
     				}
+    				finally {
+    				    if (iitems != null)
+    				        iitems.close();
+    				}
     			}
 
     		};
@@ -850,7 +872,7 @@
 
     /**
      * 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 -
@@ -882,7 +904,7 @@
     /**
      * 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
@@ -897,14 +919,14 @@
 			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
@@ -921,7 +943,7 @@
 
     /**
      * Used to read the export archived. Inteded for download.
-     * 
+     *
      * @param fileName
      *            the name of the file to download
      * @param eperson
@@ -941,7 +963,7 @@
 
     /**
      * 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
@@ -983,7 +1005,7 @@
      * 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
@@ -1010,7 +1032,7 @@
     /**
      * 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
@@ -1042,7 +1064,7 @@
      * 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
@@ -1070,7 +1092,7 @@
      * 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 -
@@ -1114,7 +1136,7 @@
      * 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 -

Modified: trunk/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterManager.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -165,7 +165,7 @@
                        "(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");
@@ -177,8 +177,8 @@
                 "urn:uuid:6432e1d5-b089-44dd-91cc-504104cf80b0,urn:uuid:65263253-c4ce-416a-83c8-fbb2404156b8)");
         Option skipOption = OptionBuilder.create('s');
         skipOption.setArgs(Option.UNLIMITED_VALUES); //unlimited number of args
-        options.addOption(skipOption);    
-        
+        options.addOption(skipOption);
+
         CommandLine line = null;
         try
         {
@@ -339,15 +339,15 @@
 
         //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" +
@@ -357,11 +357,11 @@
                 myhelp.printHelp("MediaFilterManager\n", options);
                 System.exit(0);
             }
-            
+
             //save to a global skip list
             skipList = Arrays.asList(skipIds);
         }
-        
+
         Context c = null;
 
         try
@@ -436,18 +436,18 @@
         CommunityDAO communityDAO = CommunityDAOFactory.getInstance(c);
 
         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
             List<Community> topLevelCommunities =
                     communityDAO.getTopLevelCommunities();
-          
+
             for (Community community : topLevelCommunities)
             {
                 applyFiltersCommunity(c, community);
             }
         }
-        else 
+        else
         {
             //otherwise, just find every item and process
             List<Item> items = itemDAO.getItems();
@@ -466,14 +466,14 @@
 
         // only apply filters if community not in skip-list
         if(!inSkipList(community.getIdentifier().getCanonicalForm()))
-        {    
+        {
            	List<Community> children =
                        communityDAO.getChildCommunities(community);
            	for (Community child : children)
            	{
            		applyFiltersCommunity(c, child);
            	}
-           	
+
            	List<Collection> collections =
                        collectionDAO.getChildCollections(community);
            	for (Collection collection : collections)
@@ -509,7 +509,7 @@
     	  //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
@@ -520,7 +520,7 @@
           // clear item objects from context cache and internal cache
           itemDAO.decache(item);
           currentItem = null;
-        }  
+        }
     }
 
     /**
@@ -675,7 +675,7 @@
 
             return false;
         }
-        
+
         InputStream destStream = formatFilter.getDestinationStream(source.retrieve());
         if (destStream == null)
         {
@@ -751,10 +751,10 @@
 
     /**
      * 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.
      */
@@ -764,7 +764,7 @@
         {
             System.out.println("SKIP-LIST: skipped bitstreams within identifier " + identifier);
             return true;
-        }    
+        }
         else
             return false;
     }

Modified: trunk/dspace-api/src/main/java/org/dspace/app/mets/METSExport.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/app/mets/METSExport.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-api/src/main/java/org/dspace/app/mets/METSExport.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -102,7 +102,7 @@
 
 /**
  * Tool for exporting DSpace AIPs with the metadata serialised in METS format
- * 
+ *
  * @author Robert Tansley
  * @version $Revision$
  */
@@ -211,73 +211,80 @@
         }
 
         ItemIterator items = null;
-
-        if (line.hasOption('c'))
+        try
         {
-            /*
-            uri = getCanonicalForm(line.getOptionValue('c'));
-
-            // Exporting a collection's worth of items
-            if (uri.indexOf(':') == -1)
+            if (line.hasOption('c'))
             {
-                // has no : must be a handle
-                uri = "hdl:" + uri;
-                System.out.println("no namespace provided. assuming handles.");
-            }
+                /*
+                uri = getCanonicalForm(line.getOptionValue('c'));
 
-            ExternalIdentifier identifier = identifierDAO.retrieve(uri);
-            ObjectIdentifier oi = identifier.getObjectIdentifier();
-            DSpaceObject o = oi.getObject(context);
-*/
+                // Exporting a collection's worth of items
+                if (uri.indexOf(':') == -1)
+                {
+                    // has no : must be a handle
+                    uri = "hdl:" + uri;
+                    System.out.println("no namespace provided. assuming handles.");
+                }
 
-            String uriPassed = line.getOptionValue("i");
-            DSpaceObject o = null;
-            ObjectIdentifier oi = ObjectIdentifier.parseCanonicalForm(uriPassed);
-            if (oi == null)
-            {
-                ExternalIdentifier eid = ExternalIdentifierService.parseCanonicalForm(context, uriPassed);
-                oi = eid.getObjectIdentifier();
+                ExternalIdentifier identifier = identifierDAO.retrieve(uri);
+                ObjectIdentifier oi = identifier.getObjectIdentifier();
+                DSpaceObject o = oi.getObject(context);
+                */
+
+                String uriPassed = line.getOptionValue("i");
+                DSpaceObject o = null;
+                ObjectIdentifier oi = ObjectIdentifier.parseCanonicalForm(uriPassed);
+                if (oi == null)
+                {
+                    ExternalIdentifier eid = ExternalIdentifierService.parseCanonicalForm(context, uriPassed);
+                    oi = eid.getObjectIdentifier();
+                }
+                if (oi != null)
+                {
+                    // o = oi.getObject(context);
+                    o = (DSpaceObject) IdentifierService.getResource(context, oi);
+                }
+
+                if ((o != null) && o instanceof Collection)
+                {
+                    items = ((Collection) o).getItems();
+                }
+                else
+                {
+                    System.err.println(uri + " is not a valid collection URI");
+                    System.exit(1);
+                }
             }
-            if (oi != null)
+
+            if (line.hasOption('a'))
             {
-                // o = oi.getObject(context);
-                o = (DSpaceObject) IdentifierService.getResource(context, oi);
+                items = Item.findAll(context);
             }
-            
-            if ((o != null) && o instanceof Collection)
+
+            if (items == null)
             {
-                items = ((Collection) o).getItems();
+                System.err.println("Nothing to export specified!");
+                System.exit(1);
             }
-            else
+
+            while (items.hasNext())
             {
-                System.err.println(uri + " is not a valid collection URI");
-                System.exit(1);
+                writeAIP(context, items.next(), dest);
             }
         }
-
-        if (line.hasOption('a'))
+        finally
         {
-            items = Item.findAll(context);
+            if (items != null)
+                items.close();
         }
 
-        if (items == null)
-        {
-            System.err.println("Nothing to export specified!");
-            System.exit(1);
-        }
-
-        while (items.hasNext())
-        {
-            writeAIP(context, items.next(), dest);
-        }
-
         context.abort();
         System.exit(0);
     }
 
     /**
      * Initialise various variables, read in config etc.
-     * 
+     *
      * @param context
      *            DSpace context
      */
@@ -375,7 +382,7 @@
 
     /**
      * Write METS metadata corresponding to the metadata for an item
-     * 
+     *
      * @param context
      *            DSpace context
      * @param item
@@ -481,7 +488,7 @@
                 {
                     continue;
                 }
-                        
+
                 // First: we skip the license bundle, since it's included
                 // elsewhere
                 if (bitstreams[0].getFormat().getID() == licenseFormat)
@@ -591,14 +598,14 @@
             {
                 mets.getContent().add(fileSec);
             }
-            
+
             // FIXME: Add Structmap here, but it is empty and we won't use it now.
             StructMap structMap = new StructMap();
             Div div = new Div();
             structMap.getContent().add(div);
             mets.getContent().add(structMap);
 
-            
+
             mets.validate(new MetsValidator());
 
             mets.write(new MetsWriter(os));
@@ -614,13 +621,13 @@
 
     /**
      * Utility to find the license bitstream from an item
-     * 
+     *
      * @param context
      *            DSpace context
      * @param item
      *            the item
      * @return the license as a string
-     * 
+     *
      * @throws IOException
      *             if the license bitstream can't be read
      */
@@ -651,12 +658,12 @@
     /**
      * For a bitstream that's a thumbnail or extracted text, find the
      * corresponding bitstream in the ORIGINAL bundle
-     * 
+     *
      * @param item
      *            the item we're dealing with
      * @param derived
      *            the derived bitstream
-     * 
+     *
      * @return the corresponding original bitstream (or null)
      */
     private static Bitstream findOriginalBitstream(Item item, Bitstream derived)
@@ -694,7 +701,7 @@
     /**
      * Create MODS metadata from the DC in the item, and add to the given
      * XmlData METS object.
-     * 
+     *
      * @param item
      *            the item
      * @param xmlData

Modified: trunk/dspace-api/src/main/java/org/dspace/app/sitemap/GenerateSitemaps.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/app/sitemap/GenerateSitemaps.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-api/src/main/java/org/dspace/app/sitemap/GenerateSitemaps.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -69,7 +69,7 @@
 
 /**
  * Command-line utility for generating HTML and Sitemaps.org protocol Sitemaps.
- * 
+ *
  * @author Robert Tansley
  * @author Stuart Lewis
  */
@@ -167,7 +167,7 @@
 
     /**
      * Generate sitemap.org protocol and/or basic HTML sitemaps.
-     * 
+     *
      * @param makeHTMLMap
      *            if {@code true}, generate an HTML sitemap.
      * @param makeSitemapOrg
@@ -190,7 +190,7 @@
         if (!outputDir.exists()) {
         	outputDir.mkdir();
         }
-        
+
         AbstractGenerator html = null;
         AbstractGenerator sitemapsOrg = null;
 
@@ -233,41 +233,49 @@
         }
 
         ItemIterator allItems = Item.findAll(c);
-        int itemCount = 0;
-
-        while (allItems.hasNext())
+        try
         {
-            Item i = allItems.next();
-            String url = IdentifierService.getURL(i).toString();
-            Date lastMod = i.getLastModified();
+            int itemCount = 0;
 
+            while (allItems.hasNext())
+            {
+                Item i = allItems.next();
+                String url = IdentifierService.getURL(i).toString();
+                Date lastMod = i.getLastModified();
+
+                if (makeHTMLMap)
+                    html.addURL(url, lastMod);
+                if (makeSitemapOrg)
+                    sitemapsOrg.addURL(url, lastMod);
+                i.decache();
+
+                itemCount++;
+            }
+
             if (makeHTMLMap)
-                html.addURL(url, lastMod);
+            {
+                int files = html.finish();
+                log.info(LogManager.getHeader(c, "write_sitemap",
+                        "type=html,num_files=" + files + ",communities="
+                                + comms.length + ",collections=" + colls.length
+                                + ",items=" + itemCount));
+            }
+
             if (makeSitemapOrg)
-                sitemapsOrg.addURL(url, lastMod);
-            i.decache();
-
-            itemCount++;
+            {
+                int files = sitemapsOrg.finish();
+                log.info(LogManager.getHeader(c, "write_sitemap",
+                        "type=html,num_files=" + files + ",communities="
+                                + comms.length + ",collections=" + colls.length
+                                + ",items=" + itemCount));
+            }
         }
-
-        if (makeHTMLMap)
+        finally
         {
-            int files = html.finish();
-            log.info(LogManager.getHeader(c, "write_sitemap",
-                    "type=html,num_files=" + files + ",communities="
-                            + comms.length + ",collections=" + colls.length
-                            + ",items=" + itemCount));
+            if (allItems != null)
+                allItems.close();
         }
 
-        if (makeSitemapOrg)
-        {
-            int files = sitemapsOrg.finish();
-            log.info(LogManager.getHeader(c, "write_sitemap",
-                    "type=html,num_files=" + files + ",communities="
-                            + comms.length + ",collections=" + colls.length
-                            + ",items=" + itemCount));
-        }
-
         c.abort();
     }
 

Modified: trunk/dspace-api/src/main/java/org/dspace/authorize/PolicySet.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/authorize/PolicySet.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-api/src/main/java/org/dspace/authorize/PolicySet.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -57,7 +57,7 @@
 /**
  * Was Hack/Tool to set policies for items, bundles, and bitstreams. Now has
  * helpful method, setPolicies();
- * 
+ *
  * @author dstuve
  * @version $Revision$
  */
@@ -110,11 +110,11 @@
         c.complete();
         System.exit(0);
     }
-    
+
     /**
      * Useful policy wildcard tool. Can set entire collections' contents'
      * policies
-     * 
+     *
      * @param c
      *            current context
      * @param containerType
@@ -142,13 +142,13 @@
             boolean isReplace, boolean clearOnly) throws AuthorizeException
     {
         setPoliciesFilter(c, containerType, containerID, contentType,
-                           actionID, groupID, isReplace, clearOnly, null);                         
+                           actionID, groupID, isReplace, clearOnly, null);
     }
 
     /**
      * Useful policy wildcard tool. Can set entire collections' contents'
      * policies
-     * 
+     *
      * @param c
      *            current context
      * @param containerType

Modified: trunk/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOOracle.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOOracle.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOOracle.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -259,28 +259,35 @@
             TableRowIterator tri = DatabaseManager.queryTable(context, table, "SELECT * FROM " + table + " WHERE item_id=?", itemID);
             if (tri != null)
             {
-                while (tri.hasNext())
+                try
                 {
-                    TableRow tr = tri.next();
+                    while (tri.hasNext())
+                    {
+                        TableRow tr = tri.next();
 
-                    // Check the item mappings to see if it contains this mapping
-                    boolean itemIsMapped = false;
-                    int trDistinctID = tr.getIntColumn("distinct_id");
-                    for (int i = 0; i < distinctIDs.length; i++)
-                    {
-                        // Found this mapping
-                        if (distinctIDs[i] == trDistinctID)
+                        // Check the item mappings to see if it contains this mapping
+                        boolean itemIsMapped = false;
+                        int trDistinctID = tr.getIntColumn("distinct_id");
+                        for (int i = 0; i < distinctIDs.length; i++)
                         {
-                            // Flag it, and remove (-1) from the item mappings
-                            itemIsMapped = true;
-                            distinctIDs[i] = -1;
+                            // Found this mapping
+                            if (distinctIDs[i] == trDistinctID)
+                            {
+                                // Flag it, and remove (-1) from the item mappings
+                                itemIsMapped = true;
+                                distinctIDs[i] = -1;
+                            }
                         }
+
+                        // The item is no longer mapped to this community, so remove the database record
+                        if (!itemIsMapped)
+                            DatabaseManager.delete(context, tr);
                     }
-
-                    // The item is no longer mapped to this community, so remove the database record
-                    if (!itemIsMapped)
-                        DatabaseManager.delete(context, tr);
                 }
+                finally
+                {
+                    tri.close();
+                }
             }
 
             // Any remaining mappings need to be added to the database
@@ -528,12 +535,12 @@
             {
                 distinctID = tri.next().getIntColumn("id");
             }
-            
+
             if (log.isDebugEnabled())
             {
                 log.debug("getDistinctID: return=" + distinctID);
             }
-            
+
             return distinctID;
         }
         catch (SQLException e)
@@ -543,7 +550,8 @@
         }
         finally
         {
-            tri.close();
+            if (tri != null)
+                tri.close();
         }
     }
 
@@ -568,28 +576,35 @@
             TableRowIterator tri = DatabaseManager.queryTable(context, "Communities2Item", "SELECT * FROM Communities2Item WHERE item_id=?", itemID);
             if (tri != null)
             {
-                while (tri.hasNext())
+                try
                 {
-                    TableRow tr = tri.next();
+                    while (tri.hasNext())
+                    {
+                        TableRow tr = tri.next();
 
-                    // Check the item mappings to see if it contains this community mapping
-                    boolean itemIsMapped = false;
-                    int trCommID = tr.getIntColumn("community_id");
-                    for (int i = 0; i < commID.length; i++)
-                    {
-                        // Found this community
-                        if (commID[i] == trCommID)
+                        // Check the item mappings to see if it contains this community mapping
+                        boolean itemIsMapped = false;
+                        int trCommID = tr.getIntColumn("community_id");
+                        for (int i = 0; i < commID.length; i++)
                         {
-                            // Flag it, and remove (-1) from the item mappings
-                            itemIsMapped = true;
-                            commID[i] = -1;
+                            // Found this community
+                            if (commID[i] == trCommID)
+                            {
+                                // Flag it, and remove (-1) from the item mappings
+                                itemIsMapped = true;
+                                commID[i] = -1;
+                            }
                         }
+
+                        // The item is no longer mapped to this community, so remove the database record
+                        if (!itemIsMapped)
+                            DatabaseManager.delete(context, tr);
                     }
-
-                    // The item is no longer mapped to this community, so remove the database record
-                    if (!itemIsMapped)
-                        DatabaseManager.delete(context, tr);
                 }
+                finally
+                {
+                    tri.close();
+                }
             }
 
             // Any remaining mappings need to be added to the database

Modified: trunk/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOPostgres.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOPostgres.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-api/src/main/java/org/dspace/browse/BrowseCreateDAOPostgres.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -256,28 +256,35 @@
             TableRowIterator tri = DatabaseManager.queryTable(context, table, "SELECT * FROM " + table + " WHERE item_id=?", itemID);
             if (tri != null)
             {
-                while (tri.hasNext())
+                try
                 {
-                    TableRow tr = tri.next();
+                    while (tri.hasNext())
+                    {
+                        TableRow tr = tri.next();
 
-                    // Check the item mappings to see if it contains this mapping
-                    boolean itemIsMapped = false;
-                    int trDistinctID = tr.getIntColumn("distinct_id");
-                    for (int i = 0; i < distinctIDs.length; i++)
-                    {
-                        // Found this mapping
-                        if (distinctIDs[i] == trDistinctID)
+                        // Check the item mappings to see if it contains this mapping
+                        boolean itemIsMapped = false;
+                        int trDistinctID = tr.getIntColumn("distinct_id");
+                        for (int i = 0; i < distinctIDs.length; i++)
                         {
-                            // Flag it, and remove (-1) from the item mappings
-                            itemIsMapped = true;
-                            distinctIDs[i] = -1;
+                            // Found this mapping
+                            if (distinctIDs[i] == trDistinctID)
+                            {
+                                // Flag it, and remove (-1) from the item mappings
+                                itemIsMapped = true;
+                                distinctIDs[i] = -1;
+                            }
                         }
+
+                        // The item is no longer mapped to this community, so remove the database record
+                        if (!itemIsMapped)
+                            DatabaseManager.delete(context, tr);
                     }
-
-                    // The item is no longer mapped to this community, so remove the database record
-                    if (!itemIsMapped)
-                        DatabaseManager.delete(context, tr);
                 }
+                finally
+                {
+                    tri.close();
+                }
             }
 
             // Any remaining mappings need to be added to the database
@@ -569,28 +576,35 @@
             TableRowIterator tri = DatabaseManager.queryTable(context, "Communities2Item", "SELECT * FROM Communities2Item WHERE item_id=?", itemID);
             if (tri != null)
             {
-                while (tri.hasNext())
+                try
                 {
-                    TableRow tr = tri.next();
+                    while (tri.hasNext())
+                    {
+                        TableRow tr = tri.next();
 
-                    // Check the item mappings to see if it contains this community mapping
-                    boolean itemIsMapped = false;
-                    int trCommID = tr.getIntColumn("community_id");
-                    for (int i = 0; i < commID.length; i++)
-                    {
-                        // Found this community
-                        if (commID[i] == trCommID)
+                        // Check the item mappings to see if it contains this community mapping
+                        boolean itemIsMapped = false;
+                        int trCommID = tr.getIntColumn("community_id");
+                        for (int i = 0; i < commID.length; i++)
                         {
-                            // Flag it, and remove (-1) from the item mappings
-                            itemIsMapped = true;
-                            commID[i] = -1;
+                            // Found this community
+                            if (commID[i] == trCommID)
+                            {
+                                // Flag it, and remove (-1) from the item mappings
+                                itemIsMapped = true;
+                                commID[i] = -1;
+                            }
                         }
+
+                        // The item is no longer mapped to this community, so remove the database record
+                        if (!itemIsMapped)
+                            DatabaseManager.delete(context, tr);
                     }
-
-                    // The item is no longer mapped to this community, so remove the database record
-                    if (!itemIsMapped)
-                        DatabaseManager.delete(context, tr);
                 }
+                finally
+                {
+                    tri.close();
+                }
             }
 
             // Any remaining mappings need to be added to the database

Modified: trunk/dspace-api/src/main/java/org/dspace/content/ItemIterator.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/content/ItemIterator.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-api/src/main/java/org/dspace/content/ItemIterator.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -267,4 +267,13 @@
             return null;
         }
     }
+
+    /**
+     * Dispose of this Iterator, and it's underlying resources
+     */
+    public void close()
+    {
+        if (itemRows != null)
+            itemRows.close();
+    }
 }

Modified: trunk/dspace-api/src/main/java/org/dspace/eperson/EPerson.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/eperson/EPerson.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-api/src/main/java/org/dspace/eperson/EPerson.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -432,4 +432,5 @@
         dao.delete(getID());
         context.addEvent(new Event(Event.DELETE, Constants.EPERSON, getID(), getEmail()));
     }
+
 }

Modified: trunk/dspace-api/src/main/java/org/dspace/search/DSIndexer.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/search/DSIndexer.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-api/src/main/java/org/dspace/search/DSIndexer.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -287,12 +287,12 @@
                     /** If the item is in the repository now, add it to the index*/
                     if (requiresIndexing(t, ((Item)dso).getLastModified()) || force)
                     {
-                        buildDocument(context, (Item) dso, t);                       
+                        buildDocument(context, (Item) dso, t);
                     }
-                }       
+                }
                 else
                 {
-                    /** 
+                    /**
                      * Make sure the item is not in the index if it is not in archive.
                      * TODO: Someday DSIndexer should block withdrawn
                      * content on search/retrieval and allow admins the ablitity to
@@ -561,7 +561,6 @@
      * @param force
      */
     public static void updateIndex(Context context, boolean force) {
-
     		try
     		{
                 for (Item item : itemDAO.getItems())
@@ -742,7 +741,7 @@
 		boolean inIndex = false;
 
 		IndexReader ir = DSQuery.getIndexReader();
-		
+
 		TermDocs docs = ir.termDocs(t);
 
 		while(docs.next())
@@ -836,7 +835,7 @@
     private static void writeDocument(Term t, Document doc) throws IOException
     {
         IndexWriter writer = null;
-        
+
         try
         {
             writer = openIndex(false);
@@ -862,7 +861,7 @@
      * @throws SQLException
      * @throws IOException
      */
-    private static void buildDocument(Context context, Community community, Term t)  
+    private static void buildDocument(Context context, Community community, Term t)
     throws SQLException, IOException
     {
         // Create Lucene Document
@@ -889,7 +888,7 @@
      * @throws SQLException
      * @throws IOException
      */
-    private static void buildDocument(Context context, Collection collection, Term t)  
+    private static void buildDocument(Context context, Collection collection, Term t)
     throws SQLException, IOException
     {
         String location_text = buildCollectionLocationString(context, collection);
@@ -906,20 +905,20 @@
         	doc.add(new Field("name", name, Field.Store.NO, Field.Index.TOKENIZED));
         	doc.add(new Field("default", name, Field.Store.NO, Field.Index.TOKENIZED));
         }
-        
+
         writeDocument(t, doc);
     }
 
     /**
      * Build a Lucene document for a DSpace Item and write the index
-     * 
+     *
      * @param context Users Context
      * @param item The DSpace Item to be indexed
      * @param t The Item handle term
      * @throws SQLException
      * @throws IOException
      */
-    private static void buildDocument(Context context, Item item, Term t) 
+    private static void buildDocument(Context context, Item item, Term t)
     throws SQLException, IOException
     {
     	// get the location string (for searching by collection & community)
@@ -1026,7 +1025,7 @@
         }
 
         log.debug("  Added Sorting");
-        
+
         Vector<InputStreamReader> readers = new Vector<InputStreamReader>();
 
         try
@@ -1070,7 +1069,7 @@
         {
         	log.error(e.getMessage(),e);
         }
-        
+
         //write the index and close the inputstreamreaders
         try {
             writeDocument(t, doc);
@@ -1097,7 +1096,7 @@
 
     /**
      * Create Lucene document with all the shared fields initialized.
-     * 
+     *
      * @param type Type of DSpace Object
      * @param id
      * @param uri

Modified: trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseManager.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -162,13 +162,23 @@
         }
         
         PreparedStatement statement = context.getDBConnection().prepareStatement(query);
-        loadParameters(statement,parameters);
-        
-        TableRowIterator retTRI = new TableRowIterator(statement.executeQuery(),
-                canonicalize(table));
+        try
+        {
+            loadParameters(statement,parameters);
 
-        retTRI.setStatement(statement);
-        return retTRI;
+            TableRowIterator retTRI = new TableRowIterator(statement.executeQuery(),
+                    canonicalize(table));
+
+            retTRI.setStatement(statement);
+            return retTRI;
+        }
+        catch (SQLException sqle)
+        {
+            if (statement != null)
+                try { statement.close(); } catch (SQLException s) { }
+
+            throw sqle;
+        }
     }
     
     /**
@@ -204,13 +214,22 @@
         }
 
         PreparedStatement statement = context.getDBConnection().prepareStatement(query);
-        loadParameters(statement,parameters);
-        
-        TableRowIterator retTRI = new TableRowIterator(statement.executeQuery());
+        try
+        {
+            loadParameters(statement,parameters);
 
-        
-        retTRI.setStatement(statement);
-        return retTRI;
+            TableRowIterator retTRI = new TableRowIterator(statement.executeQuery());
+
+            retTRI.setStatement(statement);
+            return retTRI;
+        }
+        catch (SQLException sqle)
+        {
+            if (statement != null)
+                try { statement.close(); } catch (SQLException s) { }
+
+            throw sqle;
+        }
     }
     
     /**

Modified: trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/TableRowIterator.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/TableRowIterator.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-api/src/main/java/org/dspace/storage/rdbms/TableRowIterator.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -197,13 +197,18 @@
     {
         List<TableRow> resultsList = new ArrayList<TableRow>();
 
-        while (hasNext())
+        try
         {
-            resultsList.add(next());
+            while (hasNext())
+            {
+                resultsList.add(next());
+            }
         }
-
-        // Close the connection after converting it to a list.
-        this.close();
+        finally
+        {
+            // Close the connection after converting it to a list.
+            this.close();
+        }
         
         return resultsList;
     }

Modified: trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/MyDSpaceServlet.java
===================================================================
--- trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/MyDSpaceServlet.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/MyDSpaceServlet.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -664,16 +664,23 @@
             throws ServletException, IOException, SQLException,
             AuthorizeException
     {
+        // Turn the iterator into a list
+        List subList = new LinkedList();
         ItemIterator subs = Item.findBySubmitter(context, context
                 .getCurrentUser());
 
-        // Turn the iterator into a list
-        List subList = new LinkedList();
-
-        while (subs.hasNext())
+        try
         {
-            subList.add(subs.next());
+            while (subs.hasNext())
+            {
+                subList.add(subs.next());
+            }
         }
+        finally
+        {
+            if (subs != null)
+                subs.close();
+        }
 
         Item[] items = new Item[subList.size()];
 

Modified: trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/admin/ItemMapServlet.java
===================================================================
--- trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/admin/ItemMapServlet.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/admin/ItemMapServlet.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -134,50 +134,57 @@
     		
     		// get all items from that collection, add them to a hash
     		ItemIterator i = myCollection.getItems();
-    		
-    		// iterate through the items in this collection, and count how many
-    		// are native, and how many are imports, and which collections they
-    		// came from
-    		while (i.hasNext())
-    		{
-    			Item myItem = i.next();
-    			
-    			// get key for hash
-    			Integer myKey = new Integer(myItem.getID());
-    			
-    			if (myItem.isOwningCollection(myCollection))
-    			{
-    				count_native++;
-    			}
-    			else
-    			{
-    				count_import++;
-    			}
-    			
-    			// is the collection in the hash?
-    			Collection owningCollection = myItem.getOwningCollection();
-    			Integer cKey = new Integer(owningCollection.getID());
-    			
-    			if (myCollections.containsKey(cKey))
-    			{
-    				Integer x = (Integer) myCounts.get(cKey);
-    				int myCount = x.intValue() + 1;
-    				
-    				// increment count for that collection
-    				myCounts.put(cKey, new Integer(myCount));
-    			}
-    			else
-    			{
-    				// store and initialize count
-    				myCollections.put(cKey, owningCollection);
-    				myCounts.put(cKey, new Integer(1));
-    			}
-    			
-    			// store the item
-    			myItems.put(myKey, myItem);
-    		}
-    		
-    		// remove this collection's entry because we already have a native
+    		try
+            {
+                // iterate through the items in this collection, and count how many
+                // are native, and how many are imports, and which collections they
+                // came from
+                while (i.hasNext())
+                {
+                    Item myItem = i.next();
+
+                    // get key for hash
+                    Integer myKey = new Integer(myItem.getID());
+
+                    if (myItem.isOwningCollection(myCollection))
+                    {
+                        count_native++;
+                    }
+                    else
+                    {
+                        count_import++;
+                    }
+
+                    // is the collection in the hash?
+                    Collection owningCollection = myItem.getOwningCollection();
+                    Integer cKey = new Integer(owningCollection.getID());
+
+                    if (myCollections.containsKey(cKey))
+                    {
+                        Integer x = (Integer) myCounts.get(cKey);
+                        int myCount = x.intValue() + 1;
+
+                        // increment count for that collection
+                        myCounts.put(cKey, new Integer(myCount));
+                    }
+                    else
+                    {
+                        // store and initialize count
+                        myCollections.put(cKey, owningCollection);
+                        myCounts.put(cKey, new Integer(1));
+                    }
+
+                    // store the item
+                    myItems.put(myKey, myItem);
+                }
+            }
+            finally
+            {
+                if (i != null)
+                    i.close();
+            }
+            
+            // remove this collection's entry because we already have a native
     		// count
     		myCollections.remove(new Integer(myCollection.getID()));
     		
@@ -323,26 +330,33 @@
     			// FIXME: oh god this is so annoying - what an API /Richard
     			// we need to deduplicate against existing items in this collection
     			ItemIterator itr = myCollection.getItems();
-    			ArrayList idslist = new ArrayList();
-    			while (itr.hasNext())
-    			{
-    				idslist.add(new Integer(itr.nextID()));
-    			}
-    			
-    			for (int i = 0; i < browseItems.length; i++)
-    			{
-    				// only if it isn't already in this collection
-    				if (!idslist.contains(new Integer(browseItems[i].getID())))
-    				{
-    					// only put on list if you can read item
-    					if (AuthorizeManager.authorizeActionBoolean(context, browseItems[i], Constants.READ))
-    					{
-    						items.put(new Integer(browseItems[i].getID()), browseItems[i]);
-    					}
-    				}
-    			}
-    			
-    		}
+                try
+                {
+                    ArrayList idslist = new ArrayList();
+                    while (itr.hasNext())
+                    {
+                        idslist.add(new Integer(itr.nextID()));
+                    }
+
+                    for (int i = 0; i < browseItems.length; i++)
+                    {
+                        // only if it isn't already in this collection
+                        if (!idslist.contains(new Integer(browseItems[i].getID())))
+                        {
+                            // only put on list if you can read item
+                            if (AuthorizeManager.authorizeActionBoolean(context, browseItems[i], Constants.READ))
+                            {
+                                items.put(new Integer(browseItems[i].getID()), browseItems[i]);
+                            }
+                        }
+                    }
+                }
+                finally
+                {
+                    if (itr != null)
+                        itr.close();
+                }
+            }
     		catch (BrowseException e)
     		{
     			log.error("caught exception: ", e);
@@ -366,21 +380,28 @@
     		
     		// now find all imported items from that collection
     		// seemingly inefficient, but database should have this query cached
+            Map items = new HashMap();
     		ItemIterator i = myCollection.getItems();
-    		Map items = new HashMap();
+            try
+            {
+                while (i.hasNext())
+                {
+                    Item myItem = i.next();
+
+                    if (myItem.isOwningCollection(targetCollection))
+                    {
+                        Integer myKey = new Integer(myItem.getID());
+                        items.put(myKey, myItem);
+                    }
+                }
+            }
+            finally
+            {
+                if (i != null)
+                    i.close();
+            }
     		
-    		while (i.hasNext())
-    		{
-    			Item myItem = i.next();
-    			
-    			if (myItem.isOwningCollection(targetCollection))
-    			{
-    				Integer myKey = new Integer(myItem.getID());
-    				items.put(myKey, myItem);
-    			}
-    		}
-    		
-    		request.setAttribute("collection", myCollection);
+            request.setAttribute("collection", myCollection);
     		request.setAttribute("browsetext", targetCollection
     				.getMetadata("name"));
     		request.setAttribute("items", items);

Modified: trunk/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCollection.java
===================================================================
--- trunk/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCollection.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCollection.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -160,12 +160,21 @@
     {
         Vector result = new Vector();
         ItemIterator ii = this.collection.getItems();
-        while (ii.hasNext())
+        try
         {
-            Item item = ii.next();
-            result.add(new DAVItem(this.context, this.request, this.response,
-                    makeChildPath(item), item));
+            while (ii.hasNext())
+            {
+                Item item = ii.next();
+                result.add(new DAVItem(this.context, this.request, this.response,
+                        makeChildPath(item), item));
+            }
         }
+        finally
+        {
+            if (ii != null)
+                ii.close();
+        }
+        
         return (DAVResource[]) result.toArray(new DAVResource[result.size()]);
     }
 

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/BrowseItemForm.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/BrowseItemForm.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/BrowseItemForm.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -196,14 +196,21 @@
 		
 		// get all items from that collection
         ItemIterator iterator = collection.getItems();
-        
-        while (iterator.hasNext())
+        try
         {
-            Item item = iterator.next();
+            while (iterator.hasNext())
+            {
+                Item item = iterator.next();
 
-            if (! item.isOwningCollection(collection))
-                items.add(item);
+                if (! item.isOwningCollection(collection))
+                    items.add(item);
+            }
         }
+        finally
+        {
+            if (iterator != null)
+                iterator.close();
+        }
         
         return items;
 	}

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/MapperMain.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/MapperMain.java	2008-09-11 15:15:38 UTC (rev 3128)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/MapperMain.java	2008-09-11 16:19:47 UTC (rev 3129)
@@ -157,18 +157,26 @@
 		// get all items from that collection
         ItemIterator iterator = collection.getItems();
 
-        // iterate through the items in this collection, and count how many
-        // are native, and how many are imports, and which collections they
-        // came from
-        while (iterator.hasNext())
+        try
         {
-            Item item = iterator.next();
+            // iterate through the items in this collection, and count how many
+            // are native, and how many are imports, and which collections they
+            // came from
+            while (iterator.hasNext())
+            {
+                Item item = iterator.next();
 
-            if (item.isOwningCollection(collection))
-                count_native++;
-            else
-                count_import++;
-        }	
+                if (item.isOwningCollection(collection))
+                    count_native++;
+                else
+                    count_import++;
+            }
+        }
+        finally
+        {
+            if (iterator != null)
+                iterator.close();
+        }
         
         int[] counts = new int[2];
         counts[0] = count_native;


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

Revision: 3130
          http://dspace.svn.sourceforge.net/dspace/?rev=3130&view=rev
Author:   grahamtriggs
Date:     2008-09-12 10:30:32 +0000 (Fri, 12 Sep 2008)

Log Message:
-----------
Fix compilation errors from merge

Modified Paths:
--------------
    trunk/dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DIDLCrosswalk.java
    trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/StatisticsViewer.java

Modified: trunk/dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DIDLCrosswalk.java
===================================================================
--- trunk/dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DIDLCrosswalk.java	2008-09-11 16:19:47 UTC (rev 3129)
+++ trunk/dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DIDLCrosswalk.java	2008-09-12 10:30:32 UTC (rev 3130)
@@ -35,6 +35,8 @@
 package org.dspace.app.oai;
 
 import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.io.IOException;
 import java.util.Date;
 import java.util.Properties;
 

Modified: trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/StatisticsViewer.java
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/StatisticsViewer.java	2008-09-11 16:19:47 UTC (rev 3129)
+++ trunk/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/StatisticsViewer.java	2008-09-12 10:30:32 UTC (rev 3130)
@@ -123,15 +123,8 @@
                 // If the report isn't public
                 if (!showReport)
                 {
-                    try
-                    {
-                        // Administrators can always view reports
-                        showReport = AuthorizeManager.isAdmin(context);
-                    }
-                    catch (SQLException sqle)
-                    {
-                        log.error("Unable to check for administrator", sqle);
-                    }
+                    // Administrators can always view reports
+                    showReport = AuthorizeManager.isAdmin(context);
                 }
 
                 // Only generate a validity if the report is visible


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

Revision: 3399
          http://dspace.svn.sourceforge.net/dspace/?rev=3399&view=rev
Author:   tdonohue
Date:     2009-01-28 17:08:57 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
Fix for SF bug [2543413] XMLUI Submission forms display validation errors on other fields during add/remove.   This was a usability problem that came up in local usability testing of XMLUI, that I thought would be best to fix for 1.5.2.

Modified Paths:
--------------
    trunk/dspace-api/src/main/java/org/dspace/submit/step/DescribeStep.java
    trunk/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/structural.xsl

Modified: trunk/dspace-api/src/main/java/org/dspace/submit/step/DescribeStep.java
===================================================================
--- trunk/dspace-api/src/main/java/org/dspace/submit/step/DescribeStep.java	2009-01-28 17:01:47 UTC (rev 3398)
+++ trunk/dspace-api/src/main/java/org/dspace/submit/step/DescribeStep.java	2009-01-28 17:08:57 UTC (rev 3399)
@@ -270,16 +270,22 @@
 
         // Step 3:
         // Check to see if any fields are missing
-        clearErrorFields(request);
-        for (int i = 0; i < inputs.length; i++)
+        // Only check for required fields if user clicked the "next" button
+        // (or clicked progress bar)
+        //  @TODO: It'd be better if we allowed them to click *backwards* in Progress bar, but not *forwards*
+        if (buttonPressed.equals(NEXT_BUTTON) || buttonPressed.startsWith(PROGRESS_BAR_PREFIX))
         {
-            DCValue[] values = item.getMetadata(inputs[i].getSchema(),
-                    inputs[i].getElement(), inputs[i].getQualifier(), Item.ANY);
+            clearErrorFields(request);
+            for (int i = 0; i < inputs.length; i++)
+            {
+                DCValue[] values = item.getMetadata(inputs[i].getSchema(),
+                        inputs[i].getElement(), inputs[i].getQualifier(), Item.ANY);
 
-            if (inputs[i].isRequired() && values.length == 0)
-            {
-                // since this field is missing add to list of error fields
-                addErrorField(request, getFieldName(inputs[i]));
+                if (inputs[i].isRequired() && values.length == 0)
+                {
+                    // since this field is missing add to list of error fields
+                    addErrorField(request, getFieldName(inputs[i]));
+                }
             }
         }
 

Modified: trunk/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/structural.xsl
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/structural.xsl	2009-01-28 17:01:47 UTC (rev 3398)
+++ trunk/dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/structural.xsl	2009-01-28 17:08:57 UTC (rev 3399)
@@ -1470,7 +1470,8 @@
         <div class="ds-form-content">
             <xsl:apply-templates select="dri:field" mode="compositeComponent"/>
             <xsl:if test="contains(dri:params/@operations,'add')">
-                <input type="submit" value="Add" name="{concat(@n,'_add')}" class="ds-button-field" />
+                <!-- Add buttons should be named "submit_[field]_add" so that we can ignore errors from required fields when simply adding new values-->
+                <input type="submit" value="Add" name="{concat('submit_',@n,'_add')}" class="ds-button-field ds-add-button" />
             </xsl:if>
             <div class="spacer">&#160;</div>
             <xsl:apply-templates select="dri:field/dri:error" mode="compositeComponent"/>
@@ -1482,7 +1483,8 @@
                         <xsl:with-param name="position">1</xsl:with-param>
                     </xsl:call-template>
                     <xsl:if test="contains(dri:params/@operations,'delete') and (dri:instance or dri:field/dri:instance)">
-                        <input type="submit" value="Remove selected" name="{concat(@n,'_delete')}" class="ds-button-field" />
+                        <!-- Delete buttons should be named "submit_[field]_delete" so that we can ignore errors from required fields when simply removing values-->
+                        <input type="submit" value="Remove selected" name="{concat('submit_',@n,'_delete')}" class="ds-button-field ds-delete-button" />
                     </xsl:if>
                     <xsl:for-each select="dri:field">
                         <xsl:apply-templates select="dri:instance" mode="hiddenInterpreter"/>
@@ -1513,7 +1515,8 @@
         <!-- Follow it up with an ADD button if the add operation is specified. This allows 
             entering more than one value for this field. -->
         <xsl:if test="contains(dri:params/@operations,'add')">
-            <input type="submit" value="Add" name="{concat(@n,'_add')}" class="ds-button-field" />
+            <!-- Add buttons should be named "submit_[field]_add" so that we can ignore errors from required fields when simply adding new values-->
+            <input type="submit" value="Add" name="{concat('submit_',@n,'_add')}" class="ds-button-field ds-add-button" />
         </xsl:if>
         <br/>
         <xsl:apply-templates select="dri:help" mode="help"/>
@@ -1528,7 +1531,8 @@
                 <!-- Conclude with a DELETE button if the delete operation is specified. This allows 
                     removing one or more values stored for this field. -->
                 <xsl:if test="contains(dri:params/@operations,'delete') and dri:instance">
-                    <input type="submit" value="Remove selected" name="{concat(@n,'_delete')}" class="ds-button-field" />
+                    <!-- Delete buttons should be named "submit_[field]_delete" so that we can ignore errors from required fields when simply removing values-->
+                    <input type="submit" value="Remove selected" name="{concat('submit_',@n,'_delete')}" class="ds-button-field ds-delete-button" />
                 </xsl:if>
                 <!-- Behind the scenes, add hidden fields for every instance set. This is to make sure that
                     the form still submits the information in those instances, even though they are no 
@@ -1599,7 +1603,8 @@
         <!-- Follow it up with an ADD button if the add operation is specified. This allows 
             entering more than one value for this field. -->
         <xsl:if test="contains(dri:params/@operations,'add')">
-            <input type="submit" value="Add" name="{concat(@n,'_add')}" class="ds-button-field" />
+            <!-- Add buttons should be named "submit_[field]_add" so that we can ignore errors from required fields when simply adding new values-->
+            <input type="submit" value="Add" name="{concat('submit_',@n,'_add')}" class="ds-button-field ds-add-button" />
         </xsl:if>
         <br/>
         <xsl:if test="dri:instance or dri:field/dri:instance">
@@ -1610,7 +1615,8 @@
                 <!-- Conclude with a DELETE button if the delete operation is specified. This allows 
                     removing one or more values stored for this field. -->
                 <xsl:if test="contains(dri:params/@operations,'delete') and (dri:instance or dri:field/dri:instance)">
-                    <input type="submit" value="Remove selected" name="{concat(@n,'_delete')}" class="ds-button-field" />
+                    <!-- Delete buttons should be named "submit_[field]_delete" so that we can ignore errors from required fields when simply removing values-->
+                    <input type="submit" value="Remove selected" name="{concat('submit_',@n,'_delete')}" class="ds-button-field ds-delete-button" />
                 </xsl:if>
                 <xsl:for-each select="dri:field">
                     <xsl:apply-templates select="dri:instance" mode="hiddenInterpreter"/>


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

Revision: 3725
          http://dspace.svn.sourceforge.net/dspace/?rev=3725&view=rev
Author:   stuartlewis
Date:     2009-04-23 03:21:52 +0000 (Thu, 23 Apr 2009)

Log Message:
-----------
Adjust project poms to 1.6.0-SNAPSHOT, and changed location of svn repo from /branches/dspace-1_5_x/ to /trunk/

Modified Paths:
--------------
    trunk/dspace/modules/jspui/pom.xml
    trunk/dspace/modules/lni/pom.xml
    trunk/dspace/modules/oai/pom.xml
    trunk/dspace/modules/pom.xml
    trunk/dspace/modules/sword/pom.xml
    trunk/dspace/modules/xmlui/pom.xml
    trunk/dspace/pom.xml
    trunk/dspace-api/pom.xml
    trunk/dspace-jspui/dspace-jspui-api/pom.xml
    trunk/dspace-jspui/dspace-jspui-webapp/pom.xml
    trunk/dspace-jspui/pom.xml
    trunk/dspace-lni/dspace-lni-client/pom.xml
    trunk/dspace-lni/dspace-lni-core/pom.xml
    trunk/dspace-lni/dspace-lni-webapp/pom.xml
    trunk/dspace-lni/pom.xml
    trunk/dspace-oai/dspace-oai-api/pom.xml
    trunk/dspace-oai/dspace-oai-webapp/pom.xml
    trunk/dspace-oai/pom.xml
    trunk/dspace-sword/dspace-sword-api/pom.xml
    trunk/dspace-sword/dspace-sword-webapp/pom.xml
    trunk/dspace-sword/pom.xml
    trunk/dspace-xmlui/dspace-xmlui-api/pom.xml
    trunk/dspace-xmlui/dspace-xmlui-webapp/pom.xml
    trunk/dspace-xmlui/dspace-xmlui-wing/pom.xml
    trunk/dspace-xmlui/pom.xml
    trunk/pom.xml

Modified: trunk/dspace/modules/jspui/pom.xml
===================================================================
--- trunk/dspace/modules/jspui/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace/modules/jspui/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.dspace</groupId>
 		<artifactId>modules</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.6.0-SNAPSHOT</version>
 	</parent>
 
 	<profiles>
@@ -89,9 +89,9 @@
 	</repositories>
 
 	<scm>
-		<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>
+		<connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/jspui</connection>
+		<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/jspui</developerConnection>
+		<url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace/modules/jspui</url>
 	</scm>
 
 	<build>

Modified: trunk/dspace/modules/lni/pom.xml
===================================================================
--- trunk/dspace/modules/lni/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace/modules/lni/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -12,7 +12,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -32,9 +32,9 @@
    </repositories>
 
    <scm>
-      <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>
+      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/lni</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/lni</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/lni</url>
    </scm>
 
    <build>

Modified: trunk/dspace/modules/oai/pom.xml
===================================================================
--- trunk/dspace/modules/oai/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace/modules/oai/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -41,9 +41,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <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>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/oai</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/oai</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/oai</url>
    </scm>
 
    <build>

Modified: trunk/dspace/modules/pom.xml
===================================================================
--- trunk/dspace/modules/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace/modules/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.dspace</groupId>
 		<artifactId>dspace-parent</artifactId>
-		<version>1.5.3-SNAPSHOT</version>
+		<version>1.6.0-SNAPSHOT</version>
 	</parent>
 
 	<repositories>
@@ -30,9 +30,9 @@
 	</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>
+      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules</url>
    </scm>
    
 	<modules>

Modified: trunk/dspace/modules/sword/pom.xml
===================================================================
--- trunk/dspace/modules/sword/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace/modules/sword/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -41,9 +41,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <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>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/sword</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/sword</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/sword</url>
    </scm>
 
    <build>

Modified: trunk/dspace/modules/xmlui/pom.xml
===================================================================
--- trunk/dspace/modules/xmlui/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace/modules/xmlui/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -13,7 +13,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -33,9 +33,9 @@
    </repositories>
 
    <scm>
-      <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>
+      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/xmlui</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/xmlui</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/xmlui</url>
    </scm>
 
    <build>

Modified: trunk/dspace/pom.xml
===================================================================
--- trunk/dspace/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -41,9 +41,9 @@
    	into the snapshot repository below.
    -->
    <scm>
-   	<connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace</connection>
-   	<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace</developerConnection>
-   	<url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace</url>
+   	<connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace</connection>
+   	<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace</developerConnection>
+   	<url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace</url>
    </scm>
 
    <profiles>

Modified: trunk/dspace-api/pom.xml
===================================================================
--- trunk/dspace-api/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-api/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -13,7 +13,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -39,9 +39,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace</url>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace</url>
    </scm>
 
    <!-- 

Modified: trunk/dspace-jspui/dspace-jspui-api/pom.xml
===================================================================
--- trunk/dspace-jspui/dspace-jspui-api/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-jspui/dspace-jspui-api/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-jspui</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -40,9 +40,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-jspui/dspace-jspui-api</url>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-jspui/dspace-jspui-api</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-jspui/dspace-jspui-api</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-jspui/dspace-jspui-api</url>
    </scm>
 
    <dependencies>

Modified: trunk/dspace-jspui/dspace-jspui-webapp/pom.xml
===================================================================
--- trunk/dspace-jspui/dspace-jspui-webapp/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-jspui/dspace-jspui-webapp/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-jspui</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -40,9 +40,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-jspui/dspace-jspui-webapp</url>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-jspui/dspace-jspui-webapp</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-jspui/dspace-jspui-webapp</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-jspui/dspace-jspui-webapp</url>
    </scm>
 
    <build>

Modified: trunk/dspace-jspui/pom.xml
===================================================================
--- trunk/dspace-jspui/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-jspui/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -40,9 +40,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-jspui</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-jspui</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-jspui</url>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-jspui</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-jspui</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-jspui</url>
    </scm>
 
    <modules>

Modified: trunk/dspace-lni/dspace-lni-client/pom.xml
===================================================================
--- trunk/dspace-lni/dspace-lni-client/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-lni/dspace-lni-client/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -12,7 +12,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-lni</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -33,9 +33,9 @@
    </repositories>
 
    <scm>
-      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-client</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-client</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-client</url>
+      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-lni/dspace-lni-client</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-lni/dspace-lni-client</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-lni/dspace-lni-client</url>
    </scm>
 
    <profiles>

Modified: trunk/dspace-lni/dspace-lni-core/pom.xml
===================================================================
--- trunk/dspace-lni/dspace-lni-core/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-lni/dspace-lni-core/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -10,7 +10,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-lni</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -31,9 +31,9 @@
    </repositories>
 
    <scm>
-      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-core</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-core</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-lni/dspace-lni-core</url>
+      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-lni/dspace-lni-core</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-lni/dspace-lni-core</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-lni/dspace-lni-core</url>
    </scm>
 
    <dependencies>

Modified: trunk/dspace-lni/dspace-lni-webapp/pom.xml
===================================================================
--- trunk/dspace-lni/dspace-lni-webapp/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-lni/dspace-lni-webapp/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -12,7 +12,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-lni</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -33,9 +33,9 @@
    </repositories>
 
    <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/trunk/dspace-lni/dspace-lni-webapp</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-lni/dspace-lni-webapp</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-lni/dspace-lni-webapp</url>
    </scm>
 
    <build>

Modified: trunk/dspace-lni/pom.xml
===================================================================
--- trunk/dspace-lni/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-lni/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -12,7 +12,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -38,9 +38,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-lni</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-lni</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-lni</url>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-lni</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-lni</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-lni</url>
    </scm>
 
    <modules>

Modified: trunk/dspace-oai/dspace-oai-api/pom.xml
===================================================================
--- trunk/dspace-oai/dspace-oai-api/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-oai/dspace-oai-api/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-oai</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -40,9 +40,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-oai/dspace-oai-api</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-oai/dspace-oai-api</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-oai/dspace-oai-api</url>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-oai/dspace-oai-api</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-oai/dspace-oai-api</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-oai/dspace-oai-api</url>
    </scm>
 
    <dependencies>

Modified: trunk/dspace-oai/dspace-oai-webapp/pom.xml
===================================================================
--- trunk/dspace-oai/dspace-oai-webapp/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-oai/dspace-oai-webapp/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-oai</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -40,9 +40,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-oai/dspace-oai-webapp</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-oai/dspace-oai-webapp</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-oai/dspace-oai-webapp</url>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-oai/dspace-oai-webapp</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-oai/dspace-oai-webapp</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-oai/dspace-oai-webapp</url>
    </scm>
    
    <build>

Modified: trunk/dspace-oai/pom.xml
===================================================================
--- trunk/dspace-oai/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-oai/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -40,9 +40,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/trunk/dspace-oai</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-oai</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-oai</url>
    </scm>
    
    <modules>

Modified: trunk/dspace-sword/dspace-sword-api/pom.xml
===================================================================
--- trunk/dspace-sword/dspace-sword-api/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-sword/dspace-sword-api/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-sword</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -42,9 +42,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-sword/dspace-sword-api</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-sword/dspace-sword-api</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-sword/dspace-sword-api</url>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-sword/dspace-sword-api</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-sword/dspace-sword-api</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-sword/dspace-sword-api</url>
    </scm>
 
    <dependencies>

Modified: trunk/dspace-sword/dspace-sword-webapp/pom.xml
===================================================================
--- trunk/dspace-sword/dspace-sword-webapp/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-sword/dspace-sword-webapp/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-sword</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -40,9 +40,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-sword/dspace-sword-webapp</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-sword/dspace-sword-webapp</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-sword/dspace-sword-webapp</url>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-sword/dspace-sword-webapp</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-sword/dspace-sword-webapp</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-sword/dspace-sword-webapp</url>
    </scm>
 
    <build>
@@ -130,7 +130,7 @@
       <dependency>
          <groupId>org.dspace</groupId>
          <artifactId>dspace-sword-api</artifactId>
-         <version>1.5.3-SNAPSHOT</version>
+         <version>1.6.0-SNAPSHOT</version>
       </dependency>
    </dependencies>
 

Modified: trunk/dspace-sword/pom.xml
===================================================================
--- trunk/dspace-sword/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-sword/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -42,9 +42,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-sword</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-sword</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-sword</url>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-sword</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-sword</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-sword</url>
    </scm>
 
 

Modified: trunk/dspace-xmlui/dspace-xmlui-api/pom.xml
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-api/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-xmlui/dspace-xmlui-api/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -13,7 +13,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-xmlui</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -34,9 +34,9 @@
    </repositories>
 
    <scm>
-      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-api/</url>
+      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-xmlui/dspace-xmlui-api</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-xmlui/dspace-xmlui-api</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-xmlui/dspace-xmlui-api/</url>
    </scm>
 
    <dependencies>

Modified: trunk/dspace-xmlui/dspace-xmlui-webapp/pom.xml
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-webapp/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-xmlui/dspace-xmlui-webapp/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -13,7 +13,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-xmlui</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -34,9 +34,9 @@
    </repositories>
 
    <scm>
-      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-webapp</url>
+      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-xmlui/dspace-xmlui-webapp</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-xmlui/dspace-xmlui-webapp</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-xmlui/dspace-xmlui-webapp</url>
    </scm>
 
    <build>

Modified: trunk/dspace-xmlui/dspace-xmlui-wing/pom.xml
===================================================================
--- trunk/dspace-xmlui/dspace-xmlui-wing/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-xmlui/dspace-xmlui-wing/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -10,7 +10,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-xmlui</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -31,9 +31,9 @@
    </repositories>
 
    <scm>
-      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-wing</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-wing</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x/dspace-xmlui/dspace-xmlui-wing</url>
+      <connection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-xmlui/dspace-xmlui-wing</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-xmlui/dspace-xmlui-wing</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-xmlui/dspace-xmlui-wing</url>
    </scm>
 
    <dependencies>

Modified: trunk/dspace-xmlui/pom.xml
===================================================================
--- trunk/dspace-xmlui/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/dspace-xmlui/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -12,7 +12,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>1.5.3-SNAPSHOT</version>
+      <version>1.6.0-SNAPSHOT</version>
    </parent>
 
    <repositories>
@@ -38,9 +38,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://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:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-xmlui</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace-xmlui</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk/dspace-xmlui</url>
    </scm>
    
    <modules>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-04-23 02:36:30 UTC (rev 3724)
+++ trunk/pom.xml	2009-04-23 03:21:52 UTC (rev 3725)
@@ -3,7 +3,7 @@
    <groupId>org.dspace</groupId>
    <artifactId>dspace-parent</artifactId>
    <packaging>pom</packaging>
-   <version>1.5.3-SNAPSHOT</version>
+   <version>1.6.0-SNAPSHOT</version>
    <name>DSpace Parent Project</name>
    <url>http://projects.dspace.org</url>
 
@@ -724,9 +724,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/branches/dspace-1_5_x</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/branches/dspace-1_5_x</url>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/viewvc/dspace/trunk</url>
    </scm>
 
    <!-- 


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

Revision: 3759
          http://dspace.svn.sourceforge.net/dspace/?rev=3759&view=rev
Author:   stuartlewis
Date:     2009-05-05 08:27:05 +0000 (Tue, 05 May 2009)

Log Message:
-----------
[DS-201] handle.jar upgraded to version 6.2

Modified Paths:
--------------
    trunk/dspace/CHANGES
    trunk/dspace-api/pom.xml
    trunk/pom.xml

Modified: trunk/dspace/CHANGES
===================================================================
--- trunk/dspace/CHANGES	2009-04-30 23:40:25 UTC (rev 3758)
+++ trunk/dspace/CHANGES	2009-05-05 08:27:05 UTC (rev 3759)
@@ -18,7 +18,10 @@
 (Larry Stone)
  - [DS-193] OAI RDF crosswalk fails when DC value is null
 
+ (Mark Diggory / Stuart Lewis)
+ - [DS-201] handle.jar upgraded to version 6.2
 
+
 1.5.2 final
 ===========
 

Modified: trunk/dspace-api/pom.xml
===================================================================
--- trunk/dspace-api/pom.xml	2009-04-30 23:40:25 UTC (rev 3758)
+++ trunk/dspace-api/pom.xml	2009-05-05 08:27:05 UTC (rev 3759)
@@ -51,6 +51,7 @@
       <dependency>
          <groupId>org.dspace</groupId>
          <artifactId>handle</artifactId>
+         <version>6.2</version>
       </dependency>
       <dependency>
          <groupId>org.dspace</groupId>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-04-30 23:40:25 UTC (rev 3758)
+++ trunk/pom.xml	2009-05-05 08:27:05 UTC (rev 3759)
@@ -289,7 +289,7 @@
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>handle</artifactId>
-            <version>5.3.4</version>
+            <version>6.2</version>
          </dependency>
          <dependency>
             <groupId>org.dspace</groupId>


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