[maven-scm] copy for tag dspace-1.8.1

git-svn-id: http://scm.dspace.org/svn/repo/dspace/tags/dspace-1.8.1@6911 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace-api/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -23,9 +23,9 @@
        into the snapshot repository below.
     -->
     <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace</connection>
-        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace</developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace</url>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 
     <!--

dspace-api/src/main/java/org/dspace/browse/BrowseDAOOracle.java

@@ -836,6 +836,7 @@ public class BrowseDAOOracle implements BrowseDAO
             {
                 queryBuf.append(" DESC ");
             }
+            queryBuf.append(" NULLS LAST ");
         }
     }
 

dspace-api/src/main/java/org/dspace/browse/BrowseDAOPostgres.java

@@ -844,6 +844,7 @@ public class BrowseDAOPostgres implements BrowseDAO
             {
                 queryBuf.append(" DESC ");
             }
+            queryBuf.append(" NULLS LAST ");
         }
     }
 

dspace-api/src/main/java/org/dspace/browse/IndexBrowse.java

@@ -564,6 +564,9 @@ public class IndexBrowse
                 {
                     String nValue = OrderFormat.makeSortString(value.value, value.language, so.getType());
                     sortMap.put(key, nValue);
+                } else {
+                	// Add an empty entry to clear out any old values in the sort columns.
+                	sortMap.put(key, null);
                 }
             }
             

dspace-api/src/main/java/org/dspace/content/Bundle.java

@@ -491,6 +491,14 @@ public class Bundle extends DSpaceObject
 
             // Place the bitstream in the list of bitstreams in this bundle
             bitstreams.add(bitstreamMap.get(bitstreamId));
+        }
+
+        //The order of the bitstreams has changed, ensure that we update the last modified of our item
+        Item owningItem = (Item) getParentObject();
+        if(owningItem != null)
+        {
+            owningItem.updateLastModified();
+            owningItem.update();
 
         }
     }
@@ -531,7 +539,16 @@ public class Bundle extends DSpaceObject
         }
 
         ourContext.addEvent(new Event(Event.REMOVE, Constants.BUNDLE, getID(), Constants.BITSTREAM, b.getID(), String.valueOf(b.getSequenceID())));
-        
+
+        //Ensure that the last modified from the item is triggered !
+        Item owningItem = (Item) getParentObject();
+        if(owningItem != null)
+        {
+            owningItem.updateLastModified();
+            owningItem.update();
+
+        }
+
         // In the event that the bitstream to remove is actually
         // the primary bitstream, be sure to unset the primary
         // bitstream.

dspace-api/src/main/java/org/dspace/content/InstallItem.java

@@ -123,10 +123,29 @@ public class InstallItem
             handle = HandleManager.createHandle(c, item, suppliedHandle);
         }
 
-        //NOTE: this method specifically skips over "populateMetadata()"
-        // As this is a "restore" all the metadata should have already been restored
-
-        //@TODO: Do we actually want a "Restored on ..." provenance message?  Or perhaps kick off an event?
+        // Even though we are restoring an item it may not have a have the proper dates. So lets
+        // double check that it has a date accessioned and date issued, and if either of those dates
+        // are not set then set them to today.
+        DCDate now = DCDate.getCurrent();
+        
+        // If the item dosn't have a date.accessioned create one.
+        DCValue[] dateAccessioned = item.getDC("date", "accessioned", Item.ANY);
+        if (dateAccessioned.length == 0)
+        {
+	        item.addDC("date", "accessioned", null, now.toString());
+        }
+        
+        // create issue date if not present
+        DCValue[] currentDateIssued = item.getDC("date", "issued", Item.ANY);
+        if (currentDateIssued.length == 0)
+        {
+            DCDate issued = new DCDate(now.getYear(),now.getMonth(),now.getDay(),-1,-1,-1);
+            item.addDC("date", "issued", null, issued.toString());
+        }
+        
+        // Record that the item was restored
+		String provDescription = "Restored into DSpace on "+ now + " (GMT).";
+		item.addDC("description", "provenance", "en", provDescription);
 
         return finishItem(c, item, is, null);
     }
@@ -153,7 +172,7 @@ public class InstallItem
         }
     }
 
-    // fill in metadata needed by new Item.
+
     private static void populateMetadata(Context c, Item item, DCDate embargoLiftDate)
         throws SQLException, IOException, AuthorizeException
     {

dspace-api/src/main/java/org/dspace/content/Item.java

@@ -306,6 +306,15 @@ public class Item extends DSpaceObject
         return myDate;
     }
 
+    /**
+     * Method that updates the last modified date of the item
+     * The modified boolean will be set to true and the actual date update will occur on item.update().
+     */
+    void updateLastModified()
+    {
+        modified = true;
+    }
+
     /**
      * Set the "is_archived" flag. This is public and only
      * <code>WorkflowItem.archive()</code> should set this.

dspace-api/src/main/java/org/dspace/curate/Curator.java

@@ -24,7 +24,6 @@ import org.dspace.content.Site;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.PluginManager;
-import org.dspace.eperson.EPerson;
 import org.dspace.handle.HandleManager;
 
 /**
@@ -365,19 +364,27 @@ public class Curator
     }
     
     /**
-     * Returns the context object used in the current curation performance.
+     * Returns the context object used in the current curation thread.
      * This is primarily a utility method to allow tasks access to the context when necessary.
      * <P>
      * If the context is null or not set, then this just returns
      * a brand new Context object representing an Anonymous User.
      * 
-     * @return curation Context object (or anonymous Context if curation is null)
+     * @return curation thread's Context object (or a new, anonymous Context if no curation Context exists)
      */
     public static Context curationContext() throws SQLException
     {
-    	// Return curation context or new context if undefined
+    	// Return curation context or new context if undefined/invalid
     	Context curCtx = curationCtx.get();
-        return (curCtx != null) ? curCtx : new Context();
+        
+        if(curCtx==null || !curCtx.isValid())
+        {
+            //Create a new context (represents an Anonymous User)
+            curCtx = new Context();
+            //Save it to current execution thread
+            curationCtx.set(curCtx);
+        }    
+        return curCtx;
     }
 
     /**
@@ -403,10 +410,12 @@ public class Curator
         Context ctx = null;
         try
         {
-        	ctx = curationContext();
+            //get access to the curation thread's current context
+            ctx = curationContext();
+            
             // Site-wide Tasks really should have an EPerson performer associated with them,
             // otherwise they are run as an "anonymous" user with limited access rights.
-            if(ctx.getCurrentUser()==null)
+            if(ctx.getCurrentUser()==null && !ctx.ignoreAuthorization())
             {
                 log.warn("You are running one or more Site-Wide curation tasks in ANONYMOUS USER mode," +
                          " as there is no EPerson 'performer' associated with this task. To associate an EPerson 'performer' " +
@@ -428,16 +437,9 @@ public class Curator
                     return false;
                 }
             }
-            
-            //complete & close our created Context
-            ctx.complete();
         }
         catch (SQLException sqlE)
         {
-            //abort Context & all changes
-            if(ctx!=null)
-                ctx.abort();
-            
             throw new IOException(sqlE);
         }
 
@@ -534,7 +536,7 @@ public class Curator
     		}
     		catch (SQLException sqlE)
     		{
-    			throw new IOException(sqlE.getMessage());
+    			throw new IOException(sqlE.getMessage(), sqlE);
     		}
     	}
     }

dspace-api/src/main/java/org/dspace/eperson/Subscribe.java

@@ -12,10 +12,12 @@ import java.sql.SQLException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
+import java.util.TimeZone;
 
 import javax.mail.MessagingException;
 
@@ -343,15 +345,23 @@ public class Subscribe
         ResourceBundle labels =  ResourceBundle.getBundle("Messages", supportedLocale);
         
         // Get the start and end dates for yesterday
-        Date thisTimeYesterday = new Date(System.currentTimeMillis()
-                - (24 * 60 * 60 * 1000));
 
-        DCDate dcDateYesterday = new DCDate(thisTimeYesterday);
+        // The date should reflect the timezone as well. Otherwise we stand to lose that information 
+        // in truncation and roll to an earlier date than intended.
+        Calendar cal = Calendar.getInstance(TimeZone.getDefault());
+        cal.setTime(new Date());
+        
+        // What we actually want to pass to Harvest is "Midnight of yesterday in my current timezone"
+        // Truncation will actually pass in "Midnight of yesterday in UTC", which will be,
+        // at least in CDT, "7pm, the day before yesterday, in my current timezone".
+        cal.add(Calendar.HOUR, -24);
+        Date thisTimeYesterday = cal.getTime();
+        
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        Date midnightYesterday = cal.getTime();
 
-        // this time yesterday in ISO 8601, stripping the time
-        String isoDateYesterday = dcDateYesterday.toString().substring(0, 10);
-
-        String startDate = isoDateYesterday;
 
         // FIXME: text of email should be more configurable from an
         // i18n viewpoint
@@ -366,7 +376,7 @@ public class Subscribe
                 boolean includeAll = ConfigurationManager.getBooleanProperty("harvest.includerestricted.subscription", true);
                 
                 // we harvest all the changed item from yesterday until now
-                List<HarvestedItemInfo> itemInfos = Harvest.harvest(context, c, startDate, null, 0, // Limit
+                List<HarvestedItemInfo> itemInfos = Harvest.harvest(context, c, new DCDate(midnightYesterday).toString(), null, 0, // Limit
                                                                                     // and
                                                                                     // offset
                                                                                     // zero,

dspace-api/src/main/java/org/dspace/license/CreativeCommons.java

@@ -7,16 +7,11 @@
  */
 package org.dspace.license;
 
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.StringWriter;
+import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Iterator;
 
 import javax.xml.transform.Templates;
 import javax.xml.transform.TransformerConfigurationException;
@@ -25,6 +20,7 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import org.apache.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
 import org.dspace.content.BitstreamFormat;
@@ -34,10 +30,12 @@ import org.dspace.content.Item;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.Utils;
-import org.dspace.license.CCLookup;
 
 public class CreativeCommons
 {
+    /** log4j category */
+    private static Logger log = Logger.getLogger(CreativeCommons.class);
+
     /**
      * The Bundle Name
      */
@@ -429,30 +427,23 @@ public class CreativeCommons
     {
         try
         {
+            String line = "";
             URL url = new URL(url_string);
             URLConnection connection = url.openConnection();
-            byte[] bytes = new byte[connection.getContentLength()];
+            InputStream inputStream = connection.getInputStream();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+            StringBuilder sb = new StringBuilder();
 
-            // loop and read the data until it's done
-            int offset = 0;
-
-            while (true)
+            while ((line = reader.readLine()) != null)
             {
-                int len = connection.getInputStream().read(bytes, offset,
-                        bytes.length - offset);
-
-                if (len == -1)
-                {
-                    break;
-                }
-
-                offset += len;
+                sb.append(line);
             }
 
-            return bytes;
+            return sb.toString().getBytes();
         }
         catch (Exception exc)
         {
+            log.error(exc.getMessage());
             return null;
         }
     }

dspace-discovery/dspace-discovery-provider/pom.xml

@@ -4,7 +4,7 @@
 	<packaging>jar</packaging>
 	<groupId>org.dspace</groupId>
 	<artifactId>dspace-discovery-provider</artifactId>
-	<version>3.0-SNAPSHOT</version>
+	<version>1.8.1</version>
     <name>DSpace Discovery :: Discovery Provider Library</name>
     <description>
 
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-discovery</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -104,10 +104,10 @@
        and releases snapshots into the snapshot repository below.
     -->
     <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery/dspace-discovery-provider</connection>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
         <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery/dspace-discovery-provider
+            scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery/dspace-discovery-provider</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 </project>

dspace-discovery/dspace-discovery-solr/pom.xml

@@ -4,13 +4,13 @@
 	<packaging>jar</packaging>
 	<groupId>org.dspace</groupId>
 	<artifactId>dspace-discovery-solr</artifactId>
-	<version>3.0-SNAPSHOT</version>
+	<version>1.8.1</version>
     <name>DSpace Discovery :: Discovery Solr Implementation</name>
 
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-discovery</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -52,10 +52,10 @@
        and releases snapshots into the snapshot repository below.
     -->
     <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery/dspace-discovery-solr</connection>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
         <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery/dspace-discovery-solr
+            scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery/dspace-discovery-solr</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 </project>

dspace-discovery/dspace-discovery-xmlui-api/pom.xml

@@ -5,13 +5,13 @@
     <packaging>jar</packaging>
     <groupId>org.dspace</groupId>
     <artifactId>dspace-discovery-xmlui-api</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>1.8.1</version>
     <name>DSpace Discovery :: Discovery XMLUI API</name>
 
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-discovery</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
     
@@ -122,11 +122,11 @@
        and releases snapshots into the snapshot repository below.
     -->
     <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery/dspace-discovery-xmlui-api</connection>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
         <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery/dspace-discovery-xmlui-api
+            scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery/dspace-discovery-xmlui-api</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
     
 </project>

dspace-discovery/dspace-discovery-xmlui-webapp/pom.xml

@@ -5,13 +5,13 @@
     <packaging>war</packaging>
     <groupId>org.dspace</groupId>
     <artifactId>dspace-discovery-xmlui-webapp</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>1.8.1</version>
     <name>DSpace Discovery :: Discovery XMLUI Webapp</name>
 
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-discovery</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-discovery-xmlui-api</artifactId>
-            <version>3.0-SNAPSHOT</version>
+            <version>1.8.1</version>
         </dependency>
 
             <!-- external -->
@@ -142,11 +142,11 @@
        and releases snapshots into the snapshot repository below.
     -->
     <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery/dspace-discovery-xmlui-webapp</connection>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
         <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery/dspace-discovery-xmlui-webapp
+            scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery/dspace-discovery-xmlui-webapp</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 
 </project>

dspace-discovery/pom.xml

@@ -5,13 +5,13 @@
     <packaging>pom</packaging>
     <groupId>org.dspace</groupId>
     <artifactId>dspace-discovery</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>1.8.1</version>
     <name>DSpace Discovery :: Modules</name>
 
     <parent>
         <artifactId>dspace-parent</artifactId>
         <groupId>org.dspace</groupId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
         <relativePath>..</relativePath>
     </parent>
     
@@ -54,11 +54,11 @@
        and releases snapshots into the snapshot repository below.
     -->
     <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery</connection>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
         <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery
+            scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-discovery</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 
     <issueManagement>

dspace-jspui/dspace-jspui-api/pom.xml

@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-jspui</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -24,9 +24,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-jspui/dspace-jspui-api</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-jspui/dspace-jspui-api</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-jspui/dspace-jspui-api</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <dependencies>

dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/Authenticate.java

@@ -163,7 +163,15 @@ public class Authenticate
         {
             loggedIn(context, request, context.getCurrentUser());
             log.info(LogManager.getHeader(context, "login", "type=implicit"));
-            return true;
+            if(context.getCurrentUser() != null){
+                //We have a new user
+                Authenticate.resumeInterruptedRequest(request, response);
+                return false;
+            }else{
+                //Couldn't log & authentication finished
+                return true;
+            }
+
         }
         else
         {

dspace-jspui/dspace-jspui-webapp/pom.xml

@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-jspui</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -24,9 +24,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-jspui/dspace-jspui-webapp</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-jspui/dspace-jspui-webapp</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-jspui/dspace-jspui-webapp</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <build>

dspace-jspui/pom.xml

@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -24,9 +24,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-jspui</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-jspui</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-jspui</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <modules>

dspace-lni/dspace-lni-client/pom.xml

@@ -12,14 +12,14 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-lni</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
    <scm>
-      <connection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-lni/dspace-lni-client</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-lni/dspace-lni-client</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-lni/dspace-lni-client</url>
+      <connection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <profiles>

dspace-lni/dspace-lni-core/pom.xml

@@ -10,14 +10,14 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-lni</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
    <scm>
-      <connection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-lni/dspace-lni-core</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-lni/dspace-lni-core</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-lni/dspace-lni-core</url>
+      <connection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <dependencies>

dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVDSpaceObject.java

@@ -89,7 +89,12 @@ abstract class DAVDSpaceObject extends DAVResource
         int hs;
         if (handleSeparator != '/')
         {
-            handle = handle.replaceFirst("/", String.valueOf(handleSeparator));
+        	if(handleSeparator != '$') {
+        		handle = handle.replaceFirst("/", String.valueOf(handleSeparator));
+        	} else {
+        		// handle $ specially
+        		handle = handle.replaceFirst("/", "\\$");
+        	}
         }
         return "dso_" + encodeHandle(handle);
     }

dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVServlet.java

@@ -289,80 +289,92 @@ public class DAVServlet extends HttpServlet
     {
         Context context = new Context();
 
-        if (getAuthFromCookie(context, request))
-        {
-            putAuthCookie(context, request, response, false);
-            return context;
-        }
+        try {
+	        if (getAuthFromCookie(context, request))
+	        {
+	            putAuthCookie(context, request, response, false);
+		        Context returnContext = context;
+		        context = null;
+		        return returnContext;
+	        }
+	
+	        // get username/password from Basic auth header if avail:
+	        String cred = request.getHeader("Authorization");
+	        if (cred != null && username == null && password == null)
+	        {
+	            log.info(LogManager.getHeader(context, "got creds", "Authorize: "
+	                    + cred));
+	            StringTokenizer ct = new StringTokenizer(cred);
+	
+	            // format: Basic {username:password in base64}
+	            if (ct.nextToken().equalsIgnoreCase("Basic"))
+	            {
+	                String crud = ct.nextToken();
+	                String dcrud = new String(Base64.decodeBase64(crud.getBytes()));
+	                int colon = dcrud.indexOf(':');
+	                if (colon > 0)
+	                {
+	                    username = decodeFromURL(dcrud.substring(0, colon));
+	                    password = decodeFromURL(dcrud.substring(colon + 1));
+	                    log
+	                            .info(LogManager.getHeader(context, "auth",
+	                                    "Got username=\"" + username
+	                                            + "\" out of \"" + crud + "\"."));
+	                }
+	            }
+	        }
 
-        // get username/password from Basic auth header if avail:
-        String cred = request.getHeader("Authorization");
-        if (cred != null && username == null && password == null)
-        {
-            log.info(LogManager.getHeader(context, "got creds", "Authorize: "
-                    + cred));
-            StringTokenizer ct = new StringTokenizer(cred);
-
-            // format: Basic {username:password in base64}
-            if (ct.nextToken().equalsIgnoreCase("Basic"))
-            {
-                String crud = ct.nextToken();
-                String dcrud = new String(Base64.decodeBase64(crud.getBytes()));
-                int colon = dcrud.indexOf(':');
-                if (colon > 0)
-                {
-                    username = decodeFromURL(dcrud.substring(0, colon));
-                    password = decodeFromURL(dcrud.substring(colon + 1));
-                    log
-                            .info(LogManager.getHeader(context, "auth",
-                                    "Got username=\"" + username
-                                            + "\" out of \"" + crud + "\"."));
-                }
-            }
+            // Authenticate the user.
+	        if (AuthenticationManager.authenticate(context, username, password,
+	                null, request) == AuthenticationMethod.SUCCESS)
+	        {
+	            log.info(LogManager.getHeader(context, "auth",
+	                    "Authentication returned SUCCESS, eperson="
+	                            + context.getCurrentUser().getEmail()));
+	        }
+	        else
+	        {
+	            if (username == null)
+	            {
+	                log.info(LogManager.getHeader(context, "auth",
+	                        "No credentials, so sending WWW-Authenticate header."));
+	            }
+	            else
+	            {
+	                log.warn(LogManager.getHeader(context, "auth",
+	                        "Authentication FAILED, cred=" + cred));
+	            }
+	
+	            // ...EXCEPT if dav.access.anonymous is true in config:
+	            if (!allowAnonymousAccess)
+	            {
+	                if (response != null)
+	                {
+	                    response.setHeader("WWW-Authenticate",
+	                            "Basic realm=\"dspace\"");
+	                    response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+	                }
+	                return null;
+	            }
+	        }
+	
+	        // Set any special groups - invoke the authentication mgr.
+	        int[] groupIDs = AuthenticationManager.getSpecialGroups(context,
+	                request);
+	        for (int element : groupIDs)
+	        {
+	            context.setSpecialGroup(element);
+	            log.debug("Adding Special Group id=" + String.valueOf(element));
+	        }
+	        putAuthCookie(context, request, response, true);
+	        
+	        Context returnContext = context;
+	        context = null;
+	        return returnContext;
+        } finally {
+        	if(context != null)
+        		context.abort();
         }
-        if (AuthenticationManager.authenticate(context, username, password,
-                null, request) == AuthenticationMethod.SUCCESS)
-        {
-            log.info(LogManager.getHeader(context, "auth",
-                    "Authentication returned SUCCESS, eperson="
-                            + context.getCurrentUser().getEmail()));
-        }
-        else
-        {
-            if (username == null)
-            {
-                log.info(LogManager.getHeader(context, "auth",
-                        "No credentials, so sending WWW-Authenticate header."));
-            }
-            else
-            {
-                log.warn(LogManager.getHeader(context, "auth",
-                        "Authentication FAILED, cred=" + cred));
-            }
-
-            // ...EXCEPT if dav.access.anonymous is true in config:
-            if (!allowAnonymousAccess)
-            {
-                if (response != null)
-                {
-                    response.setHeader("WWW-Authenticate",
-                            "Basic realm=\"dspace\"");
-                    response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
-                }
-                return null;
-            }
-        }
-
-        // Set any special groups - invoke the authentication mgr.
-        int[] groupIDs = AuthenticationManager.getSpecialGroups(context,
-                request);
-        for (int element : groupIDs)
-        {
-            context.setSpecialGroup(element);
-            log.debug("Adding Special Group id=" + String.valueOf(element));
-        }
-        putAuthCookie(context, request, response, true);
-        return context;
     }
 
     /**

dspace-lni/dspace-lni-webapp/pom.xml

@@ -12,14 +12,14 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-lni</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
    <scm>
-      <connection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-lni/dspace-lni-webapp</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-lni/dspace-lni-webapp</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-lni/dspace-lni-webapp</url>
+      <connection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <build>

dspace-lni/pom.xml

@@ -12,7 +12,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -22,9 +22,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-lni</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-lni</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-lni</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <modules>

dspace-oai/dspace-oai-api/pom.xml

@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-oai</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -24,9 +24,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-oai/dspace-oai-api</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-oai/dspace-oai-api</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-oai/dspace-oai-api</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <dependencies>

dspace-oai/dspace-oai-webapp/pom.xml

@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-oai</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -24,9 +24,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-oai/dspace-oai-webapp</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-oai/dspace-oai-webapp</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-oai/dspace-oai-webapp</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
    
    <build>

dspace-oai/pom.xml

@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -24,9 +24,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-oai</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-oai</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-oai</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
    
    <modules>

dspace-stats/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>dspace-parent</artifactId>
 		<groupId>org.dspace</groupId>
-		<version>3.0-SNAPSHOT</version>
+		<version>1.8.1</version>
         <relativePath>..</relativePath>
 	</parent>
 	
@@ -11,7 +11,7 @@
 	<groupId>org.dspace</groupId>
 	<artifactId>dspace-stats</artifactId>
 	<name>DSpace Solr Statistics Logging Client Library</name>
-	<version>3.0-SNAPSHOT</version>
+	<version>1.8.1</version>
 	<description>Library of Shared UsageEvent and EventConsumer Tools for Logging to Solr.</description>
 
 	<!--
@@ -20,9 +20,9 @@
 		releases snapshots into the snapshot repository below.
 	-->
 	<scm>
-		<connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-stats</connection>
-		<developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-stats</developerConnection>
-		<url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-stats</url>
+		<connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+		<developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+		<url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
 	</scm>
 
 	<developers>

dspace-sword-client/dspace-sword-client-api/pom.xml

@@ -5,13 +5,13 @@
     <packaging>jar</packaging>
     <groupId>org.dspace</groupId>
     <artifactId>dspace-sword-client-api</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>1.8.1</version>
     <name>DSpace Sword Client :: Sword Client API</name>
 
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-sword-client</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
     
@@ -33,11 +33,11 @@
        and releases snapshots into the snapshot repository below.
     -->
     <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword-client/dspace-sword-client-api</connection>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
         <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword-client/dspace-sword-client-api
+            scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword-client/dspace-sword-client-api</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
     
 </project>

dspace-sword-client/dspace-sword-client-xmlui-api/pom.xml

@@ -5,13 +5,13 @@
     <packaging>jar</packaging>
     <groupId>org.dspace</groupId>
     <artifactId>dspace-sword-client-xmlui-api</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>1.8.1</version>
     <name>DSpace Sword Client :: Sword Client XMLUI API</name>
 
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-sword-client</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
       <relativePath>..</relativePath>
     </parent>
 
@@ -48,12 +48,12 @@
        and releases snapshots into the snapshot repository below.
     -->
     <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword-client/dspace-sword-client-xmlui-api
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </connection>
         <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword-client/dspace-sword-client-xmlui-api
+            scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword-client/dspace-sword-client-xmlui-api</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 
 </project>

dspace-sword-client/dspace-sword-client-xmlui-webapp/pom.xml

@@ -4,13 +4,13 @@
     <packaging>war</packaging>
     <groupId>org.dspace</groupId>
     <artifactId>dspace-sword-client-xmlui-webapp</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>1.8.1</version>
     <name>DSpace Sword Client :: Sword Client XMLUI Webapp</name>
 
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-sword-client</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
       <relativePath>..</relativePath>
     </parent>
 
@@ -82,12 +82,12 @@
     -->
     <scm>
         <connection>
-            scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword-client/dspace-sword-client-xmlui-webapp
+            scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </connection>
         <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword-client/dspace-sword-client-xmlui-webapp
+            scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword-client/dspace-sword-client-xmlui-webapp</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 
 </project>

dspace-sword-client/pom.xml

@@ -4,13 +4,13 @@
     <packaging>pom</packaging>
     <groupId>org.dspace</groupId>
     <artifactId>dspace-sword-client</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>1.8.1</version>
     <name>DSpace Sword Client</name>
 
     <parent>
         <artifactId>dspace-parent</artifactId>
         <groupId>org.dspace</groupId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
         <relativePath>..</relativePath>
     </parent>
     
@@ -26,11 +26,11 @@
        and releases snapshots into the snapshot repository below.
     -->
     <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword-client</connection>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
         <developerConnection>
-            scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword-client
+            scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword-client</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 
     <issueManagement>

dspace-sword/dspace-sword-api/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-sword</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
       <relativePath>..</relativePath>
     </parent>
 
@@ -27,10 +27,10 @@
        into the snapshot repository below.
     -->
     <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword/dspace-sword-api</connection>
-        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword/dspace-sword-api
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword/dspace-sword-api</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 
     <dependencies>

dspace-sword/dspace-sword-webapp/pom.xml

@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-sword</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -24,9 +24,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword/dspace-sword-webapp</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword/dspace-sword-webapp</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword/dspace-sword-webapp</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <build>
@@ -114,7 +114,7 @@
       <dependency>
          <groupId>org.dspace</groupId>
          <artifactId>dspace-sword-api</artifactId>
-         <version>3.0-SNAPSHOT</version>
+         <version>1.8.1</version>
       </dependency>
    </dependencies>
 

dspace-sword/pom.xml

@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -26,9 +26,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-sword</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
 

dspace-swordv2/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -24,9 +24,9 @@
        into the snapshot repository below.
     -->
     <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-swordv2</connection>
-        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-swordv2</developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-swordv2</url>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 
     <build>

dspace-xmlui/dspace-xmlui-api/pom.xml

@@ -13,15 +13,15 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-xmlui</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
       <relativePath>..</relativePath>
     </parent>
 
     <scm>
-        <connection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-xmlui/dspace-xmlui-api</connection>
-        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-xmlui/dspace-xmlui-api
+        <connection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-xmlui/dspace-xmlui-api/</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 
     <dependencies>

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/SearchItemForm.java

@@ -95,13 +95,22 @@ public class SearchItemForm extends AbstractDSpaceTransformer {
 		{
 			String itemID = String.valueOf(item.getID());
 			Collection owningCollection = item.getOwningCollection();
-			String owning = owningCollection.getMetadata("name");
-			String author = "unkown";
-			DCValue[] dcAuthors = item.getDC("contributor",Item.ANY,Item.ANY);
-			if (dcAuthors != null && dcAuthors.length >= 1)
+			String owning = "unknown";
+			if (owningCollection != null)
+				owning = owningCollection.getMetadata("name");
+			String author = "unknown";
+			DCValue[] dcCreators = item.getDC("creator",Item.ANY,Item.ANY);
+			if (dcCreators != null && dcCreators.length >= 1)
             {
-                author = dcAuthors[0].value;
-            }
+                author = dcCreators[0].value;
+            } else {
+            	// Do a fall back look for contributors
+				DCValue[] dcContributors = item.getDC("contributor",Item.ANY,Item.ANY);
+				if (dcContributors != null && dcContributors.length >= 1)
+	            {
+	                author = dcContributors[0].value;
+	            }
+			}
 			
 			String title = "untitled";
 			DCValue[] dcTitles = item.getDC("title",null,Item.ANY);

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/browseArtifacts/StaticPage.java

@@ -0,0 +1,44 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+
+package org.dspace.app.xmlui.aspect.browseArtifacts;
+
+import org.apache.cocoon.ProcessingException;
+import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
+import org.dspace.app.xmlui.utils.UIException;
+import org.dspace.app.xmlui.wing.WingException;
+import org.dspace.app.xmlui.wing.element.Body;
+import org.dspace.app.xmlui.wing.element.Division;
+import org.dspace.app.xmlui.wing.element.PageMeta;
+import org.dspace.authorize.AuthorizeException;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: peterdietz
+ * Date: 07/12/11
+ * Time: 11:39 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class StaticPage extends AbstractDSpaceTransformer {
+    @Override
+    public void addPageMeta(PageMeta pageMeta) throws SAXException, WingException, UIException, SQLException, IOException, AuthorizeException {
+        pageMeta.addMetadata("title").addContent("StaticPageTitle");
+        pageMeta.addTrail().addContent("StaticTrail");
+    }
+
+    @Override
+    public void addBody(Body body) throws SAXException, WingException, UIException, SQLException, IOException, AuthorizeException, ProcessingException {
+        Division division = body.addDivision("staticpage");
+        division.setHead("StaticPageBodyHead");
+        division.addPara("StaticPageBodyPara");
+    }
+}

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/LoginChooser.java

@@ -146,7 +146,9 @@ public class LoginChooser extends AbstractDSpaceTransformer implements
 		String characters = (String) session
 				.getAttribute(AuthenticationUtil.REQUEST_INTERRUPTED_CHARACTERS);
 
-		if (header != null || message != null || characters != null) {
+		if ( (header != null && header.trim().length() > 0) || 
+			 (message != null && message.trim().length() > 0) ||
+			 (characters != null && characters.trim().length() > 0)) {
 			Division reason = body.addDivision("login-reason");
 
 			if (header != null)

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/DSpaceObjectManager.java

@@ -33,8 +33,6 @@ import org.dspace.handle.HandleManager;
 public class DSpaceObjectManager implements ObjectManager
 {
   
-	/** List of all managed DSpaceObjects */
-	private List<DSpaceObject> dsos = new ArrayList<DSpaceObject>();
 	
     /**
      * Manage the given object, if this manager is unable to manage the object then false must be returned.
@@ -43,32 +41,11 @@ public class DSpaceObjectManager implements ObjectManager
      *            The object to be managed.
      * @return The object identifiers
      */
-    public boolean manageObject(Object object) throws WingException
+    public boolean manageObject(Object object)
     {
-    	// First check that the object is of a type we can manage.
-    	if (object instanceof BrowseItem)
-    	{
-    		dsos.add((BrowseItem) object);
-    		return true;
-    	}
-    	else if (object instanceof Item)
-    	{
-    		dsos.add((Item) object);
-    		return true;
-    	}
-    	else if (object instanceof Collection)
-    	{
-    		dsos.add((Collection) object);
-    		return true;
-    	}
-    	else if (object instanceof Community)
-    	{
-    		dsos.add((Community) object);
-    		return true;
-    	}
-    	
-    	// We are unable to manage this object.
-    	return false;
+    	// Check that the object is of a type we can manage.
+    	return (object instanceof BrowseItem) || (object instanceof Item) || (object instanceof Collection)
+			    || (object instanceof Community);
     }
 	
 	
@@ -114,7 +91,7 @@ public class DSpaceObjectManager implements ObjectManager
 	 * Return a pretty specific string giving a hint to the theme as to what
 	 * type of DSpace object is being refrenced.
 	 */
-	public String getObjectType(Object object) throws WingException 
+	public String getObjectType(Object object)
 	{
 		if (object instanceof Item || object instanceof BrowseItem)
     	{
@@ -146,7 +123,7 @@ public class DSpaceObjectManager implements ObjectManager
 	 */
 	public String getRepositoryURL(Object object) throws WingException
 	{
-		String handlePrefix = ConfigurationManager.getProperty("handel.prefix");
+		String handlePrefix = HandleManager.getPrefix();
 		return "/metadata/internal/repository/"+handlePrefix +"/mets.xml";
 	}
 	

dspace-xmlui/dspace-xmlui-api/src/main/resources/aspects/BrowseArtifacts/sitemap.xmap

@@ -24,6 +24,7 @@ collections / items / and bitstreams.
             <map:transformer name="CommunityRecentSubmissions" src="org.dspace.app.xmlui.aspect.artifactbrowser.CommunityRecentSubmissions"/>
             <map:transformer name="CollectionRecentSubmissions" src="org.dspace.app.xmlui.aspect.artifactbrowser.CollectionRecentSubmissions"/>
             <map:transformer name="ConfigurableBrowse" src="org.dspace.app.xmlui.aspect.artifactbrowser.ConfigurableBrowse"/>
+            <map:transformer name="StaticPage" src="org.dspace.app.xmlui.aspect.browseArtifacts.StaticPage"/>
         </map:transformers>
 
         <map:matchers default="wildcard">
@@ -57,6 +58,11 @@ collections / items / and bitstreams.
                     <map:serialize type="xml"/>
             </map:match>
 
+            <map:match pattern="page/*">
+                <map:transform type="StaticPage"/>
+                <map:serialize type="xml"/>
+            </map:match>
+
             <!-- Browse (by anything) -->
             <map:match pattern="browse">
                     <map:transform type="ConfigurableBrowse"/>
@@ -91,7 +97,6 @@ collections / items / and bitstreams.
 
             </map:match>
 
-
             <!-- Not a URL we care about, so just pass it on. -->
             <map:serialize type="xml"/>
 

dspace-xmlui/dspace-xmlui-webapp/pom.xml

@@ -13,15 +13,15 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-xmlui</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
       <relativePath>..</relativePath>
     </parent>
 
     <scm>
-        <connection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-xmlui/dspace-xmlui-webapp</connection>
-        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-xmlui/dspace-xmlui-webapp
+        <connection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-xmlui/dspace-xmlui-webapp</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 
     <build>

dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl

@@ -34,6 +34,12 @@
 
     <xsl:output indent="yes"/>
 
+    <!--
+        Requested Page URI. Some functions may alter behavior of processing depending if URI matches a pattern.
+        Specifically, adding a static page will need to override the DRI, to directly add content.
+    -->
+    <xsl:variable name="request-uri" select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='request'][@qualifier='URI']"/>
+
     <!--
         The starting point of any XSL processing is matching the root element. In DRI the root element is document,
         which contains a version attribute and three top level elements: body, options, meta (in that order).
@@ -280,6 +286,9 @@
             <xsl:variable name="page_title" select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title']" />
             <title>
                 <xsl:choose>
+                        <xsl:when test="starts-with($request-uri, 'page/about')">
+                                <xsl:text>About This Repository</xsl:text>
+                        </xsl:when>
                         <xsl:when test="not($page_title)">
                                 <xsl:text>  </xsl:text>
                         </xsl:when>
@@ -389,6 +398,9 @@
         <div id="ds-trail-wrapper">
             <ul id="ds-trail">
                 <xsl:choose>
+                    <xsl:when test="starts-with($request-uri, 'page/about')">
+                         <xsl:text>About This Repository</xsl:text>
+                    </xsl:when>
                     <xsl:when test="count(/dri:document/dri:meta/dri:pageMeta/dri:trail) = 0">
                         <li class="ds-trail-link first-link">-</li>
                     </xsl:when>
@@ -561,7 +573,25 @@
                     </p>
                 </div>
             </xsl:if>
-            <xsl:apply-templates />
+
+            <!-- Check for the custom pages -->
+            <xsl:choose>
+                <xsl:when test="starts-with($request-uri, 'page/about')">
+                    <div>
+                        <h1>About This Repository</h1>
+                        <p>To add your own content to this page, edit webapps/xmlui/themes/Mirage/lib/xsl/core/page-structure.xsl and
+                            add your own content to the title, trail, and body. If you wish to add additional pages, you
+                            will need to create an additional xsl:when block and match the request-uri to whatever page
+                            you are adding. Currently, static pages created through altering XSL are only available
+                            under the URI prefix of page/.</p>
+                    </div>
+                </xsl:when>
+                <!-- Otherwise use default handling of body -->
+                <xsl:otherwise>
+                    <xsl:apply-templates />
+                </xsl:otherwise>
+            </xsl:choose>
+
         </div>
     </xsl:template>
 

dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/ORE.xsl

@@ -30,6 +30,8 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xalan="http://xml.apache.org/xalan"
     xmlns:encoder="xalan://java.net.URLEncoder"
+    xmlns:dcterms="http://purl.org/dc/terms/"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     exclude-result-prefixes="xalan encoder i18n dri mets dim  xlink xsl">
 
 
@@ -59,19 +61,37 @@
 
     <!-- Iterate over the links in the ORE resource maps and make them into bitstream references in the file section -->
     <xsl:template match="atom:link[@rel='http://www.openarchives.org/ore/terms/aggregates']">
-        <tr>
-            <xsl:attribute name="class">
-                <xsl:text>ds-table-row </xsl:text>
-                <xsl:if test="(position() mod 2 = 0)">even </xsl:if>
-                <xsl:if test="(position() mod 2 = 1)">odd </xsl:if>
-            </xsl:attribute>
-            <td>
-                <a>
-                    <xsl:attribute name="href">
-                        <xsl:value-of select="@href"/>
-                    </xsl:attribute>
-                    <xsl:attribute name="title">
+        <xsl:variable name="link_href" select="@href"/>
+        <xsl:if test="/atom:entry/oreatom:triples/rdf:Description[@rdf:about=$link_href][dcterms:description='ORIGINAL']
+                    or not(/atom:entry/oreatom:triples/rdf:Description[@rdf:about=$link_href])">
+            <tr>
+                <xsl:attribute name="class">
+                    <xsl:text>ds-table-row </xsl:text>
+                    <xsl:if test="(position() mod 2 = 0)">even </xsl:if>
+                    <xsl:if test="(position() mod 2 = 1)">odd </xsl:if>
+                </xsl:attribute>
+                <td>
+                    <a>
+                        <xsl:attribute name="href">
+                            <xsl:value-of select="@href"/>
+                        </xsl:attribute>
+                        <xsl:attribute name="title">
+                            <xsl:choose>
+                                <xsl:when test="@title">
+                                    <xsl:value-of select="@title"/>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="@href"/>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </xsl:attribute>
                         <xsl:choose>
+                            <xsl:when test="string-length(@title) > 50">
+                                <xsl:variable name="title_length" select="string-length(@title)"/>
+                                <xsl:value-of select="substring(@title,1,15)"/>
+                                <xsl:text> ... </xsl:text>
+                                <xsl:value-of select="substring(@title,$title_length - 25,$title_length)"/>
+                            </xsl:when>
                             <xsl:when test="@title">
                                 <xsl:value-of select="@title"/>
                             </xsl:when>
@@ -79,63 +99,49 @@
                                 <xsl:value-of select="@href"/>
                             </xsl:otherwise>
                         </xsl:choose>
-                    </xsl:attribute>
+                    </a>
+                </td>
+                <!-- File size always comes in bytes and thus needs conversion -->
+                <td>
                     <xsl:choose>
-                        <xsl:when test="string-length(@title) > 50">
-                            <xsl:variable name="title_length" select="string-length(@title)"/>
-                            <xsl:value-of select="substring(@title,1,15)"/>
-                            <xsl:text> ... </xsl:text>
-                            <xsl:value-of select="substring(@title,$title_length - 25,$title_length)"/>
+                        <xsl:when test="@length &lt; 1000">
+                            <xsl:value-of select="@length"/>
+                            <i18n:text>xmlui.dri2xhtml.METS-1.0.size-bytes</i18n:text>
                         </xsl:when>
-                        <xsl:when test="@title">
-                            <xsl:value-of select="@title"/>
+                        <xsl:when test="@length &lt; 1000000">
+                            <xsl:value-of select="substring(string(@length div 1000),1,5)"/>
+                            <i18n:text>xmlui.dri2xhtml.METS-1.0.size-kilobytes</i18n:text>
                         </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="@href"/>
-                        </xsl:otherwise>
+                        <xsl:when test="@length &lt; 1000000001">
+                            <xsl:value-of select="substring(string(@length div 1000000),1,5)"/>
+                            <i18n:text>xmlui.dri2xhtml.METS-1.0.size-megabytes</i18n:text>
+                        </xsl:when>
+                        <xsl:when test="@length &gt; 1000000000">
+                            <xsl:value-of select="substring(string(@length div 1000000000),1,5)"/>
+                            <i18n:text>xmlui.dri2xhtml.METS-1.0.size-gigabytes</i18n:text>
+                        </xsl:when>
+                        <!-- When one isn't available -->
+                        <xsl:otherwise><xsl:text>n/a</xsl:text></xsl:otherwise>
                     </xsl:choose>
-                </a>
-            </td>
-            <!-- File size always comes in bytes and thus needs conversion -->
-            <td>
-                <xsl:choose>
-                    <xsl:when test="@length &lt; 1000">
-                        <xsl:value-of select="@length"/>
-                        <i18n:text>xmlui.dri2xhtml.METS-1.0.size-bytes</i18n:text>
-                    </xsl:when>
-                    <xsl:when test="@length &lt; 1000000">
-                        <xsl:value-of select="substring(string(@length div 1000),1,5)"/>
-                        <i18n:text>xmlui.dri2xhtml.METS-1.0.size-kilobytes</i18n:text>
-                    </xsl:when>
-                    <xsl:when test="@length &lt; 1000000001">
-                        <xsl:value-of select="substring(string(@length div 1000000),1,5)"/>
-                        <i18n:text>xmlui.dri2xhtml.METS-1.0.size-megabytes</i18n:text>
-                    </xsl:when>
-                    <xsl:when test="@length &gt; 1000000000">
-                        <xsl:value-of select="substring(string(@length div 1000000000),1,5)"/>
-                        <i18n:text>xmlui.dri2xhtml.METS-1.0.size-gigabytes</i18n:text>
-                    </xsl:when>
-                    <!-- When one isn't available -->
-                    <xsl:otherwise><xsl:text>n/a</xsl:text></xsl:otherwise>
-                </xsl:choose>
-            </td>
-            <!-- Currently format carries forward the mime type. In the original DSpace, this
-                would get resolved to an application via the Bitstream Registry, but we are
-                constrained by the capabilities of METS and can't really pass that info through. -->
-            <td>
-                <xsl:value-of select="substring-before(@type,'/')"/>
-                <xsl:text>/</xsl:text>
-                <xsl:value-of select="substring-after(@type,'/')"/>
-            </td>
-            <td>
-                <a>
-                    <xsl:attribute name="href">
-                        <xsl:value-of select="@href"/>
-                    </xsl:attribute>
-                    <i18n:text>xmlui.dri2xhtml.METS-1.0.item-files-viewOpen</i18n:text>
-                </a>
-            </td>
-        </tr>
+                </td>
+                <!-- Currently format carries forward the mime type. In the original DSpace, this
+                    would get resolved to an application via the Bitstream Registry, but we are
+                    constrained by the capabilities of METS and can't really pass that info through. -->
+                <td>
+                    <xsl:value-of select="substring-before(@type,'/')"/>
+                    <xsl:text>/</xsl:text>
+                    <xsl:value-of select="substring-after(@type,'/')"/>
+                </td>
+                <td>
+                    <a>
+                        <xsl:attribute name="href">
+                            <xsl:value-of select="@href"/>
+                        </xsl:attribute>
+                        <i18n:text>xmlui.dri2xhtml.METS-1.0.item-files-viewOpen</i18n:text>
+                    </a>
+                </td>
+            </tr>
+        </xsl:if>
     </xsl:template>
 
 </xsl:stylesheet>

dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml-alt/core/page-structure.xsl

@@ -33,6 +33,12 @@
 
     <xsl:output indent="yes"/>
 
+    <!--
+        Requested Page URI. Some functions may alter behavior of processing depending if URI matches a pattern.
+        Specifically, adding a static page will need to override the DRI, to directly add content.
+    -->
+    <xsl:variable name="request-uri" select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='request'][@qualifier='URI']"/>
+
     <!--
         The starting point of any XSL processing is matching the root element. In DRI the root element is document,
         which contains a version attribute and three top level elements: body, options, meta (in that order).
@@ -232,6 +238,9 @@
             <xsl:variable name="page_title" select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title']" />
             <title>
                 <xsl:choose>
+                        <xsl:when test="starts-with($request-uri, 'page/about')">
+                                <xsl:text>About This Repository</xsl:text>
+                        </xsl:when>
                         <xsl:when test="not($page_title)">
                                 <xsl:text>  </xsl:text>
                         </xsl:when>
@@ -284,6 +293,9 @@
 
             <ul id="ds-trail">
                 <xsl:choose>
+                        <xsl:when test="starts-with($request-uri, 'page/about')">
+                            <xsl:text>About This Repository</xsl:text>
+                        </xsl:when>
                         <xsl:when test="count(/dri:document/dri:meta/dri:pageMeta/dri:trail) = 0">
                                 <li class="ds-trail-link first-link"> - </li>
                         </xsl:when>
@@ -500,7 +512,25 @@
                     </p>
                 </div>
             </xsl:if>
-            <xsl:apply-templates />
+
+            <!-- Check for the custom pages -->
+            <xsl:choose>
+                <xsl:when test="starts-with($request-uri, 'page/about')">
+                    <div>
+                        <h1>About This Repository</h1>
+                        <p>To add your own content to this page, edit webapps/xmlui/themes/dri2xhtml-alt/core/page-structure.xsl and
+                            add your own content to the title, trail, and body. If you wish to add additional pages, you
+                            will need to create an additional xsl:when block and match the request-uri to whatever page
+                            you are adding. Currently, static pages created through altering XSL are only available
+                            under the URI prefix of page/.</p>
+                    </div>
+                </xsl:when>
+                <!-- Otherwise use default handling of body -->
+                <xsl:otherwise>
+                    <xsl:apply-templates />
+                </xsl:otherwise>
+            </xsl:choose>
+
         </div>
     </xsl:template>
 

dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/dri2xhtml/structural.xsl

@@ -46,6 +46,12 @@
         "[context-path]/themes/[theme-dir]/".
     -->
     <xsl:variable name="theme-path" select="concat($context-path,'/themes/',/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='theme'][@qualifier='path'])"/>
+
+    <!--
+        Requested Page URI. Some functions may alter behavior of processing depending if URI matches a pattern.
+        Specifically, adding a static page will need to override the DRI, to directly add content.
+    -->
+    <xsl:variable name="request-uri" select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='request'][@qualifier='URI']"/>
     
     <!--
     This style sheet will be written in several stages:
@@ -266,7 +272,10 @@
             <xsl:variable name="page_title" select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title']" />
             <title>
                 <xsl:choose>
-                        <xsl:when test="not($page_title) or (string-length($page_title) &lt; 1)">
+                    <xsl:when test="starts-with($request-uri, 'page/about')">
+                        <xsl:text>About This Repository</xsl:text>
+                    </xsl:when>
+                    <xsl:when test="not($page_title) or (string-length($page_title) &lt; 1)">
                                 <i18n:text>xmlui.dri2xhtml.METS-1.0.no-title</i18n:text>
                         </xsl:when>
                         <xsl:otherwise>
@@ -318,6 +327,9 @@
             
             <ul id="ds-trail">
                 <xsl:choose>
+                        <xsl:when test="starts-with($request-uri, 'page/about')">
+                            <xsl:text>About This Repository</xsl:text>
+                        </xsl:when>
                         <xsl:when test="count(/dri:document/dri:meta/dri:pageMeta/dri:trail) = 0">
                                 <li class="ds-trail-link first-link"> - </li>
                         </xsl:when>
@@ -535,7 +547,27 @@
                     </p>
                 </div>
             </xsl:if>
-            <xsl:apply-templates />
+
+            <!-- Check for the custom pages -->
+
+            <xsl:choose>
+                <xsl:when test="starts-with($request-uri, 'page/about')">
+                    <div>
+                        <h1>About This Repository</h1>
+                        <p>To add your own content to this page, edit webapps/xmlui/themes/dri2xhtml/structural.xsl and
+                            add your own content to the title, trail, and body. If you wish to add additional pages, you
+                            will need to create an additional xsl:when block and match the request-uri to whatever page
+                            you are adding. Currently, static pages created through altering XSL are only available
+                            under the URI prefix of page/.</p>
+                    </div>
+                </xsl:when>
+                <!-- Otherwise use default handling of body -->
+                <xsl:otherwise>
+                    <xsl:apply-templates />
+                </xsl:otherwise>
+            </xsl:choose>
+
+
               	<xsl:if test="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='sfx'][@qualifier='server']">
 	 			<a>
                    <xsl:attribute name="href">

dspace-xmlui/dspace-xmlui-wing/pom.xml

@@ -10,15 +10,15 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-xmlui</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
       <relativePath>..</relativePath>
     </parent>
 
     <scm>
-        <connection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-xmlui/dspace-xmlui-wing</connection>
-        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-xmlui/dspace-xmlui-wing
+        <connection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1
         </developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-xmlui/dspace-xmlui-wing</url>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 
     <dependencies>

dspace-xmlui/pom.xml

@@ -12,7 +12,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -22,9 +22,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-xmlui</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-xmlui</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-xmlui</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
    
    <modules>

dspace/modules/jspui/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.dspace</groupId>
 		<artifactId>modules</artifactId>
-		<version>3.0-SNAPSHOT</version>
+		<version>1.8.1</version>
         <relativePath>..</relativePath>
 	</parent>
 
@@ -75,9 +75,9 @@
 	</profiles>
 
 	<scm>
-		<connection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/jspui</connection>
-		<developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/jspui</developerConnection>
-		<url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/jspui</url>
+		<connection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+		<developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+		<url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
 	</scm>
 
 	<build>

dspace/modules/lni/pom.xml

@@ -12,14 +12,14 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
         <relativePath>..</relativePath>
    </parent>
 
    <scm>
-      <connection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/lni</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/lni</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/lni</url>
+      <connection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <build>

dspace/modules/oai/pom.xml

@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
         <relativePath>..</relativePath>
    </parent>
 
@@ -26,9 +26,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/oai</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/oai</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/oai</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <build>

dspace/modules/pom.xml

@@ -10,14 +10,14 @@
 	<parent>
 		<groupId>org.dspace</groupId>
 		<artifactId>dspace-parent</artifactId>
-		<version>3.0-SNAPSHOT</version>
+		<version>1.8.1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
     <scm>
-      <connection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules</url>
+      <connection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
     
     <!-- 

dspace/modules/solr/pom.xml

@@ -2,7 +2,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.dspace.modules</groupId>
    <artifactId>solr</artifactId>
-   <version>3.0-SNAPSHOT</version>
+   <version>1.8.1</version>
    <packaging>war</packaging>
    <name>DSpace SOLR :: Web Application</name>
    <description>
@@ -26,9 +26,9 @@
       and releases snapshots into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/solr</connection>
-      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/solr</developerConnection>
-      <url>http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/solr</url>
+      <connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/tags/dspace-1.8.1</developerConnection>
+      <url>http://dspace.svn.sourceforge.net/svnroot/dspace/tags/dspace-1.8.1</url>
    </scm>
 
    <build>

dspace/modules/sword/pom.xml

@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -26,9 +26,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/sword</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/sword</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/sword</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <build>

dspace/modules/swordv2/pom.xml

@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -26,9 +26,9 @@
       into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/swordv2</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/swordv2</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/swordv2</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <build>

dspace/modules/xmlui/pom.xml

@@ -13,14 +13,14 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <version>1.8.1</version>
       <relativePath>..</relativePath>
    </parent>
 
    <scm>
-      <connection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/xmlui</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/xmlui</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace/modules/xmlui</url>
+      <connection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
    </scm>
 
    <build>
@@ -145,32 +145,32 @@
       <dependency>
          <groupId>org.dspace</groupId>
          <artifactId>dspace-discovery-solr</artifactId>
-         <version>3.0-SNAPSHOT</version>
+         <version>1.8.1</version>
       </dependency>
 
       <dependency>
          <groupId>org.dspace</groupId>
          <artifactId>dspace-discovery-xmlui-api</artifactId>
-         <version>3.0-SNAPSHOT</version>
+         <version>1.8.1</version>
       </dependency>
 
       <dependency>
          <groupId>org.dspace</groupId>
          <artifactId>dspace-discovery-xmlui-webapp</artifactId>
-         <version>3.0-SNAPSHOT</version>
+         <version>1.8.1</version>
          <type>war</type>
       </dependency>
 
         <dependency>
          <groupId>org.dspace</groupId>
          <artifactId>dspace-sword-client-xmlui-api</artifactId>
-         <version>3.0-SNAPSHOT</version>
+         <version>1.8.1</version>
       </dependency>
 
        <dependency>
          <groupId>org.dspace</groupId>
          <artifactId>dspace-sword-client-xmlui-webapp</artifactId>
-         <version>3.0-SNAPSHOT</version>
+         <version>1.8.1</version>
          <type>war</type>
       </dependency>
 

dspace/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.8.1</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -26,9 +26,9 @@
          into the snapshot repository below.
     -->
     <scm>
-        <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace</connection>
-        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace</developerConnection>
-        <url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace</url>
+        <connection>scm:svn:http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</connection>
+        <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/tags/dspace-1.8.1</developerConnection>
+        <url>http://scm.dspace.org/svn/repo/tags/dspace-1.8.1</url>
     </scm>
 
     <properties>

pom.xml

@@ -3,7 +3,7 @@
    <groupId>org.dspace</groupId>
    <artifactId>dspace-parent</artifactId>
    <packaging>pom</packaging>
-   <version>3.0-SNAPSHOT</version>
+   <version>1.8.1</version>
    <name>DSpace Parent Project</name>
    <url>http://projects.dspace.org</url>
 
@@ -1066,9 +1066,9 @@
       snapshots into the snapshot repository below.
    -->
    <scm>
-      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk</connection>
-      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk</developerConnection>
-      <url>http://scm.dspace.org/svn/repo/dspace/trunk</url>
+      <connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/tags/dspace-1.8.1</connection>
+      <developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/tags/dspace-1.8.1</developerConnection>
+      <url>http://scm.dspace.org/svn/repo/dspace/tags/dspace-1.8.1</url>
    </scm>
 
 </project>