hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-12 04:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a bunch of typos

Browse Source
This commit is contained in:
Ivan Masár
2012-12-06 14:50:54 +01:00
parent 9566760346
commit 6877ab67a6
53 changed files with 186 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java
View File

@@ -45,19 +45,19 @@ public class DSpaceCSV implements Serializable
/** The value separator (defaults to double pipe '||') */ /** The value separator (defaults to double pipe '||') */
protected static String valueSeparator; protected static String valueSeparator;
/** The value separator in an escaped form for using in regexs */ /** The value separator in an escaped form for using in regexes */
protected static String escapedValueSeparator; protected static String escapedValueSeparator;
/** The field separator (defaults to comma) */ /** The field separator (defaults to comma) */
protected static String fieldSeparator; protected static String fieldSeparator;
/** The field separator in an escaped form for using in regexs */ /** The field separator in an escaped form for using in regexes */
protected static String escapedFieldSeparator; protected static String escapedFieldSeparator;
/** The authority separator (defaults to dobule colon '::') */ /** The authority separator (defaults to double colon '::') */
protected static String authoritySeparator; protected static String authoritySeparator;
/** The authority separator in an escaped form for using in regexs */ /** The authority separator in an escaped form for using in regexes */
protected static String escapedAuthoritySeparator; protected static String escapedAuthoritySeparator;
@@ -451,7 +451,7 @@ public class DSpaceCSV implements Serializable
*/ */
public final void addItem(String line) throws Exception public final void addItem(String line) throws Exception
{ {
// Check to see if the last character is a field separator, which hides the last empy column // Check to see if the last character is a field separator, which hides the last empty column
boolean last = false; boolean last = false;
if (line.endsWith(fieldSeparator)) if (line.endsWith(fieldSeparator))
{ {

2
dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java
View File

@@ -957,7 +957,7 @@ public class ItemExport
} }
} }
// if we have any items to process then kick off annonymous thread // if we have any items to process then kick off anonymous thread
if (itemsMap.size() > 0) if (itemsMap.size() > 0)
{ {
Thread go = new Thread() Thread go = new Thread()

4
dspace-api/src/main/java/org/dspace/app/sfx/SFXFileReader.java
View File

@@ -54,7 +54,7 @@ public class SFXFileReader {
/** /**
* Loads the SFX configuraiton file * Loads the SFX configuration file
* *
* @param fileName The name of the SFX configuration file * @param fileName The name of the SFX configuration file
* @param item The item to process, from which metadata values will be taken * @param item The item to process, from which metadata values will be taken
@@ -64,7 +64,7 @@ public class SFXFileReader {
*/ */
public static String loadSFXFile(String fileName, Item item) throws IOException public static String loadSFXFile(String fileName, Item item) throws IOException
{ {
// Parse XML file -> XML document will be build // Parse XML file -> XML document will be built
if (doc == null) if (doc == null)
{ {
doc = parseFile(fileName); doc = parseFile(fileName);

2
dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
View File

@@ -410,7 +410,7 @@ public class LDAPAuthentication
if ((adminUser != null) && (!adminUser.trim().equals("")) && if ((adminUser != null) && (!adminUser.trim().equals("")) &&
(adminPassword != null) && (!adminPassword.trim().equals(""))) (adminPassword != null) && (!adminPassword.trim().equals("")))
{ {
// Use admin credencials for search// Authenticate // Use admin credentials for search// Authenticate
env.put(javax.naming.Context.SECURITY_AUTHENTICATION, "simple"); env.put(javax.naming.Context.SECURITY_AUTHENTICATION, "simple");
env.put(javax.naming.Context.SECURITY_PRINCIPAL, adminUser); env.put(javax.naming.Context.SECURITY_PRINCIPAL, adminUser);
env.put(javax.naming.Context.SECURITY_CREDENTIALS, adminPassword); env.put(javax.naming.Context.SECURITY_CREDENTIALS, adminPassword);

2
dspace-api/src/main/java/org/dspace/content/Community.java
View File

@@ -802,7 +802,7 @@ public class Community extends DSpaceObject
/** /**
* Return an array of collections of this community and its subcommunities * Return an array of collections of this community and its subcommunities
* *
* @return an array of colections * @return an array of collections
*/ */
public Collection[] getAllCollections() throws SQLException public Collection[] getAllCollections() throws SQLException

8
dspace-api/src/main/java/org/dspace/core/Constants.java
View File

@@ -142,8 +142,8 @@ public class Constants
"DEFAULT_BITSTREAM_READ", "DEFAULT_ITEM_READ", "ADMIN" }; "DEFAULT_BITSTREAM_READ", "DEFAULT_ITEM_READ", "ADMIN" };
/** /**
* constants for the relevance array generating dynamicallis is simple: just * generating constants for the relevance array dynamically is simple: just
* 1 < < TYPE * 1 << TYPE
*/ */
public static final int RBITSTREAM = 1 << BITSTREAM; public static final int RBITSTREAM = 1 << BITSTREAM;
@@ -157,10 +157,10 @@ public class Constants
/** /**
* Array of relevances of actions to objects - used by the UI to only * Array of relevances of actions to objects - used by the UI to only
* display actions that are relevant to an object type To see if an action * display actions that are relevant to an object type; To see if an action
* is relevant to an object, just OR the relevance type above with the value * is relevant to an object, just OR the relevance type above with the value
* in actionTypeRelevance[] (To see if READ is relevant to community, just * in actionTypeRelevance[] (To see if READ is relevant to community, just
* test actionTypeRelevance[READ] | RCOMMUNITY, 0 = irrelevant * test actionTypeRelevance[READ] | RCOMMUNITY, 0 = irrelevant)
*/ */
public static final int[] actionTypeRelevance = { public static final int[] actionTypeRelevance = {
RBITSTREAM | RBUNDLE | RITEM | RCOLLECTION | RCOMMUNITY, // 0 - READ RBITSTREAM | RBUNDLE | RITEM | RCOLLECTION | RCOMMUNITY, // 0 - READ

2
dspace-api/src/main/java/org/dspace/ctask/general/MetadataValueLinkChecker.java
View File

@@ -17,7 +17,7 @@ import java.util.List;
* A link checker that builds upon the BasicLinkChecker to check URLs that * A link checker that builds upon the BasicLinkChecker to check URLs that
* appear in all metadata fields where the field starts with http:// or https:// * appear in all metadata fields where the field starts with http:// or https://
* *
* Of course thi assumes that there is no extra metadata following the URL. * Of course this assumes that there is no extra metadata following the URL.
* *
* @author Stuart Lewis * @author Stuart Lewis
*/ */

2
dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java
View File

@@ -159,7 +159,7 @@ public class OAIHarvester {
/** /**
* Search the configuration options and find the ORE serializaition string * Search the configuration options and find the ORE serialization string
* @return Namespace of the supported ORE format. Returns null if not found. * @return Namespace of the supported ORE format. Returns null if not found.
*/ */
private static Namespace getORENamespace() { private static Namespace getORENamespace() {

2
dspace-api/src/main/java/org/dspace/statistics/SolrLogger.java
View File

@@ -1277,7 +1277,7 @@ public class SolrLogger
public static void shardSolrIndex() throws IOException, SolrServerException { public static void shardSolrIndex() throws IOException, SolrServerException {
/* /*
Start by faceting by year so we can include each year in a seperate core ! Start by faceting by year so we can include each year in a separate core !
*/ */
SolrQuery yearRangeQuery = new SolrQuery(); SolrQuery yearRangeQuery = new SolrQuery();
yearRangeQuery.setQuery("*:*"); yearRangeQuery.setQuery("*:*");

4
dspace-api/src/main/resources/spring/spring-dspace-addon-requestitem-services.xml
View File

@@ -25,8 +25,8 @@
Uncomment these properties if you want lookup in metadata the email and the name of the author to contact for request copy. Uncomment these properties if you want lookup in metadata the email and the name of the author to contact for request copy.
If you don't configure that or if the requested item doesn't have these metadata the submitter data are used as fail over If you don't configure that or if the requested item doesn't have these metadata the submitter data are used as fail over
<property name="emailMetadata" value="schema.element.qualfier" /> <property name="emailMetadata" value="schema.element.qualifier" />
<property name="fullNameMatadata" value="schema.element.qualfier" /> <property name="fullNameMatadata" value="schema.element.qualifier" />
--> -->
</bean> </bean>

2
dspace-api/src/test/java/org/dspace/storage/rdbms/MockDatabaseManager.java
View File

@@ -1695,7 +1695,7 @@ public class MockDatabaseManager
//exist in the file //exist in the file
String[] stmts = sb.toString().split(";"); String[] stmts = sb.toString().split(";");
//stablish the connection using the pool //establish the connection using the pool
Connection con = DriverManager.getConnection("jdbc:apache:commons:dbcp:" + poolName); Connection con = DriverManager.getConnection("jdbc:apache:commons:dbcp:" + poolName);
Statement st = con.createStatement(); Statement st = con.createStatement();

6
dspace-jspui/src/main/java/org/dspace/app/webui/submit/JSPStep.java
View File

@@ -36,9 +36,9 @@ import org.dspace.core.Context;
* <li>If showJSP() was specified from doPreProcessing(), then the JSP * <li>If showJSP() was specified from doPreProcessing(), then the JSP
* specified will be displayed</li> * specified will be displayed</li>
* <li>If showJSP() was not specified from doPreProcessing(), then the * <li>If showJSP() was not specified from doPreProcessing(), then the
* doProcessing() method is called an the step completes immediately</li> * doProcessing() method is called and the step completes immediately</li>
* <li>Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order * <li>Call doProcessing() method on appropriate AbstractProcessingStep after
* to process the user input</li> * the user returns from the JSP, in order to process the user input</li>
* <li>Call doPostProcessing() method to determine if more user interaction is * <li>Call doPostProcessing() method to determine if more user interaction is
* required, and if further JSPs need to be called.</li> * required, and if further JSPs need to be called.</li>
* <li>If there are more "pages" in this step then, the process begins again * <li>If there are more "pages" in this step then, the process begins again

6
dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPCCLicenseStep.java
View File

@@ -42,9 +42,9 @@ import java.sql.SQLException;
* <li>If showJSP() was specified from doPreProcessing(), then the JSP * <li>If showJSP() was specified from doPreProcessing(), then the JSP
* specified will be displayed</li> * specified will be displayed</li>
* <li>If showJSP() was not specified from doPreProcessing(), then the * <li>If showJSP() was not specified from doPreProcessing(), then the
* doProcessing() method is called an the step completes immediately</li> * doProcessing() method is called and the step completes immediately</li>
* <li>Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order * <li>Call doProcessing() method on appropriate AbstractProcessingStep after
* to process the user input</li> * the user returns from the JSP, in order to process the user input</li>
* <li>Call doPostProcessing() method to determine if more user interaction is * <li>Call doPostProcessing() method to determine if more user interaction is
* required, and if further JSPs need to be called.</li> * required, and if further JSPs need to be called.</li>
* <li>If there are more "pages" in this step then, the process begins again * <li>If there are more "pages" in this step then, the process begins again

6
dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPDescribeStep.java
View File

@@ -45,9 +45,9 @@ import org.dspace.submit.step.DescribeStep;
* <li>If showJSP() was specified from doPreProcessing(), then the JSP * <li>If showJSP() was specified from doPreProcessing(), then the JSP
* specified will be displayed</li> * specified will be displayed</li>
* <li>If showJSP() was not specified from doPreProcessing(), then the * <li>If showJSP() was not specified from doPreProcessing(), then the
* doProcessing() method is called an the step completes immediately</li> * doProcessing() method is called and the step completes immediately</li>
* <li>Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order * <li>Call doProcessing() method on appropriate AbstractProcessingStep after
* to process the user input</li> * the user returns from the JSP, in order to process the user input</li>
* <li>Call doPostProcessing() method to determine if more user interaction is * <li>Call doPostProcessing() method to determine if more user interaction is
* required, and if further JSPs need to be called.</li> * required, and if further JSPs need to be called.</li>
* <li>If there are more "pages" in this step then, the process begins again * <li>If there are more "pages" in this step then, the process begins again

6
dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPInitialQuestionsStep.java
View File

@@ -39,9 +39,9 @@ import org.dspace.submit.step.InitialQuestionsStep;
* <li>If showJSP() was specified from doPreProcessing(), then the JSP * <li>If showJSP() was specified from doPreProcessing(), then the JSP
* specified will be displayed</li> * specified will be displayed</li>
* <li>If showJSP() was not specified from doPreProcessing(), then the * <li>If showJSP() was not specified from doPreProcessing(), then the
* doProcessing() method is called an the step completes immediately</li> * doProcessing() method is called and the step completes immediately</li>
* <li>Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order * <li>Call doProcessing() method on appropriate AbstractProcessingStep after
* to process the user input</li> * the user returns from the JSP, in order to process the user input</li>
* <li>Call doPostProcessing() method to determine if more user interaction is * <li>Call doPostProcessing() method to determine if more user interaction is
* required, and if further JSPs need to be called.</li> * required, and if further JSPs need to be called.</li>
* <li>If there are more "pages" in this step then, the process begins again * <li>If there are more "pages" in this step then, the process begins again

6
dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPLicenseStep.java
View File

@@ -44,9 +44,9 @@ import org.dspace.submit.step.LicenseStep;
* <li>If showJSP() was specified from doPreProcessing(), then the JSP * <li>If showJSP() was specified from doPreProcessing(), then the JSP
* specified will be displayed</li> * specified will be displayed</li>
* <li>If showJSP() was not specified from doPreProcessing(), then the * <li>If showJSP() was not specified from doPreProcessing(), then the
* doProcessing() method is called an the step completes immediately</li> * doProcessing() method is called and the step completes immediately</li>
* <li>Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order * <li>Call doProcessing() method on appropriate AbstractProcessingStep after
* to process the user input</li> * the user returns from the JSP, in order to process the user input</li>
* <li>Call doPostProcessing() method to determine if more user interaction is * <li>Call doPostProcessing() method to determine if more user interaction is
* required, and if further JSPs need to be called.</li> * required, and if further JSPs need to be called.</li>
* <li>If there are more "pages" in this step then, the process begins again * <li>If there are more "pages" in this step then, the process begins again

6
dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPSampleStep.java
View File

@@ -50,9 +50,9 @@ import org.dspace.submit.step.SampleStep;
* <li>If showJSP() was specified from doPreProcessing(), then the JSP * <li>If showJSP() was specified from doPreProcessing(), then the JSP
* specified will be displayed</li> * specified will be displayed</li>
* <li>If showJSP() was not specified from doPreProcessing(), then the * <li>If showJSP() was not specified from doPreProcessing(), then the
* doProcessing() method is called an the step completes immediately</li> * doProcessing() method is called and the step completes immediately</li>
* <li>Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order * <li>Call doProcessing() method on appropriate AbstractProcessingStep after
* to process the user input</li> * the user returns from the JSP, in order to process the user input</li>
* <li>Call doPostProcessing() method to determine if more user interaction is * <li>Call doPostProcessing() method to determine if more user interaction is
* required, and if further JSPs need to be called.</li> * required, and if further JSPs need to be called.</li>
* <li>If there are more "pages" in this step then, the process begins again * <li>If there are more "pages" in this step then, the process begins again

6
dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPSelectCollectionStep.java
View File

@@ -41,9 +41,9 @@ import org.dspace.submit.step.SelectCollectionStep;
* <li>If showJSP() was specified from doPreProcessing(), then the JSP * <li>If showJSP() was specified from doPreProcessing(), then the JSP
* specified will be displayed</li> * specified will be displayed</li>
* <li>If showJSP() was not specified from doPreProcessing(), then the * <li>If showJSP() was not specified from doPreProcessing(), then the
* doProcessing() method is called an the step completes immediately</li> * doProcessing() method is called and the step completes immediately</li>
* <li>Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order * <li>Call doProcessing() method on appropriate AbstractProcessingStep after
* to process the user input</li> * the user returns from the JSP, in order to process the user input</li>
* <li>Call doPostProcessing() method to determine if more user interaction is * <li>Call doPostProcessing() method to determine if more user interaction is
* required, and if further JSPs need to be called.</li> * required, and if further JSPs need to be called.</li>
* <li>If there are more "pages" in this step then, the process begins again * <li>If there are more "pages" in this step then, the process begins again

6
dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPUploadStep.java
View File

@@ -56,9 +56,9 @@ import com.google.gson.JsonElement;
* <li>If showJSP() was specified from doPreProcessing(), then the JSP * <li>If showJSP() was specified from doPreProcessing(), then the JSP
* specified will be displayed</li> * specified will be displayed</li>
* <li>If showJSP() was not specified from doPreProcessing(), then the * <li>If showJSP() was not specified from doPreProcessing(), then the
* doProcessing() method is called an the step completes immediately</li> * doProcessing() method is called and the step completes immediately</li>
* <li>Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order * <li>Call doProcessing() method on appropriate AbstractProcessingStep after
* to process the user input</li> * the user returns from the JSP, in order to process the user input</li>
* <li>Call doPostProcessing() method to determine if more user interaction is * <li>Call doPostProcessing() method to determine if more user interaction is
* required, and if further JSPs need to be called.</li> * required, and if further JSPs need to be called.</li>
* <li>If there are more "pages" in this step then, the process begins again * <li>If there are more "pages" in this step then, the process begins again

6
dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPVerifyStep.java
View File

@@ -44,9 +44,9 @@ import org.dspace.core.LogManager;
* <li>If showJSP() was specified from doPreProcessing(), then the JSP * <li>If showJSP() was specified from doPreProcessing(), then the JSP
* specified will be displayed</li> * specified will be displayed</li>
* <li>If showJSP() was not specified from doPreProcessing(), then the * <li>If showJSP() was not specified from doPreProcessing(), then the
* doProcessing() method is called an the step completes immediately</li> * doProcessing() method is called and the step completes immediately</li>
* <li>Call doProcessing() method after the user returns from the JSP, in order * <li>Call doProcessing() method on appropriate AbstractProcessingStep after
* to process the user input</li> * the user returns from the JSP, in order to process the user input</li>
* <li>Call doPostProcessing() method to determine if more user interaction is * <li>Call doPostProcessing() method to determine if more user interaction is
* required, and if further JSPs need to be called.</li> * required, and if further JSPs need to be called.</li>
* <li>If there are more "pages" in this step then, the process begins again * <li>If there are more "pages" in this step then, the process begins again

2
dspace-jspui/src/main/java/org/dspace/app/webui/util/XMLUtil.java
View File

@@ -100,7 +100,7 @@ public class XMLUtil
} }
// Create an empy DOMResult object for the output. // Create an empty DOMResult object for the output.
DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance(); DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
dFactory.setNamespaceAware(true); dFactory.setNamespaceAware(true);
DocumentBuilder dBuilder = dFactory.newDocumentBuilder(); DocumentBuilder dBuilder = dFactory.newDocumentBuilder();

4
dspace-sword/src/main/java/org/purl/sword/base/SWORDEntry.java
View File

@@ -32,7 +32,7 @@ public class SWORDEntry extends Entry
protected SwordNoOp swordNoOp; protected SwordNoOp swordNoOp;
/** /**
* Use to supply a verbose description. * Used to supply a verbose description.
*/ */
protected SwordVerboseDescription swordVerboseDescription; protected SwordVerboseDescription swordVerboseDescription;
@@ -49,7 +49,7 @@ public class SWORDEntry extends Entry
protected SwordUserAgent swordUserAgent; protected SwordUserAgent swordUserAgent;
/** /**
* The packaging infomation * The packaging information
*/ */
private SwordPackaging swordPackaging; private SwordPackaging swordPackaging;

127
dspace-sword/src/main/java/org/purl/sword/client/SWORDClient.java
View File

@@ -15,77 +15,76 @@ import org.purl.sword.base.ServiceDocument;
*/ */
public interface SWORDClient public interface SWORDClient
{ {
/** /**
* Set the server that is to be contacted on the next access. * Set the server that is to be contacted on the next access.
* *
* @param server The name of the server, e.g. www.aber.ac.uk * @param server The name of the server, e.g. www.aber.ac.uk
* @param port The port number, e.g. 80. * @param port The port number, e.g. 80.
*/ */
public void setServer( String server, int port ); public void setServer( String server, int port );
/** /**
* Set the user credentials that are to be used for subsequent accesses. * Set the user credentials that are to be used for subsequent accesses.
* *
* @param username The username. * @param username The username.
* @param password The password. * @param password The password.
*/ */
public void setCredentials( String username, String password ); public void setCredentials( String username, String password );
/** /**
* Clear the credentials settings on the client. * Clear the credentials settings on the client.
*/ */
public void clearCredentials(); public void clearCredentials();
/** /**
* Set the proxy that is to be used for subsequent accesses. * Set the proxy that is to be used for subsequent accesses.
* *
* @param host The host name, e.g. cache.host.com. * @param host The host name, e.g. cache.host.com.
* @param port The port, e.g. 8080. * @param port The port, e.g. 8080.
*/ */
public void setProxy( String host, int port ); public void setProxy( String host, int port );
/** /**
* Get the status result returned from the most recent network test. * Get the status result returned from the most recent network test.
* *
* @return An the status code and message. * @return The status code and message.
*/ */
public Status getStatus( ); public Status getStatus( );
/** /**
* Get a service document, specified in the URL. * Get a service document, specified in the URL.
* *
* @param url The URL to connect to. * @param url The URL to connect to.
* @return A ServiceDocument that contains the Service details that were * @return A ServiceDocument that contains the Service details that were
* obained from the specified URL. * obained from the specified URL.
* *
* @throws SWORDClientException If there is an error accessing the * @throws SWORDClientException If there is an error accessing the
* URL. * URL.
*/ */
public ServiceDocument getServiceDocument( String url ) throws SWORDClientException; public ServiceDocument getServiceDocument( String url ) throws SWORDClientException;
/** /**
* Get a service document, specified in the URL. The document is accessed on * Get a service document, specified in the URL. The document is accessed on
* behalf of the specified user. * behalf of the specified user.
* *
* @param url The URL to connect to. * @param url The URL to connect to.
* @param onBehalfOf The username for the onBehalfOf access. * @param onBehalfOf The username for the onBehalfOf access.
* @return A ServiceDocument that contains the Service details that were * @return A ServiceDocument that contains the Service details that were
* obained from the specified URL. * obtained from the specified URL.
* *
* @throws SWORDClientException If there is an error accessing the * @throws SWORDClientException If there is an error accessing the URL.
* URL. */
*/ public ServiceDocument getServiceDocument(String url, String onBehalfOf ) throws SWORDClientException;
public ServiceDocument getServiceDocument(String url, String onBehalfOf ) throws SWORDClientException;
/** /**
* Post a file to the specified destination URL. * Post a file to the specified destination URL.
* *
* @param message The message that defines the requirements for the operation. * @param message The message that defines the requirements for the operation.
* *
* @return A DespoitResponse if the response is successful. If there was an error, * @return A DespoitResponse if the response is successful. If there was an error,
* <code>null</code> should be returned. * <code>null</code> should be returned.
* *
* @throws SWORDClientException If there is an error accessing the URL. * @throws SWORDClientException If there is an error accessing the URL.
*/ */
public DepositResponse postFile( PostMessage message ) throws SWORDClientException; public DepositResponse postFile( PostMessage message ) throws SWORDClientException;
} }

4
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/SearchItemForm.java
View File

@@ -163,13 +163,13 @@ public class SearchItemForm extends AbstractDSpaceTransformer {
/** /**
* Search the repository for items in other collections that can be mapped into this one. * Search the repository for items in other collections that can be mapped into this one.
* *
* @param collection The collection to mapp into * @param collection The collection to map into
* @param query The search query. * @param query The search query.
*/ */
private java.util.List<Item> performSearch(Collection collection, String query) throws SQLException, IOException private java.util.List<Item> performSearch(Collection collection, String query) throws SQLException, IOException
{ {
// Search the repository // Search the repository
QueryArgs queryArgs = new QueryArgs(); QueryArgs queryArgs = new QueryArgs();
queryArgs.setQuery(query); queryArgs.setQuery(query);
queryArgs.setPageSize(Integer.MAX_VALUE); queryArgs.setPageSize(Integer.MAX_VALUE);

2
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionRecentSubmissions.java
View File

@@ -87,7 +87,7 @@ public class CollectionRecentSubmissions extends AbstractDSpaceTransformer imple
* *
* The validity object will include the collection being viewed and * The validity object will include the collection being viewed and
* all recently submitted items. This does not include the community / collection * all recently submitted items. This does not include the community / collection
* hierarch, when this changes they will not be reflected in the cache. * hierarchy, when this changes they will not be reflected in the cache.
*/ */
public SourceValidity getValidity() public SourceValidity getValidity()
{ {

2
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java
View File

@@ -83,7 +83,7 @@ public class CollectionViewer extends AbstractDSpaceTransformer implements Cache
* *
* The validity object will include the collection being viewed and * The validity object will include the collection being viewed and
* all recently submitted items. This does not include the community / collection * all recently submitted items. This does not include the community / collection
* hierarch, when this changes they will not be reflected in the cache. * hierarchy, when this changes they will not be reflected in the cache.
*/ */
public SourceValidity getValidity() public SourceValidity getValidity()
{ {

10
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityBrowser.java
View File

@@ -47,7 +47,7 @@ import org.xml.sax.SAXException;
/** /**
* Display a list of Communities and collections. * Display a list of Communities and collections.
* *
* This item may be configured so that it will only display to a specific depth, * This item may be configured so that it will only display up to a specific depth,
* and may include or exclude collections from the tree. * and may include or exclude collections from the tree.
* *
* The configuration option available: <depth exclude-collections="true">999</depth> * The configuration option available: <depth exclude-collections="true">999</depth>
@@ -106,7 +106,7 @@ public class CommunityBrowser extends AbstractDSpaceTransformer implements Cache
/** /**
* Generate the unique caching key. * Generate the unique caching key.
* This key must be unique inside the space of this component. * This key must be unique within the space of this component.
*/ */
public Serializable getKey() public Serializable getKey()
{ {
@@ -118,7 +118,7 @@ public class CommunityBrowser extends AbstractDSpaceTransformer implements Cache
* Generate the cache validity object. * Generate the cache validity object.
* *
* The validity object will include a list of all communities * The validity object will include a list of all communities
* & collection being browsed along with there logo bitstreams. * and collections being browsed along with their logo bitstreams.
*/ */
public SourceValidity getValidity() public SourceValidity getValidity()
{ {
@@ -352,7 +352,7 @@ public class CommunityBrowser extends AbstractDSpaceTransformer implements Cache
TreeNode newRoot = new TreeNode(); TreeNode newRoot = new TreeNode();
// Setup for breath-first traversal // Setup for breadth-first traversal
Stack<TreeNode> stack = new Stack<TreeNode>(); Stack<TreeNode> stack = new Stack<TreeNode>();
for (Community community : communities) for (Community community : communities)
@@ -364,7 +364,7 @@ public class CommunityBrowser extends AbstractDSpaceTransformer implements Cache
{ {
TreeNode node = stack.pop(); TreeNode node = stack.pop();
// Short circuit if we have reached our max depth. // Short-circuit if we have reached our max depth.
if (node.getLevel() >= this.depth) if (node.getLevel() >= this.depth)
{ {
continue; continue;

20
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/AbstractSearch.java
View File

@@ -46,10 +46,10 @@ import java.util.List;
/** /**
* This is an abstract search page. It is a collection of search methods that * This is an abstract search page. It is a collection of search methods that
* are common between diffrent search implementation. An implementer must * are common between different search implementation. An implementer must
* implement at least three methods: addBody(), getQuery(), and generateURL(). * implement at least three methods: addBody(), getQuery(), and generateURL().
* <p/> * <p/>
* See the implementors SimpleSearch. * See the SimpleSearch implementation.
* *
* @author Kevin Van de Velde (kevin at atmire dot com) * @author Kevin Van de Velde (kevin at atmire dot com)
* @author Mark Diggory (markd at atmire dot com) * @author Mark Diggory (markd at atmire dot com)
@@ -338,7 +338,7 @@ public abstract class AbstractSearch extends AbstractDSpaceTransformer implement
// Look for any communities or collections in the mix // Look for any communities or collections in the mix
org.dspace.app.xmlui.wing.element.List dspaceObjectsList = null; org.dspace.app.xmlui.wing.element.List dspaceObjectsList = null;
// Put in palce top level search result list // Put it on the top of level search result list
dspaceObjectsList = results.addList("search-results-repository", dspaceObjectsList = results.addList("search-results-repository",
org.dspace.app.xmlui.wing.element.List.TYPE_DSO_LIST, "repository-search-results"); org.dspace.app.xmlui.wing.element.List.TYPE_DSO_LIST, "repository-search-results");
@@ -467,7 +467,7 @@ public abstract class AbstractSearch extends AbstractDSpaceTransformer implement
} }
} }
//Check our highlighted results, we may need to add non metadata (like our full text) //Check our highlighted results, we may need to add non-metadata (like our full text)
if(highlightedResults != null) if(highlightedResults != null)
{ {
//Also add the full text snippet (if available !) //Also add the full text snippet (if available !)
@@ -580,7 +580,7 @@ public abstract class AbstractSearch extends AbstractDSpaceTransformer implement
} }
/** /**
* Add the current value to the wing list, * Add the current value to the wing list
* @param highlightedResults the highlighted results * @param highlightedResults the highlighted results
* @param metadataKey the metadata key {schema}.{element}.{qualifier} * @param metadataKey the metadata key {schema}.{element}.{qualifier}
* @param metadataFieldList the wing list we need to add the metadata value to * @param metadataFieldList the wing list we need to add the metadata value to
@@ -598,7 +598,7 @@ public abstract class AbstractSearch extends AbstractDSpaceTransformer implement
//Loop over all our highlighted results //Loop over all our highlighted results
for (String highlight : highlightedResults.getHighlightResults(metadataKey)) for (String highlight : highlightedResults.getHighlightResults(metadataKey))
{ {
//If our non highlighted value matches our original one, ensure that the highlighted one is used //If our non-highlighted value matches our original one, ensure that the highlighted one is used
DiscoverHitHighlightingField highlightConfig = queryArgs.getHitHighlightingField(metadataKey); DiscoverHitHighlightingField highlightConfig = queryArgs.getHitHighlightingField(metadataKey);
//We might also have it configured for ALL ! //We might also have it configured for ALL !
if(highlightConfig == null) if(highlightConfig == null)
@@ -657,7 +657,7 @@ public abstract class AbstractSearch extends AbstractDSpaceTransformer implement
} }
/** /**
* Add options to the search scope field. This field determines in what * Add options to the search scope field. This field determines in which
* communities or collections to search for the query. * communities or collections to search for the query.
* <p/> * <p/>
* The scope list will depend upon the current search scope. There are three * The scope list will depend upon the current search scope. There are three
@@ -796,7 +796,7 @@ public abstract class AbstractSearch extends AbstractDSpaceTransformer implement
//queryArgs.a type:Article^2 //queryArgs.a type:Article^2
// TODO: This is a hack to get Publications (Articles) to always be at the top of Groups. // TODO: This is a hack to get Publications (Articles) to always be at the top of Groups.
// TODO: I think the can be more transparently done in the solr solrconfig.xml with DISMAX and boosting // TODO: I think that can be more transparently done in the solr solrconfig.xml with DISMAX and boosting
/** sort in groups to get publications to top */ /** sort in groups to get publications to top */
queryArgs.setSortField("dc.type", DiscoverQuery.SORT_ORDER.asc); queryArgs.setSortField("dc.type", DiscoverQuery.SORT_ORDER.asc);
@@ -848,7 +848,7 @@ public abstract class AbstractSearch extends AbstractDSpaceTransformer implement
/** /**
* Returns all the filter queries for use by solr * Returns all the filter queries for use by solr
* This method returns more expanded filter queries then the getParameterFilterQueries * This method returns more expanded filter queries then the getParameterFilterQueries
* @return an array containing the filter queries * @return an array containing the filter queries
*/ */
protected String[] getFilterQueries() { protected String[] getFilterQueries() {
@@ -968,7 +968,7 @@ public abstract class AbstractSearch extends AbstractDSpaceTransformer implement
/** /**
* Add sort by options, the gear will be rendered by a combination fo javascript & css * Add sort by options, the gear will be rendered by a combination of javascript & css
*/ */
String currentSort = getParameterSortBy(); String currentSort = getParameterSortBy();
org.dspace.app.xmlui.wing.element.List sortList = searchControlsGear.addList("sort-options", org.dspace.app.xmlui.wing.element.List.TYPE_SIMPLE, "gear-selection"); org.dspace.app.xmlui.wing.element.List sortList = searchControlsGear.addList("sort-options", org.dspace.app.xmlui.wing.element.List.TYPE_SIMPLE, "gear-selection");

2
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/BrowseFacet.java
View File

@@ -111,7 +111,7 @@ public class BrowseFacet extends AbstractDSpaceTransformer implements CacheableP
* <p/> * <p/>
* The validity object will include the collection being viewed and * The validity object will include the collection being viewed and
* all recently submitted items. This does not include the community / collection * all recently submitted items. This does not include the community / collection
* hierarch, when this changes they will not be reflected in the cache. * hierarchy, when this changes they will not be reflected in the cache.
*/ */
public SourceValidity getValidity() { public SourceValidity getValidity() {
if (this.validity == null) { if (this.validity == null) {

2
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/CollectionSearch.java
View File

@@ -100,7 +100,7 @@ public class CollectionSearch extends AbstractDSpaceTransformer implements Cache
* *
* The validity object will include the collection being viewed and * The validity object will include the collection being viewed and
* all recently submitted items. This does not include the community / collection * all recently submitted items. This does not include the community / collection
* hierarch, when this changes they will not be reflected in the cache. * hierarchy, when this changes they will not be reflected in the cache.
*/ */
public SourceValidity getValidity() public SourceValidity getValidity()
{ {

2
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SearchFacetFilter.java
View File

@@ -125,7 +125,7 @@ public class SearchFacetFilter extends AbstractDSpaceTransformer implements Cach
* <p/> * <p/>
* The validity object will include the collection being viewed and * The validity object will include the collection being viewed and
* all recently submitted items. This does not include the community / collection * all recently submitted items. This does not include the community / collection
* hierarch, when this changes they will not be reflected in the cache. * hierarchy, when this changes they will not be reflected in the cache.
*/ */
public SourceValidity getValidity() { public SourceValidity getValidity() {
if (this.validity == null) { if (this.validity == null) {

26
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SidebarFacetsTransformer.java
View File

@@ -43,7 +43,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** /**
* Renders the side bar filters in discovery * Renders the sidebar filters in Discovery
* *
* @author Kevin Van de Velde (kevin at atmire dot com) * @author Kevin Van de Velde (kevin at atmire dot com)
* @author Mark Diggory (markd at atmire dot com) * @author Mark Diggory (markd at atmire dot com)
@@ -106,7 +106,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen
* <p/> * <p/>
* The validity object will include the collection being viewed and * The validity object will include the collection being viewed and
* all recently submitted items. This does not include the community / collection * all recently submitted items. This does not include the community / collection
* hierarch, when this changes they will not be reflected in the cache. * hierarchy, when this changes they will not be reflected in the cache.
*/ */
public SourceValidity getValidity() { public SourceValidity getValidity() {
if (this.validity == null) { if (this.validity == null) {
@@ -203,7 +203,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen
if (facetValues != null && 0 < facetValues.size()) { if (facetValues != null && 0 < facetValues.size()) {
if(browse == null){ if(browse == null){
//Since we have a value it is save to add the sidebar (doing it this way will ensure that we do not end up with an empty sidebar) //Since we have a value it is safe to add the sidebar (doing it this way will ensure that we do not end up with an empty sidebar)
browse = options.addList("discovery"); browse = options.addList("discovery");
browse.setHead(T_FILTER_HEAD); browse.setHead(T_FILTER_HEAD);
@@ -219,7 +219,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen
if (!iter.hasNext()) if (!iter.hasNext())
{ {
//When we have an hierarchical facet always show the view more they may want to filter the children of the top nodes //When we have an hierarchical facet always show the "view more" they may want to filter the children of the top nodes
if(field.getType().equals(DiscoveryConfigurationParameters.TYPE_HIERARCHICAL)){ if(field.getType().equals(DiscoveryConfigurationParameters.TYPE_HIERARCHICAL)){
addViewMoreUrl(filterValsList, dso, request, field.getIndexFieldName()); addViewMoreUrl(filterValsList, dso, request, field.getIndexFieldName());
} }
@@ -249,7 +249,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen
); );
} }
} }
//Show a view more url should there be more values, unless we have a date //Show a "view more" url should there be more values, unless we have a date
if (i == shownFacets - 1 && !field.getType().equals(DiscoveryConfigurationParameters.TYPE_DATE)/*&& facetField.getGap() == null*/) { if (i == shownFacets - 1 && !field.getType().equals(DiscoveryConfigurationParameters.TYPE_DATE)/*&& facetField.getGap() == null*/) {
addViewMoreUrl(filterValsList, dso, request, field.getIndexFieldName()); addViewMoreUrl(filterValsList, dso, request, field.getIndexFieldName());
} }
@@ -292,7 +292,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen
} }
} }
//Join all our parameters by using an "&" sign //Join all our parameters using an "&" sign
String parametersString = StringUtils.join(parameters.toArray(new String[parameters.size()]), "&"); String parametersString = StringUtils.join(parameters.toArray(new String[parameters.size()]), "&");
if(StringUtils.isNotEmpty(parametersString)){ if(StringUtils.isNotEmpty(parametersString)){
parametersString += "&"; parametersString += "&";
@@ -336,7 +336,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen
if(facet.getType().equals(DiscoveryConfigurationParameters.TYPE_DATE)){ if(facet.getType().equals(DiscoveryConfigurationParameters.TYPE_DATE)){
String dateFacet = facet.getIndexFieldName() + ".year"; String dateFacet = facet.getIndexFieldName() + ".year";
try{ try{
//Get a range query so we can create facet queries ranging from out first to our last date //Get a range query so we can create facet queries ranging from our first to our last date
//Attempt to determine our oldest & newest year by checking for previously selected filters //Attempt to determine our oldest & newest year by checking for previously selected filters
int oldestYear = -1; int oldestYear = -1;
int newestYear = -1; int newestYear = -1;
@@ -349,7 +349,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen
if(hasPattern){ if(hasPattern){
filterQuery = matcher.group(0); filterQuery = matcher.group(0);
//We have a range //We have a range
//Resolve our range to a first & endyear //Resolve our range to a first & last year
int tempOldYear = Integer.parseInt(filterQuery.split(" TO ")[0].replace("[", "").trim()); int tempOldYear = Integer.parseInt(filterQuery.split(" TO ")[0].replace("[", "").trim());
int tempNewYear = Integer.parseInt(filterQuery.split(" TO ")[1].replace("]", "").trim()); int tempNewYear = Integer.parseInt(filterQuery.split(" TO ")[1].replace("]", "").trim());
@@ -372,7 +372,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen
} }
} }
} }
//Check if we have found a range, if not then retrieve our first & last year by using solr //Check if we have found a range, if not then retrieve our first & last year using Solr
if(oldestYear == -1 && newestYear == -1){ if(oldestYear == -1 && newestYear == -1){
DiscoverQuery yearRangeQuery = new DiscoverQuery(); DiscoverQuery yearRangeQuery = new DiscoverQuery();
@@ -410,7 +410,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen
} }
int gap = 1; int gap = 1;
//Attempt to retrieve our gap by the algorithm below //Attempt to retrieve our gap using the algorithm below
int yearDifference = newestYear - oldestYear; int yearDifference = newestYear - oldestYear;
if(yearDifference != 0){ if(yearDifference != 0){
while (10 < ((double)yearDifference / gap)){ while (10 < ((double)yearDifference / gap)){
@@ -428,7 +428,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen
queryArgs.addFacetField(new DiscoverFacetField(facet.getIndexFieldName(), facet.getType(), 10, facet.getSortOrder())); queryArgs.addFacetField(new DiscoverFacetField(facet.getIndexFieldName(), facet.getType(), 10, facet.getSortOrder()));
}else{ }else{
java.util.List<String> facetQueries = new ArrayList<String>(); java.util.List<String> facetQueries = new ArrayList<String>();
//Create facet queries but limit then to 11 (11 == when we need to show a show more url) //Create facet queries but limit them to 11 (11 == when we need to show a "show more" url)
for(int year = topYear; year > oldestYear && (facetQueries.size() < 11); year-=gap){ for(int year = topYear; year > oldestYear && (facetQueries.size() < 11); year-=gap){
//Add a filter to remove the last year only if we aren't the last year //Add a filter to remove the last year only if we aren't the last year
int bottomYear = year - gap; int bottomYear = year - gap;
@@ -456,11 +456,11 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen
} }
} }
}catch (Exception e){ }catch (Exception e){
log.error(LogManager.getHeader(context, "Error in discovery while setting up date facet range", "date facet: " + dateFacet), e); log.error(LogManager.getHeader(context, "Error in Discovery while setting up date facet range", "date facet: " + dateFacet), e);
} }
}else{ }else{
int facetLimit = facet.getFacetLimit(); int facetLimit = facet.getFacetLimit();
//Add one to our facet limit to make sure that if we have more then the shown facets that we show our show more url //Add one to our facet limit to make sure that if we have more then the shown facets that we show our "show more" url
facetLimit++; facetLimit++;
queryArgs.addFacetField(new DiscoverFacetField(facet.getIndexFieldName(), facet.getType(), facetLimit, facet.getSortOrder())); queryArgs.addFacetField(new DiscoverFacetField(facet.getIndexFieldName(), facet.getType(), facetLimit, facet.getSortOrder()));
} }

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

@@ -162,7 +162,7 @@ public class SimpleSearch extends AbstractSearch implements CacheableProcessingC
if(0 < filterFields.size() && filterTypes.size() == 0) if(0 < filterFields.size() && filterTypes.size() == 0)
{ {
//Display the add filters url ONLY if we have no filters selected & fitlers can be added //Display the add filters url ONLY if we have no filters selected & filters can be added
searchList.addItem().addXref("display-filters", T_filters_show); searchList.addItem().addXref("display-filters", T_filters_show);
} }
addHiddenFormFields("search", request, fqs, mainSearchDiv); addHiddenFormFields("search", request, fqs, mainSearchDiv);

2
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/CollectionViewer.java
View File

@@ -79,7 +79,7 @@ public class CollectionViewer extends AbstractDSpaceTransformer implements Cache
* *
* The validity object will include the collection being viewed and * The validity object will include the collection being viewed and
* all recently submitted items. This does not include the community / collection * all recently submitted items. This does not include the community / collection
* hierarch, when this changes they will not be reflected in the cache. * hierarchy, when this changes they will not be reflected in the cache.
*/ */
public SourceValidity getValidity() public SourceValidity getValidity()
{ {

2
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/CompletedStep.java
View File

@@ -21,7 +21,7 @@ import org.dspace.authorize.AuthorizeException;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
/** /**
* This is a conformation page informing the user that they have * This is a confirmation page informing the user that they have
* completed the submission of the item. It tells them what to * completed the submission of the item. It tells them what to
* expect next, i.e. the workflow, and gives the option to go home * expect next, i.e. the workflow, and gives the option to go home
* or start another submission. * or start another submission.

4
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/LicenseStep.java
View File

@@ -83,7 +83,7 @@ public class LicenseStep extends AbstractSubmissionStep
UIException, SQLException, IOException, AuthorizeException UIException, SQLException, IOException, AuthorizeException
{ {
// Get the full text for the actuial licese // Get the full text for the actual licese
Collection collection = submission.getCollection(); Collection collection = submission.getCollection();
String actionURL = contextPath + "/handle/"+collection.getHandle() + "/submit/" + knot.getId() + ".continue"; String actionURL = contextPath + "/handle/"+collection.getHandle() + "/submit/" + knot.getId() + ".continue";
String licenseText = LicenseUtils.getLicenseText(context String licenseText = LicenseUtils.getLicenseText(context
@@ -112,7 +112,7 @@ public class LicenseStep extends AbstractSubmissionStep
decision.setLabel(T_decision_label); decision.setLabel(T_decision_label);
decision.addOption("accept",T_decision_checkbox); decision.addOption("accept",T_decision_checkbox);
// If user did not check "I accept" checkbox // If user did not check the "I accept" checkbox
if(this.errorFlag==org.dspace.submit.step.LicenseStep.STATUS_LICENSE_REJECTED) if(this.errorFlag==org.dspace.submit.step.LicenseStep.STATUS_LICENSE_REJECTED)
{ {
log.info(LogManager.getHeader(context, "reject_license", submissionInfo.getSubmissionLogInfo())); log.info(LogManager.getHeader(context, "reject_license", submissionInfo.getSubmissionLogInfo()));

6
dspace-xmlui/src/main/java/org/dspace/app/xmlui/objectmanager/AbstractAdapter.java
View File

@@ -680,11 +680,11 @@ public abstract class AbstractAdapter
AttributesImpl attributes = new AttributesImpl(); AttributesImpl attributes = new AttributesImpl();
for (AttributeMap attributeMap : attributeMaps) for (AttributeMap attributeMap : attributeMaps)
{ {
boolean diffrentNamespaces = false; boolean differentNamespaces = false;
Namespace attributeNamespace = attributeMap.getNamespace(); Namespace attributeNamespace = attributeMap.getNamespace();
if (attributeNamespace != null && !(attributeNamespace.URI.equals(elementNamespace.URI))) if (attributeNamespace != null && !(attributeNamespace.URI.equals(elementNamespace.URI)))
{ {
diffrentNamespaces = true; differentNamespaces = true;
} }
// copy each one over. // copy each one over.
@@ -695,7 +695,7 @@ public abstract class AbstractAdapter
continue; continue;
} }
if (diffrentNamespaces) if (differentNamespaces)
{ {
attributes.addAttribute(attributeNamespace.URI, attr.getKey(), attributes.addAttribute(attributeNamespace.URI, attr.getKey(),
qName(attributeNamespace, attr.getKey()), "CDATA", attr.getValue()); qName(attributeNamespace, attr.getKey()), "CDATA", attr.getValue());

6
dspace-xmlui/src/main/java/org/dspace/app/xmlui/utils/DSpaceValidity.java
View File

@@ -108,7 +108,7 @@ public class DSpaceValidity implements SourceValidity
/** /**
* Set the time delay for how long this cache will be assumed * Set the time delay for how long this cache will be assumed
* to be valid. When it is assumed valid no other checks will be * to be valid. When it is assumed valid no other checks will be
* made to consider it's validity, and once the time has expired * made to consider its validity, and once the time has expired
* a full validation will occur on the next cache hit. If the * a full validation will occur on the next cache hit. If the
* cache proves to be validated on this hit then the assumed * cache proves to be validated on this hit then the assumed
* validity timer is reset. * validity timer is reset.
@@ -390,7 +390,7 @@ public class DSpaceValidity implements SourceValidity
/** /**
* This method is used during serializion. When tomcat is shutdown cocoon's in-memory * This method is used during serializion. When Tomcat is shutdown, Cocoon's in-memory
* cache is serialized and written to disk to later be read back into memory on start * cache is serialized and written to disk to later be read back into memory on start
* up. When this class is read back into memory the readObject(stream) method will be * up. When this class is read back into memory the readObject(stream) method will be
* called. * called.
@@ -448,7 +448,7 @@ public class DSpaceValidity implements SourceValidity
} }
else else
{ {
// This is an error, state. We are being asked whether we are valid before // This is an error state. We are being asked whether we are valid before
// we have been initialized. // we have been initialized.
return SourceValidity.INVALID; return SourceValidity.INVALID;
} }

2
dspace-xmlui/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap
View File

@@ -67,7 +67,7 @@ and searching the repository.
<map:generate/> <map:generate/>
<!-- <!--
Add the basic navigation content to everypage. This includes: Add the basic navigation content to every page. This includes:
1) Metadata about the current page (really just what the current 1) Metadata about the current page (really just what the current
context path is) context path is)

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

@@ -66,7 +66,7 @@ and searching the repository.
<map:generate/> <map:generate/>
<!-- <!--
Add the basic navigation content to everypage. This includes: Add the basic navigation content to every page. This includes:
1) Metadata about the current page (really just what the current 1) Metadata about the current page (really just what the current
context path is) context path is)

2
dspace-xmlui/src/main/resources/aspects/Feedback/sitemap.xmap
View File

@@ -44,7 +44,7 @@ and searching the repository.
<map:generate/> <map:generate/>
<!-- <!--
Add the basic navigation content to everypage. This includes: Add the basic navigation content to every page. This includes:
1) Metadata about the current page (really just what the current 1) Metadata about the current page (really just what the current
context path is) context path is)

2
dspace-xmlui/src/main/resources/aspects/SearchArtifacts/sitemap.xmap
View File

@@ -64,7 +64,7 @@ and searching the repository.
<map:generate/> <map:generate/>
<!-- <!--
Add the basic navigation content to everypage. This includes: Add the basic navigation content to every page. This includes:
1) Metadata about the current page (really just what the current 1) Metadata about the current page (really just what the current
context path is) context path is)

2
dspace-xmlui/src/main/resources/aspects/ViewArtifacts/sitemap.xmap
View File

@@ -76,7 +76,7 @@ and searching the repository.
<map:generate/> <map:generate/>
<!-- <!--
Add the basic navigation content to everypage. This includes: Add the basic navigation content to every page. This includes:
1) Metadata about the current page (really just what the current 1) Metadata about the current page (really just what the current
context path is) context path is)

2
dspace-xmlui/src/main/resources/aspects/XMLWorkflow/i18n/messages.xml
View File

@@ -25,7 +25,7 @@
<message key="xmlui.XMLWorkflow.workflow.ClaimAction.info1">Actions you may perform on this task:</message> <message key="xmlui.XMLWorkflow.workflow.ClaimAction.info1">Actions you may perform on this task:</message>
<message key="xmlui.XMLWorkflow.workflow.ClaimAction.take_help">Assign this task to yourself.</message> <message key="xmlui.XMLWorkflow.workflow.ClaimAction.take_help">Assign this task to yourself.</message>
<message key="xmlui.XMLWorkflow.workflow.ClaimAction.take_submit">Take task</message> <message key="xmlui.XMLWorkflow.workflow.ClaimAction.take_submit">Take task</message>
<message key="xmlui.XMLWorkflow.workflow.ClaimAction.leave_help">Leave this task in the pool for another to take.</message> <message key="xmlui.XMLWorkflow.workflow.ClaimAction.leave_help">Leave this task in the pool for another user to take.</message>
<message key="xmlui.XMLWorkflow.workflow.ClaimAction.leave_submit">Leave task</message> <message key="xmlui.XMLWorkflow.workflow.ClaimAction.leave_submit">Leave task</message>
<message key="xmlui.XMLWorkflow.workflow.ClaimAction.back">Back to overview</message> <message key="xmlui.XMLWorkflow.workflow.ClaimAction.back">Back to overview</message>
<message key="xmlui.XMLWorkflow.workflow.ClaimAction.title">Accept/Reject Task</message> <message key="xmlui.XMLWorkflow.workflow.ClaimAction.title">Accept/Reject Task</message>

2
dspace-xmlui/src/main/webapp/i18n/messages.xml
View File

@@ -889,7 +889,7 @@
<message key="xmlui.Submission.workflow.PerformTaskStep.info1">Actions you may perform on this task:</message> <message key="xmlui.Submission.workflow.PerformTaskStep.info1">Actions you may perform on this task:</message>
<message key="xmlui.Submission.workflow.PerformTaskStep.take_help">Assign this task to yourself.</message> <message key="xmlui.Submission.workflow.PerformTaskStep.take_help">Assign this task to yourself.</message>
<message key="xmlui.Submission.workflow.PerformTaskStep.take_submit">Take task</message> <message key="xmlui.Submission.workflow.PerformTaskStep.take_submit">Take task</message>
<message key="xmlui.Submission.workflow.PerformTaskStep.leave_help">Leave this task in the pool for another to take.</message> <message key="xmlui.Submission.workflow.PerformTaskStep.leave_help">Leave this task in the pool for another user to take.</message>
<message key="xmlui.Submission.workflow.PerformTaskStep.leave_submit">Leave task</message> <message key="xmlui.Submission.workflow.PerformTaskStep.leave_submit">Leave task</message>
<message key="xmlui.Submission.workflow.PerformTaskStep.approve_help">If you have reviewed the item and it is suitable for inclusion in the collection, select "Approve".</message> <message key="xmlui.Submission.workflow.PerformTaskStep.approve_help">If you have reviewed the item and it is suitable for inclusion in the collection, select "Approve".</message>
<message key="xmlui.Submission.workflow.PerformTaskStep.approve_submit">Approve item</message> <message key="xmlui.Submission.workflow.PerformTaskStep.approve_submit">Approve item</message>

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

@@ -167,7 +167,7 @@
</xsl:if> </xsl:if>
</xsl:attribute> </xsl:attribute>
</meta> </meta>
<!-- Add stylsheets --> <!-- Add stylesheets -->
<xsl:for-each select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='stylesheet']"> <xsl:for-each select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='stylesheet']">
<link rel="stylesheet" type="text/css"> <link rel="stylesheet" type="text/css">
<xsl:attribute name="media"> <xsl:attribute name="media">

4
dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/discovery.xsl
View File

@@ -22,8 +22,8 @@
<xsl:output indent="yes"/> <xsl:output indent="yes"/>
<!-- <!--
These templaes are devoted to rendering the search results for discovery. These templates are devoted to rendering the search results for Discovery.
Since discovery used hit highlighting seperate templates are required ! Since Discovery uses hit highlighting separate templates are required !
--> -->

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

@@ -113,7 +113,7 @@
</xsl:if> </xsl:if>
</xsl:attribute> </xsl:attribute>
</meta> </meta>
<!-- Add stylsheets --> <!-- Add stylesheets -->
<xsl:for-each select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='stylesheet']"> <xsl:for-each select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='stylesheet']">
<link rel="stylesheet" type="text/css"> <link rel="stylesheet" type="text/css">
<xsl:attribute name="media"> <xsl:attribute name="media">

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

@@ -161,7 +161,7 @@
</xsl:if> </xsl:if>
</xsl:attribute> </xsl:attribute>
</meta> </meta>
<!-- Add stylsheets --> <!-- Add stylesheets -->
<xsl:for-each select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='stylesheet']"> <xsl:for-each select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='stylesheet']">
<link rel="stylesheet" type="text/css"> <link rel="stylesheet" type="text/css">
<xsl:attribute name="media"> <xsl:attribute name="media">

2
dspace/config/crosswalks/QDC.properties
View File

@@ -5,7 +5,7 @@
# (See http://dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd # (See http://dublincore.org/schemas/xmls/qdc/2003/04/02/dc.xsd
# and http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcterms.xsd ) # and http://dublincore.org/schemas/xmls/qdc/2003/04/02/dcterms.xsd )
# #
# See org.dspace.content.crosswwalk.QDCCrosswalk for documentation. # See org.dspace.content.crosswalk.QDCCrosswalk for documentation.
# #
# Author: Larry Stone # Author: Larry Stone
# Revision: $Revision$ # Revision: $Revision$

10
dspace/config/modules/oai.cfg
View File

@@ -35,9 +35,9 @@ cache.dir = ${dspace.dir}/var/oai
### Harvester settings ### Harvester settings
# Crosswalk settings; the {name} value must correspond to a declated ingestion crosswalk # Crosswalk settings; the {name} value must correspond to a declared ingestion crosswalk
# harvester.oai.metadataformats.{name} = {namespace},{optional display name} # harvester.oai.metadataformats.{name} = {namespace},{optional display name}
# The display name is only used in the xmlui for the jspui there are entries in the # The display name is only used in the xmlui; for the jspui there are entries in the
# Messages.properties in the form jsp.tools.edit-collection.form.label21.select.{name} # Messages.properties in the form jsp.tools.edit-collection.form.label21.select.{name}
harvester.oai.metadataformats.dc = http://www.openarchives.org/OAI/2.0/oai_dc/, Simple Dublin Core harvester.oai.metadataformats.dc = http://www.openarchives.org/OAI/2.0/oai_dc/, Simple Dublin Core
harvester.oai.metadataformats.qdc = http://purl.org/dc/terms/, Qualified Dublin Core harvester.oai.metadataformats.qdc = http://purl.org/dc/terms/, Qualified Dublin Core
@@ -53,17 +53,17 @@ harvester.oai.metadataformats.dim = http://www.dspace.org/xmlns/dspace/dim, DSpa
# default: false # default: false
harvester.autoStart=false harvester.autoStart=false
# Amount of time subtracted from the from argument of the PMH request to account # Amount of time subtracted from the "from" argument of the OAI-PMH request to account
# for the time taken to negotiate a connection. Measured in seconds. Default value is 120. # for the time taken to negotiate a connection. Measured in seconds. Default value is 120.
#harvester.timePadding = 120 #harvester.timePadding = 120
# How frequently the harvest scheduler checks the remote provider for updates, # How frequently the harvest scheduler checks the remote provider for updates,
# messured in minutes. The default vaule is 12 hours (or 720 minutes) # measured in minutes. The default vaule is 12 hours (or 720 minutes)
#harvester.harvestFrequency = 720 #harvester.harvestFrequency = 720
# The heartbeat is the frequency at which the harvest scheduler queries the local # The heartbeat is the frequency at which the harvest scheduler queries the local
# database to determine if any collections are due for a harvest cycle (based on # database to determine if any collections are due for a harvest cycle (based on
# the harvestFrequency) value. The scheduler is optimized to then sleep until the # the harvestFrequency) value. The scheduler is optimized to sleep after the check until the
# next collection is actually ready to be harvested. The minHeartbeat and # next collection is actually ready to be harvested. The minHeartbeat and
# maxHeartbeat are the lower and upper bounds on this timeframe. Measured in seconds. # maxHeartbeat are the lower and upper bounds on this timeframe. Measured in seconds.
# Default minHeartbeat is 30. Default maxHeartbeat is 3600. # Default minHeartbeat is 30. Default maxHeartbeat is 3600.

4
dspace/config/spring/api/requestitem.xml
View File

@@ -25,8 +25,8 @@
Uncomment these properties if you want lookup in metadata the email and the name of the author to contact for request copy. Uncomment these properties if you want lookup in metadata the email and the name of the author to contact for request copy.
If you don't configure that or if the requested item doesn't have these metadata the submitter data are used as fail over If you don't configure that or if the requested item doesn't have these metadata the submitter data are used as fail over
<property name="emailMetadata" value="schema.element.qualfier" /> <property name="emailMetadata" value="schema.element.qualifier" />
<property name="fullNameMatadata" value="schema.element.qualfier" /> <property name="fullNameMatadata" value="schema.element.qualifier" />
--> -->
</bean> </bean>

2
dspace/solr/statistics/conf/schema.xml
View File

@@ -246,7 +246,7 @@
string matched by the pattern. string matched by the pattern.
See the Java Regular Expression documentation for more See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax. information on pattern and replacement string syntax.
http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
--> -->