DS-2013 implement ItemDAOOracle to fix thumbnails in browse

logged scopeId and scopeType properly.

.gitignore

@@ -22,6 +22,6 @@ nbactions.xml
 nb-configuration.xml
 META-INF/
 
-## Ignore all *.properties file, EXCEPT build.properties (the default)
-*.properties
-!build.properties
+## Ignore all *.properties file in root folder, EXCEPT build.properties (the default)
+/*.properties
+!/build.properties

.travis.yml

@@ -0,0 +1 @@
+language: java

dspace-api/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>4.0-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -423,6 +423,12 @@
             <version>0.18.6</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.coverity.security</groupId>
+            <artifactId>coverity-escapers</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+ 
         <!--  Gson: Java to Json conversion -->
         <dependency>
             <groupId>com.google.code.gson</groupId>

dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java

@@ -612,7 +612,7 @@ public class LDAPAuthentication
 
     /*
      * Add authenticated users to the group defined in dspace.cfg by
-     * the ldap.login.groupmap.* key.
+     * the authentication-ldap.login.groupmap.* key.
      */
     private void assignGroupsBasedOnLdapDn(String dn, Context context)
     {
@@ -644,7 +644,7 @@ public class LDAPAuthentication
                             // The group does not exist
                             log.warn(LogManager.getHeader(context,
                                     "ldap_assignGroupsBasedOnLdapDn",
-                                    "Group defined in ldap.login.groupmap." + i + " does not exist :: " + dspaceGroupName));
+                                    "Group defined in authentication-ldap.login.groupmap." + i + " does not exist :: " + dspaceGroupName));
                         }
                     }
                     catch (AuthorizeException ae)
@@ -657,7 +657,7 @@ public class LDAPAuthentication
                     }
                 }
 
-                groupMap = ConfigurationManager.getProperty("ldap.login.groupmap." + ++i);
+                groupMap = ConfigurationManager.getProperty("authentication-ldap", "login.groupmap." + ++i);
             }
         }
     }

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

@@ -372,6 +372,9 @@ public class SolrBrowseCreateDAO implements BrowseCreateDAO,
     public void insertIndex(String table, int itemID, Map sortCols)
             throws BrowseException
     {
+		// this is required to be sure that communities2item will be cleaned
+		// after the switch to SOLRBrowseDAOs. See DS-1619
+    	dbCreateDAO.deleteCommunityMappings(itemID);
     }
 
     @Override

dspace-api/src/main/java/org/dspace/content/dao/ItemDAOOracle.java

@@ -9,25 +9,107 @@ package org.dspace.content.dao;
 
 import org.dspace.core.Context;
 import org.dspace.content.Bitstream;
+import org.dspace.storage.rdbms.DatabaseManager;
+import org.dspace.storage.rdbms.TableRowIterator;
+import org.dspace.storage.rdbms.TableRow;
 
 import java.sql.SQLException;
 
 public class ItemDAOOracle extends ItemDAO
-{
+{		
+		private static final String selectPrimaryBitstreamID =
+            "SELECT bundle.primary_bitstream_id FROM item2bundle, bundle " +
+            "WHERE item2bundle.item_id=? AND item2bundle.bundle_id=bundle.bundle_id AND bundle.name=?";
+
+    private static final String selectFirstBitstreamID =
+        "SELECT bundle2bitstream.bitstream_id FROM item2bundle, bundle, bundle2bitstream " +
+        "WHERE item2bundle.item_id=? AND item2bundle.bundle_id=bundle.bundle_id AND bundle.name=? " +
+        "AND bundle.bundle_id=bundle2bitstream.bundle_id";
+    
+		private static final String selectNamedBitstreamID =
+        "SELECT bitstream.bitstream_id FROM item2bundle, bundle, bundle2bitstream, bitstream " +
+        "WHERE item2bundle.item_id=? AND item2bundle.bundle_id=bundle.bundle_id AND bundle.name=? " +
+        "AND bundle.bundle_id=bundle2bitstream.bundle_id AND bundle2bitstream.bitstream_id=bitstream.bitstream_id " +
+        "AND bitstream.name=?";
+    
     ItemDAOOracle(Context ctx)
     {
         super(ctx);
     }
 
-    public Bitstream getPrimaryBitstream(int itemId, String bundleName) throws SQLException {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    public Bitstream getPrimaryBitstream(int itemId, String bundleName) throws SQLException
+    {
+        TableRowIterator tri = null;
+
+        try
+        {
+            tri = DatabaseManager.query(context, selectPrimaryBitstreamID, itemId, bundleName);
+
+            if (tri.hasNext())
+            {
+                TableRow row = tri.next();
+                int bid = row.getIntColumn("primary_bitstream_id");
+                return Bitstream.find(context, bid);
+            }
+        }        
+        finally
+        {
+            if (tri != null)
+            {
+                tri.close();
+            }
+        }
+
+        return null;
     }
 
-    public Bitstream getFirstBitstream(int itemId, String bundleName) throws SQLException {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    public Bitstream getFirstBitstream(int itemId, String bundleName) throws SQLException
+    {
+        TableRowIterator tri = null;
+
+        try
+        {
+            tri = DatabaseManager.query(context, selectFirstBitstreamID, itemId, bundleName);
+            if (tri.hasNext())
+            {
+                TableRow row = tri.next();
+                int bid = row.getIntColumn("bitstream_id");
+                return Bitstream.find(context, bid);
+            }
+        }
+        finally
+        {
+            if (tri != null)
+            {
+                tri.close();
+            }
+        }
+
+        return null;
     }
 
-    public Bitstream getNamedBitstream(int itemId, String bundleName, String fileName) throws SQLException {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    public Bitstream getNamedBitstream(int itemId, String bundleName, String fileName) throws SQLException
+    {
+        TableRowIterator tri = null;
+
+        try
+        {
+            tri = DatabaseManager.query(context, selectNamedBitstreamID, itemId, bundleName, fileName);
+            if (tri.hasNext())
+            {
+                TableRow row = tri.next();
+                int bid = row.getIntColumn("bitstream_id");
+                return Bitstream.find(context, bid);
+            }
+        }
+        finally
+        {
+            if (tri != null)
+            {
+                tri.close();
+            }
+        }
+
+        return null;
     }
 }

dspace-api/src/main/java/org/dspace/core/Utils.java

@@ -26,7 +26,7 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.text.SimpleDateFormat;
 import java.text.ParseException;
-
+import com.coverity.security.Escape;
 import org.apache.log4j.Logger;
 
 /**
@@ -280,21 +280,7 @@ public final class Utils
      */
     public static String addEntities(String value)
     {
-        if (value==null || value.length() == 0)
-        {
-            return value;
-        }
-        
-        value = value.replaceAll("&", "&");
-        value = value.replaceAll("\"", """);
-
-        // actually, ' is an XML entity, not in HTML.
-        // that's why it's commented out.
-        // value = value.replaceAll("'", "'");
-        value = value.replaceAll("<", "&lt;");
-        value = value.replaceAll(">", "&gt;");
-
-        return value;
+        return Escape.html(value);
     }
 
     /**

dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java

@@ -13,6 +13,7 @@ import org.apache.commons.collections.Transformer;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.input.AutoCloseInputStream;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateFormatUtils;
@@ -1198,7 +1199,6 @@ public class SolrServiceImpl implements SearchService, IndexingService {
         log.debug("  Added Grouping");
 
 
-        Vector<InputStreamReader> readers = new Vector<InputStreamReader>();
 
         try {
             // now get full text of any bitstreams in the TEXT bundle
@@ -1216,17 +1216,12 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                     for (Bitstream myBitstream : myBitstreams)
                     {
                         try {
-                            InputStreamReader is = new InputStreamReader(
-                                    myBitstream.retrieve()); // get input
-                            readers.add(is);
 
-                            // Add each InputStream to the Indexed Document
-                            String value = IOUtils.toString(is);
-                            doc.addField("fulltext", value);
+                            doc.addField("fulltext", new AutoCloseInputStream(myBitstream.retrieve()));
 
                             if(hitHighlightingFields.contains("*") || hitHighlightingFields.contains("fulltext"))
                             {
-                                doc.addField("fulltext_hl", value);
+                                doc.addField("fulltext_hl", new AutoCloseInputStream(myBitstream.retrieve()));
                             }
 
                             log.debug("  Added BitStream: "
@@ -1247,16 +1242,6 @@ public class SolrServiceImpl implements SearchService, IndexingService {
         {
             log.error(e.getMessage(), e);
         }
-        finally {
-            Iterator<InputStreamReader> itr = readers.iterator();
-            while (itr.hasNext()) {
-                InputStreamReader reader = itr.next();
-                if (reader != null) {
-                    reader.close();
-                }
-            }
-            log.debug("closed " + readers.size() + " readers");
-        }
 
         //Do any additional indexing, depends on the plugins
         List<SolrServiceIndexPlugin> solrServiceIndexPlugins = new DSpace().getServiceManager().getServicesByType(SolrServiceIndexPlugin.class);
@@ -1275,6 +1260,8 @@ public class SolrServiceImpl implements SearchService, IndexingService {
         } 
     }
 
+
+
     /**
      * Create Lucene document with all the shared fields initialized.
      *

dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java

@@ -29,6 +29,8 @@ import java.util.TimeZone;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 
+import ORG.oclc.oai.harvester2.verb.*;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
@@ -63,12 +65,6 @@ import org.jdom.input.DOMBuilder;
 import org.jdom.output.XMLOutputter;
 import org.xml.sax.SAXException;
 
-import ORG.oclc.oai.harvester2.verb.GetRecord;
-import ORG.oclc.oai.harvester2.verb.Identify;
-import ORG.oclc.oai.harvester2.verb.ListMetadataFormats;
-import ORG.oclc.oai.harvester2.verb.ListRecords;
-import ORG.oclc.oai.harvester2.verb.ListSets;
-
 
 /**
  * This class handles OAI harvesting of externally located records into this repository. 
@@ -945,29 +941,21 @@ public class OAIHarvester {
     	try {
             //If we do not want to harvest from one set, then skip this.
     		if(!"all".equals(oaiSetId)){
-                ListSets ls = new ListSets(oaiSource);
+                ListIdentifiers ls = new ListIdentifiers(oaiSource, null, null, oaiSetId, DMDOAIPrefix);
 
                 // The only error we can really get here is "noSetHierarchy"
                 if (ls.getErrors() != null && ls.getErrors().getLength() > 0) {
                     for (int i=0; i<ls.getErrors().getLength(); i++) {
                         String errorCode = ls.getErrors().item(i).getAttributes().getNamedItem("code").getTextContent();
-                        errorSet.add(errorCode);
+                        errorSet.add(OAI_SET_ERROR + ": The OAI server does not have a set with the specified setSpec (" + errorCode + ")");
                     }
                 }
                 else {
                     // Drilling down to /OAI-PMH/ListSets/set
                     Document reply = db.build(ls.getDocument());
                     Element root = reply.getRootElement();
-                    List<Element> sets= root.getChild("ListSets",OAI_NS).getChildren("set",OAI_NS);
-
-                    for (Element set : sets)
-                    {
-                        String setSpec = set.getChildText("setSpec", OAI_NS);
-                        if (setSpec.equals(oaiSetId)) {
-                            foundSet = true;
-                            break;
-                        }
-                    }
+                    //Check if we can find items, if so this indicates that we have children and our sets exist
+                    foundSet = 0 < root.getChild("ListIdentifiers",OAI_NS).getChildren().size();
 
                     if (!foundSet) {
                         errorSet.add(OAI_SET_ERROR + ": The OAI server does not have a set with the specified setSpec");

dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java

@@ -545,7 +545,7 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider {
     protected String getCanonical(Item item)
     {
         String canonical = item.getHandle();
-        if( canonical.lastIndexOf(DOT)!=-1)
+        if( canonical.matches(".*/.*\\.\\d+") && canonical.lastIndexOf(DOT)!=-1)
         {
             canonical =  canonical.substring(0, canonical.lastIndexOf(DOT));
         }
@@ -556,7 +556,7 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider {
     protected String getCanonical(String identifier)
     {
         String canonical = identifier;
-        if( canonical.lastIndexOf(DOT)!=-1)
+        if( canonical.matches(".*/.*\\.\\d+") && canonical.lastIndexOf(DOT)!=-1)
         {
             canonical =  canonical.substring(0, canonical.lastIndexOf(DOT));
         }

dspace-api/src/main/java/org/dspace/statistics/SolrLogger.java

@@ -365,8 +365,8 @@ public class SolrLogger
             }
             //Store the scope
             if(scope != null){
-                solrDoc.addField("scopeId", scope.getType());
-                solrDoc.addField("scopeType", scope.getID());
+                solrDoc.addField("scopeId", scope.getID());
+                solrDoc.addField("scopeType", scope.getType());
             }
 
             if(rpp != -1){

dspace-api/src/main/java/org/dspace/submit/step/DescribeStep.java

@@ -117,6 +117,10 @@ public class DescribeStep extends AbstractProcessingStep
             throws ServletException, IOException, SQLException,
             AuthorizeException
     {
+        if(!request.getParameterNames().hasMoreElements()){
+            //In case of an empty request do NOT just remove all metadata, just return to the submission page
+            return STATUS_MORE_INPUT_REQUESTED;
+        }
         // check what submit button was pressed in User Interface
         String buttonPressed = Util.getSubmitButton(request, NEXT_BUTTON);
 

dspace-jspui/pom.xml

@@ -13,7 +13,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>4.0-SNAPSHOT</version>
+      <version>3.3-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 

dspace-jspui/src/main/java/org/dspace/app/webui/servlet/LDAPServlet.java

@@ -45,8 +45,8 @@ public class LDAPServlet extends DSpaceServlet
         HttpServletResponse response)
         throws ServletException, IOException, SQLException, AuthorizeException
     {
-        // check if ldap is enables and forward to the correct login form
-        boolean ldap_enabled = ConfigurationManager.getBooleanProperty("ldap.enable");
+        // check if ldap is enables and forward to the correct login form        
+        boolean ldap_enabled = ConfigurationManager.getBooleanProperty("authentication-ldap", "enable");
         if (ldap_enabled)
         {
             JSPManager.showJSP(request, response, "/login/ldap.jsp");
@@ -104,4 +104,4 @@ public class LDAPServlet extends DSpaceServlet
                 "netid=" + netid + ", result=" + String.valueOf(status)));
         JSPManager.showJSP(request, response, jsp);
 	}
-}
+}

dspace-jspui/src/main/webapp/WEB-INF/web.xml

@@ -74,9 +74,6 @@
   <filter-mapping>
         <filter-name>dspace.request</filter-name>
         <url-pattern>/*</url-pattern>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>FORWARD</dispatcher>
-        <dispatcher>INCLUDE</dispatcher>
   </filter-mapping>
     
   <filter-mapping>

dspace-jspui/src/main/webapp/dspace-admin/eperson-browse.jsp

@@ -27,6 +27,7 @@
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 
 <%@ page import="org.dspace.eperson.EPerson" %>
+<%@ page import="org.dspace.core.Utils" %>
 
 <%
     EPerson[] epeople =
@@ -115,10 +116,10 @@
                     <%= (e.getEmail() == null ? "" : e.getEmail()) %>
                 </td>
                 <td headers="t3" class="<%= row %>RowOddCol">
-                    <%= (e.getLastName() == null ? "" : e.getLastName()) %>
+                    <%= (e.getLastName() == null ? "" : Utils.addEntities(e.getLastName())) %>
                 </td>
                 <td headers="t4" class="<%= row %>RowEvenCol">
-                    <%= (e.getFirstName() == null ? "" : e.getFirstName()) %>
+                    <%= (e.getFirstName() == null ? "" : Utils.addEntities(e.getFirstName())) %>
                 </td>
                 <td headers="t5" class="<%= row %>RowOddCol" align="center">
                     <%= e.canLogIn() ? "yes" : "no" %>
@@ -130,7 +131,7 @@
                     <%= e.getSelfRegistered() ? "yes" : "no" %>
                 </td>
                 <td headers="t8" class="<%= row %>RowEvenCol">
-                    <%= (e.getMetadata("phone") == null ? "" : e.getMetadata("phone")) %>
+                    <%= (e.getMetadata("phone") == null ? "" : Utils.addEntities(e.getMetadata("phone"))) %>
                 </td>
                 <td headers="t9" class="<%= row %>RowOddCol">
                     <input type="hidden" name="eperson_id" value="<%= e.getID() %>"/>

dspace-jspui/src/main/webapp/dspace-admin/eperson-confirm-delete.jsp

@@ -20,6 +20,7 @@
     prefix="fmt" %>
 
 <%@ page import="org.dspace.eperson.EPerson" %>
+<%@ page import="org.dspace.core.Utils" %>
 
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 
@@ -32,9 +33,9 @@
                parenttitlekey="jsp.administer"
                parentlink="/dspace-admin">
 
-    <%-- <h1>Delete e-person: <%= eperson.getFullName() %> (<%= eperson.getEmail() %>)</h1> --%>
+    <%-- <h1>Delete e-person: <%= Utils.addEntities(eperson.getFullName()) %> (<%= eperson.getEmail() %>)</h1> --%>
     <h1><fmt:message key="jsp.dspace-admin.eperson-confirm-delete.heading">
-        <fmt:param><%= eperson.getFullName() %></fmt:param>
+        <fmt:param><%= Utils.addEntities(eperson.getFullName()) %></fmt:param>
         <fmt:param><%= eperson.getEmail() %></fmt:param>
     </fmt:message></h1>
     

dspace-jspui/src/main/webapp/dspace-admin/eperson-deletion-error.jsp

@@ -28,11 +28,12 @@
 <%@ page import="org.dspace.eperson.EPerson" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Iterator" %>
+<%@ page import="org.dspace.core.Utils" %>
 
 <%
     EPerson eperson = (EPerson) request.getAttribute("eperson");
     List tableList = (List) request.getAttribute("tableList");
-    String fullName = eperson.getFullName();
+    String fullName = Utils.addEntities(eperson.getFullName());
     Iterator tableIt = tableList.iterator();
   
 %>

dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp

@@ -28,6 +28,7 @@
 <%@ page import="org.dspace.eperson.EPerson" %>
 <%@ page import="org.dspace.eperson.Group" %>
 <%@ page import="org.dspace.content.WorkspaceItem" %>
+<%@ page import="org.dspace.core.Utils" %>
 
 <%
     // get item and group out of the request
@@ -75,7 +76,7 @@
 <br/><br/>
 <strong><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.authorheader"/></strong>:
 <br/>
-<a href="mailto:<%= submitter.getEmail() %>"><%= submitter.getFullName() %></a>
+<a href="mailto:<%= submitter.getEmail() %>"><%= Utils.addEntities(submitter.getFullName()) %></a>
 <br/><br/>
 <strong><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.supervisorgroupheader"/></strong>:
 <br/>

dspace-jspui/src/main/webapp/dspace-admin/supervise-link.jsp

@@ -28,6 +28,7 @@
 <%@ page import="org.dspace.eperson.EPerson" %>
 <%@ page import="org.dspace.eperson.Group" %>
 <%@ page import="org.dspace.eperson.Supervisor" %>
+<%@ page import="org.dspace.core.Utils" %>
 
 <%
     // get objects from request
@@ -109,7 +110,7 @@
                         <%= workspaceItems[i].getID() %>
                     </td>
                     <td class="<%= row %>RowEvenCol">
-                        <a href="mailto:<%= submitter.getEmail() %>"><%= submitter.getFullName() %></a>
+                        <a href="mailto:<%= submitter.getEmail() %>"><%= Utils.addEntities(submitter.getFullName()) %></a>
                     </td>
                     <td class="<%= row %>RowOddCol">
 <%

dspace-jspui/src/main/webapp/dspace-admin/supervise-list.jsp

@@ -25,6 +25,7 @@
 <%@ page import="org.dspace.content.SupervisedItem" %>
 <%@ page import="org.dspace.eperson.EPerson" %>
 <%@ page import="org.dspace.eperson.Group" %>
+<%@ page import="org.dspace.core.Utils" %>
 
 <%
     // get the object array out of the request
@@ -97,7 +98,7 @@
             <%= supervisors[j].getName() %>
         </td>
         <td class="<%= row %>RowOddCol">
-            <a href="mailto:<%= submitter.getEmail() %>"><%= submitter.getFullName() %></a>
+            <a href="mailto:<%= submitter.getEmail() %>"><%= Utils.addEntities(submitter.getFullName()) %></a>
         </td>
         <td class="<%= row %>RowEvenCol">
 <%

dspace-jspui/src/main/webapp/mydspace/main.jsp

@@ -25,7 +25,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"
     prefix="fmt" %>
 
-
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 
 <%@ page  import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
@@ -78,7 +77,7 @@
         <tr>
             <td align="left">
                 <h1>
-                    <fmt:message key="jsp.mydspace"/>: <%= user.getFullName() %>
+                    <fmt:message key="jsp.mydspace"/>: <%= Utils.addEntities(user.getFullName()) %>
                 </h1>
             </td>
             <td align="right" class="standard">
@@ -136,7 +135,7 @@
                 </td>
                 <td headers="t2" class="<%= row %>RowEvenCol"><%= Utils.addEntities(title) %></td>
                 <td headers="t3" class="<%= row %>RowOddCol"><%= owned[i].getCollection().getMetadata("name") %></td>
-                <td headers="t4" class="<%= row %>RowEvenCol"><a href="mailto:<%= submitter.getEmail() %>"><%= submitter.getFullName() %></a></td>
+                <td headers="t4" class="<%= row %>RowEvenCol"><a href="mailto:<%= submitter.getEmail() %>"><%= Utils.addEntities(submitter.getFullName()) %></a></td>
                 <!-- <td headers="t5" class="<%= row %>RowOddCol"></td> -->
                 <td headers="t5" class="<%= row %>RowEvenCol">
                      <form action="<%= request.getContextPath() %>/mydspace" method="post">
@@ -200,7 +199,7 @@
                     </td>
                     <td headers="t7" class="<%= row %>RowEvenCol"><%= Utils.addEntities(title) %></td>
                     <td headers="t8" class="<%= row %>RowOddCol"><%= pooled[i].getCollection().getMetadata("name") %></td>
-                    <td headers="t9" class="<%= row %>RowEvenCol"><a href="mailto:<%= submitter.getEmail() %>"><%= submitter.getFullName() %></a></td>
+                    <td headers="t9" class="<%= row %>RowEvenCol"><a href="mailto:<%= submitter.getEmail() %>"><%= Utils.addEntities(submitter.getFullName()) %></a></td>
                     <td class="<%= row %>RowOddCol">
                         <form action="<%= request.getContextPath() %>/mydspace" method="post">
                             <input type="hidden" name="step" value="<%= MyDSpaceServlet.MAIN_PAGE %>" />
@@ -285,7 +284,7 @@
                 </form>
             </td>
             <td headers="t10" class="<%= row %>RowEvenCol">
-                <a href="mailto:<%= submitter.getEmail() %>"><%= submitter.getFullName() %></a>
+                <a href="mailto:<%= submitter.getEmail() %>"><%= Utils.addEntities(submitter.getFullName()) %></a>
             </td>
             <td headers="t11" class="<%= row %>RowOddCol"><%= Utils.addEntities(title) %></td>
             <td headers="t12" class="<%= row %>RowEvenCol"><%= workspaceItems[i].getCollection().getMetadata("name") %></td>
@@ -332,7 +331,7 @@
                 </form>
             </td>
             <td class="<%= row %>RowEvenCol">
-                <a href="mailto:<%= submitter.getEmail() %>"><%= submitter.getFullName() %></a>
+                <a href="mailto:<%= submitter.getEmail() %>"><%= Utils.addEntities(submitter.getFullName()) %></a>
             </td>
             <td class="<%= row %>RowOddCol"><%= Utils.addEntities(title) %></td>
             <td class="<%= row %>RowEvenCol"><%= supervisedItems[i].getCollection().getMetadata("name") %></td>

dspace-jspui/src/main/webapp/register/new-password.jsp

@@ -29,6 +29,7 @@
 
 <%@ page import="org.dspace.app.webui.servlet.RegisterServlet" %>
 <%@ page import="org.dspace.eperson.EPerson" %>
+<%@ page import="org.dspace.core.Utils" %>
 
 <%
     EPerson eperson = (EPerson) request.getAttribute("eperson");
@@ -43,9 +44,9 @@
     <%-- <h1>Enter a New Password</h1> --%>
 	<h1><fmt:message key="jsp.register.new-password.title"/></h1>
     
-    <!-- <p>Hello <%= eperson.getFullName() %>,</p> -->
+    <!-- <p>Hello <%= Utils.addEntities(eperson.getFullName()) %>,</p> -->
 	<p><fmt:message key="jsp.register.new-password.hello">
-        <fmt:param><%= eperson.getFullName() %></fmt:param>
+        <fmt:param><%= Utils.addEntities(eperson.getFullName()) %></fmt:param>
     </fmt:message></p>
     
 <%

dspace-jspui/src/main/webapp/register/registered.jsp

@@ -25,6 +25,7 @@
 
 <%@ page import="org.dspace.app.webui.servlet.RegisterServlet" %>
 <%@ page import="org.dspace.eperson.EPerson" %>
+<%@ page import="org.dspace.core.Utils" %>
 
 <%
     EPerson eperson = (EPerson) request.getAttribute("eperson");
@@ -35,9 +36,9 @@
     <%-- <h1>Registration Complete</h1> --%>
 	<h1><fmt:message key="jsp.register.registered.title"/></h1>
     
-    <%-- <p>Thank you <%= eperson.getFirstName() %>,</p> --%>
+    <%-- <p>Thank you <%= Utils.addEntities(eperson.getFirstName()) %>,</p> --%>
 	<p><fmt:message key="jsp.register.registered.thank">
-        <fmt:param><%= eperson.getFirstName() %></fmt:param>
+        <fmt:param><%= Utils.addEntities(eperson.getFirstName()) %></fmt:param>
     </fmt:message></p>
 
     <%-- <p>You're now registered to use the DSpace system.  You can subscribe to

dspace-jspui/src/main/webapp/submit/edit-metadata.jsp

@@ -50,6 +50,7 @@
 <%@ page import="org.dspace.content.authority.ChoiceAuthorityManager" %>
 <%@ page import="org.dspace.content.authority.Choices" %>
 <%@ page import="org.dspace.core.ConfigurationManager" %>
+<%@ page import="org.dspace.core.Utils" %>
 
 <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
@@ -325,9 +326,9 @@
          if (repeatable && !readonly && i < defaults.length)
          {
             name.setLength(0);
-            name.append(dpn.getLastName())
+            name.append(Utils.addEntities(dpn.getLastName()))
                 .append(' ')
-                .append(dpn.getFirstNames());
+                .append(Utils.addEntities(dpn.getFirstNames()));
             // put a remove button next to filled in values
             sb.append("<td><input type=\"submit\" name=\"submit_")
               .append(fieldName)

dspace-jspui/src/main/webapp/tools/eperson-list.jsp

@@ -281,7 +281,7 @@ function clearEPeople()
     {
         EPerson e = epeople[i];
 		// Make sure no quotes in full name will mess up our Javascript
-        String fullname = e.getFullName().replace('\'', ' ');
+        String fullname = Utils.addEntities(e.getFullName().replace('\'', ' '));
 %>
         <tr>
 			<td headers="t1" class="<%= row %>RowOddCol">
@@ -291,10 +291,10 @@ function clearEPeople()
 			<td headers="t2" class="<%= row %>RowEvenCol"><%= e.getID() %></td>
 			<td headers="t3" class="<%= row %>RowOddCol"><%= e.getEmail() %></td>
             <td headers="t4" class="<%= row %>RowEvenCol">
-                <%= (e.getLastName() == null ? "" : e.getLastName()) %>
+                <%= (e.getLastName() == null ? "" : Utils.addEntities(e.getLastName())) %>
             </td>
             <td headers="t5" class="<%= row %>RowOddCol">
-                <%= (e.getFirstName() == null ? "" : e.getFirstName()) %>
+                <%= (e.getFirstName() == null ? "" : Utils.addEntities(e.getFirstName())) %>
             </td>
             <td headers="t6" class="<%= row %>RowOddCol">
                 <%= (e.getLanguage() == null ? "" : e.getLanguage()) %>

dspace-jspui/src/main/webapp/workspace/ws-main.jsp

@@ -26,6 +26,7 @@
 <%@ page import="org.dspace.content.WorkspaceItem" %>
 <%@ page import="org.dspace.eperson.EPerson" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
+<%@ page import="org.dspace.core.Utils" %>
 
 <%
     // get the workspace item from the request
@@ -73,7 +74,7 @@
 		}
 %>
 
-    <p><strong><a href="mailto:<%= submitter.getEmail() %>"><%= submitter.getFullName() %></a></strong></p>
+    <p><strong><a href="mailto:<%= submitter.getEmail() %>"><%= Utils.addEntities(submitter.getFullName()) %></a></strong></p>
 
 	<p><fmt:message key="jsp.workspace.ws-main.submitmsg"/> 
     <%= workspaceItem.getCollection().getMetadata("name") %></p>

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

@@ -10,18 +10,33 @@
 
    <parent>
       <groupId>org.dspace</groupId>
-      <artifactId>dspace-lni</artifactId>
-      <version>3.0-SNAPSHOT</version>
-      <relativePath>..</relativePath>
+      <artifactId>dspace-parent</artifactId>
+      <version>3.3-SNAPSHOT</version>
+      <relativePath>../..</relativePath>
    </parent>
+   
+   <properties>
+       <!-- This is the path to the root [dspace-src] directory. -->
+       <root.basedir>${basedir}/../..</root.basedir>
+   </properties>
 
+   <!--
+        Running this profile will regenerate (from WSDL) most of the classes
+        under the 'org.dspace.app.dav.client' package, based on the existing
+        'org.dspace.app.dav.LNISoapServlet' class in the dspace-lni API.
+
+        This profile is only activated if you explicitly run:
+           mvn package -P regenerate-wsdl
+
+        Please note that after regenerating these classes, you will need to manually
+        re-apply the DSpace license header, in order for them to pass license header
+        checks executed during "mvn install" or "mvn release".
+   -->
    <profiles>
       <profile>
+         <id>regenerate-wsdl</id>
          <activation>
-            <property>
-               <name>regenerate-wsdl</name>
-               <value>true</value>
-            </property>
+            <activeByDefault>false</activeByDefault>
          </activation>
          <build>
             <plugins>
@@ -174,6 +189,12 @@
          <artifactId>servlet-api</artifactId>
          <scope>provided</scope>
       </dependency>
+      <dependency>
+         <groupId>org.dspace</groupId>
+         <artifactId>dspace-lni</artifactId>
+         <type>jar</type>
+         <classifier>classes</classifier>
+      </dependency>
    </dependencies>
 
 </project>

dspace-lni/pom.xml

@@ -11,7 +11,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>4.0-SNAPSHOT</version>
+      <version>3.3-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 

dspace-oai/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>dspace-parent</artifactId>
         <groupId>org.dspace</groupId>
-        <version>4.0-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>com.lyncode</groupId>
             <artifactId>xoai</artifactId>
-            <version>2.2.9</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.dspace</groupId>

dspace-oai/src/main/java/org/dspace/xoai/DSpaceOAIDataProvider.java

@@ -158,6 +158,11 @@ public class DSpaceOAIDataProvider extends HttpServlet
                     "Requested OAI context \""
                     + request.getPathInfo().replace("/", "")
                     + "\" does not exist");
+        } finally {
+            if(context != null && context.isValid())
+            {
+                context.abort();
+            }
         }
 
     }

dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceIdentify.java

@@ -7,6 +7,8 @@
  */
 package org.dspace.xoai.data;
 
+import java.io.File;
+import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -14,6 +16,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.dspace.core.ConfigurationManager;
@@ -157,4 +160,36 @@ public class DSpaceIdentify extends AbstractIdentify
         return _name;
     }
 
+	@Override
+	public List<String> getDescription() {
+		List<String> result = new ArrayList<String>();
+		String descriptionFile = ConfigurationManager.getProperty("oai", "description.file");
+		if (descriptionFile == null) {
+			// Try indexed
+			boolean stop = false;
+			List<String> descriptionFiles = new ArrayList<String>();
+			for (int i=0;!stop;i++) {
+				String tmp = ConfigurationManager.getProperty("oai", "description.file."+i);
+				if (tmp == null && i!=0) stop = true;
+				else descriptionFiles.add(tmp);
+			}
+			
+			for (String path : descriptionFiles) {
+				try {
+					result.add(FileUtils.readFileToString(new File(path)));
+				} catch (IOException e) {
+					log.error(e.getMessage(), e);
+				}
+			}
+			
+		} else {
+			try {
+				result.add(FileUtils.readFileToString(new File(descriptionFile)));
+			} catch (IOException e) {
+				log.error(e.getMessage(), e);
+			}
+		}
+		return result;
+	}
+
 }

dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceItemRepository.java

@@ -156,7 +156,7 @@ public abstract class DSpaceItemRepository extends AbstractItemRepository
     public ListItemsResults getItemsUntil(List<Filter> filters, int offset,
             int length, String setSpec, Date from)
     {
-        filters.add(new Filter(new DateFromFilter(from), FilterScope.Query));
+        filters.add(new Filter(new DateUntilFilter(from), FilterScope.Query));
         filters.add(new Filter(new DspaceSetSpecFilter(setSpec),
                 FilterScope.Query));
         return this.getItems(filters, offset, length);

dspace-oai/src/main/java/org/dspace/xoai/filter/DateUntilFilter.java

@@ -45,7 +45,6 @@ public class DateUntilFilter extends DSpaceFilter
     @Override
     public SolrFilterResult getQuery()
     {
-    	System.out.println("HEYYYY!!!!");
         return new SolrFilterResult("item.lastmodified:[* TO "
                 + ClientUtils.escapeQueryChars(DateUtils.formatToSolr(_date, false)) + "]");
     }

dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java

@@ -165,7 +165,7 @@ public class ItemUtils
                     Element bitstream = create(factory, "bitstream");
                     bitstreams.getElement().add(bitstream);
                     String url = "";
-                    String bsName = bitstream.getName();
+                    String bsName = bit.getName();
                     String sid = String.valueOf(bit.getSequenceID());
                     String baseUrl = ConfigurationManager.getProperty("oai",
                             "bitstream.baseUrl");
@@ -190,7 +190,7 @@ public class ItemUtils
                     if (handle != null && baseUrl != null)
                     {
                         url = baseUrl + "/bitstream/"
-                                + URLUtils.encode(handle) + "/"
+                                + handle + "/"
                                 + sid + "/"
                                 + URLUtils.encode(bsName);
                     }

dspace-services/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>4.0-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
     </parent>
 
     <properties>

dspace-sword/pom.xml

@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>4.0-SNAPSHOT</version>
+      <version>3.3-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 

dspace-swordv2/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>4.0-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

dspace-xmlui/pom.xml

@@ -11,7 +11,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-parent</artifactId>
-      <version>4.0-SNAPSHOT</version>
+      <version>3.3-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 

dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/Navigation.java

@@ -211,13 +211,22 @@ public class Navigation extends AbstractDSpaceTransformer implements CacheablePr
         {
             if (dso instanceof Item)
             {
+                pageMeta.addMetadata("focus","containerType").addContent("type:item");
                 pageMeta.addMetadata("focus","object").addContent("hdl:"+dso.getHandle());
                 this.getObjectManager().manageObject(dso);
                 dso = ((Item) dso).getOwningCollection();
             }
             
-            if (dso instanceof Collection || dso instanceof Community)
+            if (dso instanceof Collection)
             {
+                pageMeta.addMetadata("focus","containerType").addContent("type:collection");
+                pageMeta.addMetadata("focus","container").addContent("hdl:"+dso.getHandle());
+                this.getObjectManager().manageObject(dso);
+            }
+            
+            if (dso instanceof Community)
+            {
+                pageMeta.addMetadata("focus","containerType").addContent("type:community");
                 pageMeta.addMetadata("focus","container").addContent("hdl:"+dso.getHandle());
                 this.getObjectManager().manageObject(dso);
             }

dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SimpleSearch.java

@@ -39,6 +39,7 @@ import org.xml.sax.SAXException;
  * @author Kevin Van de Velde (kevin at atmire dot com)
  * @author Mark Diggory (markd at atmire dot com)
  * @author Ben Bosman (ben at atmire dot com)
+ * @author Adán Román Ruiz <aroman@arvo.es> (Bugfix)
  */
 public class SimpleSearch extends AbstractSearch implements CacheableProcessingComponent {
     /**
@@ -185,8 +186,8 @@ public class SimpleSearch extends AbstractSearch implements CacheableProcessingC
 
                     if(StringUtils.isNotBlank(filterValue))
                     {
-                        Row row = filtersTable.addRow("used-filters-" + i, Row.ROLE_DATA, "search-filter used-filter");
-                        addFilterRow(filterFields, i, row, filterType, filterOperator, filterValue);
+                        Row row = filtersTable.addRow("used-filters-" + i+1, Row.ROLE_DATA, "search-filter used-filter");
+                        addFilterRow(filterFields, i+1, row, filterType, filterOperator, filterValue);
                     }
                 }
                 filtersTable.addRow("filler-row", Row.ROLE_DATA, "search-filter filler").addCell(1, 4).addContent("");

dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/viewArtifacts/Navigation.java

@@ -133,13 +133,22 @@ public class Navigation extends AbstractDSpaceTransformer implements CacheablePr
         {
             if (dso instanceof Item)
             {
+                pageMeta.addMetadata("focus","containerType").addContent("type:item");
                 pageMeta.addMetadata("focus","object").addContent("hdl:"+dso.getHandle());
                 this.getObjectManager().manageObject(dso);
                 dso = ((Item) dso).getOwningCollection();
             }
-
-            if (dso instanceof Collection || dso instanceof Community)
+            
+            if (dso instanceof Collection)
             {
+                pageMeta.addMetadata("focus","containerType").addContent("type:collection");
+                pageMeta.addMetadata("focus","container").addContent("hdl:"+dso.getHandle());
+                this.getObjectManager().manageObject(dso);
+            }
+            
+            if (dso instanceof Community)
+            {
+                pageMeta.addMetadata("focus","containerType").addContent("type:community");
                 pageMeta.addMetadata("focus","container").addContent("hdl:"+dso.getHandle());
                 this.getObjectManager().manageObject(dso);
             }

dspace-xmlui/src/main/resources/aspects/Discovery/sitemap.xmap

@@ -178,17 +178,8 @@ and searching the repository.
                             <map:serialize type="xml"/>
                         </map:match>
                     </map:match>
-
-                    <map:match type="HandleAuthorizedMatcher" pattern="!READ">
-                        <map:transform type="RestrictedItem">
-                            <map:parameter name="header" value="xmlui.ArtifactBrowser.RestrictedItem.auth_header"/>
-                            <map:parameter name="message" value="xmlui.ArtifactBrowser.RestrictedItem.auth_message"/>
-                        </map:transform>
-                        <map:serialize type="xml"/>
-                    </map:match>
                 </map:match>
 
-
             </map:match> <!-- End match handle/*/** -->
 
             <!-- Not a URL we care about, so just pass it on. -->

dspace-xmlui/src/main/webapp/WEB-INF/web.xml

@@ -117,9 +117,6 @@
   <filter-mapping>
         <filter-name>dspace.request</filter-name>
         <url-pattern>/*</url-pattern>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>FORWARD</dispatcher>
-        <dispatcher>INCLUDE</dispatcher>
   </filter-mapping>
   
   <!--

dspace-xmlui/src/main/webapp/i18n/messages.xml

@@ -531,7 +531,7 @@
 	<!-- org.dspace.app.xmlui.Submission.submissions -->
 	<message key="xmlui.Submission.Submissions.title">Submissions &amp; Workflow</message>
 	<message key="xmlui.Submission.Submissions.trail">Submissions</message>
-	<message key="xmlui.Submission.Submissions.head">Submissions &amp; workflow tasks</message>
+	<message key="xmlui.Submission.Submissions.head">Submissions &amp; Workflow Tasks</message>
 	<message key="xmlui.Submission.Submissions.untitled"><i>Untitled</i></message>
 	<message key="xmlui.Submission.Submissions.email">email: </message>
 	<!-- Same transformer, workflow section -->

dspace-xmlui/src/main/webapp/static/js/discovery/search-controls.js

@@ -119,7 +119,7 @@
             //Hide ourselves & clear our values!
             parentRow.find('input[type=text]", select').val('');
         }else{
-            if(parentRow.parents('table:first').find('tr[id^="aspect_discovery_SimpleSearch_row_used-filters-"]').length == 1)
+            if(parentRow.is('[id^="aspect_discovery_SimpleSearch_row_used-filters-"]') && parentRow.parents('table:first').find('tr[id^="aspect_discovery_SimpleSearch_row_used-filters-"]').length == 1)
             {
                 parentRow.next().remove();
                 parentRow.prev().remove();

dspace/bin/dspace

@@ -61,6 +61,12 @@ else
 fi
 
 
+# If the user only wants the CLASSPATH, just give it now.
+if [ "$1" = "classpath" ]; then
+  echo $FULLPATH
+  exit 0
+fi
+
 
 
 #Allow user to specify java options through JAVA_OPTS variable

dspace/config/crosswalks/oai/description.xml

@@ -0,0 +1 @@
+<XOAIDescription xmlns="http://www.lyncode.com/XOAIConfiguration">XOAI: OAI-PMH Java Toolkit</XOAIDescription>

dspace/config/crosswalks/oai/metadataFormats/qdc.xsl

@@ -41,6 +41,7 @@
 		</xsl:for-each>
 		<xsl:for-each select="doc:metadata/doc:element[@name='dc']/doc:element[@name='description']/doc:element[@name='abstract']/doc:element/doc:field[@name='value']">
 			<dcterms:abstract xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://purl.org/dc/terms/ http://dublincore.org/schemas/xmls/qdc/2006/01/06/dcterms.xsd http://purl.org/dc/elements/1.1/ http://dublincore.org/schemas/xmls/qdc/2006/01/06/dc.xsd">
+				<xsl:value-of select="." />
 				</dcterms:abstract>
 		</xsl:for-each>
 		<xsl:for-each select="doc:metadata/doc:element[@name='dc']/doc:element[@name='date']/doc:element[@name='available']/doc:element/doc:field[@name='value']">

dspace/config/crosswalks/oai/xoai.xml

@@ -239,7 +239,7 @@
 				<Value>starts_with</Value>
 			</Parameter>
 			<Parameter key="value">
-				<Value>info:eurepo/grantAgreement/EC/FP</Value>
+				<Value>info:eu-repo/grantAgreement/EC/FP</Value>
 			</Parameter>
 		</Filter>
 	</Filters>

dspace/config/modules/discovery.cfg

@@ -5,7 +5,7 @@
 # faceted-search system.                                        #
 #---------------------------------------------------------------#
 ##### Search Indexing #####
-search.server = http://localhost:8080/solr/search
+search.server = ${solr.server}/search
 
 #Char used to ensure that the sidebar facets are case insensitive
 #solr.facets.split.char=\n|||\n

dspace/config/modules/oai.cfg

@@ -18,6 +18,9 @@ bitstream.baseUrl = ${dspace.url}
 # Base Configuration Directory
 config.dir = ${dspace.dir}/config/crosswalks/oai
 
+# Description
+description.file = ${dspace.dir}/config/crosswalks/oai/description.xml
+
 # Cache enabled?
 cache.enabled = true
 

dspace/config/modules/swordv2-server.cfg

@@ -138,7 +138,7 @@ auth-type = Basic
 
 # The location where uploaded files and packages are
 # stored while being processed
-upload.tempdir = /dspace/upload
+upload.tempdir = ${dspace.dir}/upload
 
 # The metadata field in which to store the updated date for
 # items deposited via SWORD.

dspace/modules/additions/pom.xml

@@ -17,7 +17,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>4.0-SNAPSHOT</version>
+      <version>3.3-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 

dspace/modules/jspui/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>modules</artifactId>
-        <version>4.0-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

dspace/modules/lni/pom.xml

@@ -13,7 +13,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>4.0-SNAPSHOT</version>
+      <version>3.3-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 

dspace/modules/oai/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dspace</groupId>
-        <version>4.0-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

dspace/modules/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.dspace</groupId>
 		<artifactId>dspace-parent</artifactId>
-		<version>4.0-SNAPSHOT</version>
+		<version>3.3-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

dspace/modules/solr/pom.xml

@@ -2,7 +2,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.dspace.modules</groupId>
    <artifactId>solr</artifactId>
-   <version>4.0-SNAPSHOT</version>
+   <version>3.3-SNAPSHOT</version>
    <packaging>war</packaging>
    <name>DSpace SOLR :: Local Customizations</name>
    <description>
@@ -13,7 +13,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>4.0-SNAPSHOT</version>
+      <version>3.3-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 

dspace/modules/sword/pom.xml

@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>4.0-SNAPSHOT</version>
+      <version>3.3-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 

dspace/modules/swordv2/pom.xml

@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>4.0-SNAPSHOT</version>
+      <version>3.3-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 

dspace/modules/xmlui/pom.xml

@@ -12,7 +12,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>4.0-SNAPSHOT</version>
+      <version>3.3-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 

dspace/pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>4.0-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

dspace/src/main/config/build.xml

@@ -142,6 +142,7 @@ Common usage:
         <echo message="load_registries --> Load metadata &amp; file format registries into the " />
         <echo message="                    database" />
         <echo message="" />
+        <echo message="clean_backups  --> Remove .bak directories under install directory" />
         <echo message="clean_database  --> Remove DSpace database tables, destroying data" />
         <echo message="" />
         <echo message="" />

pom.xml

@@ -4,7 +4,7 @@
    <groupId>org.dspace</groupId>
    <artifactId>dspace-parent</artifactId>
    <packaging>pom</packaging>
-   <version>4.0-SNAPSHOT</version>
+   <version>3.3-SNAPSHOT</version>
    <name>DSpace Parent Project</name>
    <url>https://github.com/dspace/DSpace</url>
 
@@ -377,7 +377,7 @@
         </profile>
 
         <!--
-           Builds LNI WAR for DSpace
+           Builds LNI WAR & Client for DSpace
         -->
         <profile>
             <id>dspace-lni</id>
@@ -388,6 +388,7 @@
             </activation>
             <modules>
                 <module>dspace-lni</module>
+                <module>dspace-lni/dspace-lni-client</module>
             </modules>
         </profile>
 
@@ -444,71 +445,71 @@
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-api</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
          </dependency>
          <dependency>
             <groupId>org.dspace.modules</groupId>
             <artifactId>additions</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
          </dependency>
 
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-sword</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
             <type>jar</type>
             <classifier>classes</classifier>
          </dependency>
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-sword</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
             <type>war</type>
          </dependency>
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-swordv2</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
             <type>jar</type>
             <classifier>classes</classifier>
          </dependency>
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-swordv2</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
             <type>war</type>
          </dependency>
 
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-jspui</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
             <type>jar</type>
             <classifier>classes</classifier>
          </dependency>
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-jspui</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
             <type>war</type>
          </dependency>
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-oai</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
             <type>jar</type>
             <classifier>classes</classifier>
          </dependency>
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-oai</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
             <type>war</type>
          </dependency>
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-lni</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
             <type>jar</type>
             <classifier>classes</classifier>
          </dependency>
@@ -520,26 +521,26 @@
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-lni</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
             <type>war</type>
          </dependency>
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-xmlui</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
             <type>jar</type>
             <classifier>classes</classifier>
          </dependency>
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-xmlui</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
             <type>war</type>
          </dependency>
          <dependency>
             <groupId>org.dspace</groupId>
             <artifactId>dspace-services</artifactId>
-            <version>4.0-SNAPSHOT</version>
+            <version>3.3-SNAPSHOT</version>
          </dependency>
          <!-- DSpace Localization Packages -->
          <dependency>
@@ -1196,8 +1197,8 @@
         <repository>
             <id>sonatype-releases</id>
             <name>Sonatype Releases Repository</name>
-            <url>http://oss.sonatype.org/content/repositories/releases/</url>
+            <url>https://oss.sonatype.org/content/repositories/releases/</url>
         </repository>
     </repositories>
-    
+
 </project>