diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java index c73d5b5f85..2b1920aeef 100644 --- a/dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java +++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java @@ -45,19 +45,19 @@ public class DSpaceCSV implements Serializable /** The value separator (defaults to double pipe '||') */ 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; /** The field separator (defaults to comma) */ 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; - /** The authority separator (defaults to dobule colon '::') */ + /** The authority separator (defaults to double colon '::') */ 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; @@ -451,7 +451,7 @@ public class DSpaceCSV implements Serializable */ 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; if (line.endsWith(fieldSeparator)) { diff --git a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java index 966fb3f76c..f26e6ff6f9 100644 --- a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java +++ b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExport.java @@ -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) { Thread go = new Thread() diff --git a/dspace-api/src/main/java/org/dspace/app/sfx/SFXFileReader.java b/dspace-api/src/main/java/org/dspace/app/sfx/SFXFileReader.java index 6a095942ab..ae86947bfd 100644 --- a/dspace-api/src/main/java/org/dspace/app/sfx/SFXFileReader.java +++ b/dspace-api/src/main/java/org/dspace/app/sfx/SFXFileReader.java @@ -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 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 { - // Parse XML file -> XML document will be build + // Parse XML file -> XML document will be built if (doc == null) { doc = parseFile(fileName); diff --git a/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java index 04e54394a7..75e0ca7c4e 100644 --- a/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java +++ b/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java @@ -410,7 +410,7 @@ public class LDAPAuthentication if ((adminUser != null) && (!adminUser.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_PRINCIPAL, adminUser); env.put(javax.naming.Context.SECURITY_CREDENTIALS, adminPassword); diff --git a/dspace-api/src/main/java/org/dspace/content/Community.java b/dspace-api/src/main/java/org/dspace/content/Community.java index 9cc4311670..ed632e7e7f 100644 --- a/dspace-api/src/main/java/org/dspace/content/Community.java +++ b/dspace-api/src/main/java/org/dspace/content/Community.java @@ -802,7 +802,7 @@ public class Community extends DSpaceObject /** * 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 diff --git a/dspace-api/src/main/java/org/dspace/core/Constants.java b/dspace-api/src/main/java/org/dspace/core/Constants.java index 0d22fc0496..e70e5abe2f 100644 --- a/dspace-api/src/main/java/org/dspace/core/Constants.java +++ b/dspace-api/src/main/java/org/dspace/core/Constants.java @@ -142,8 +142,8 @@ public class Constants "DEFAULT_BITSTREAM_READ", "DEFAULT_ITEM_READ", "ADMIN" }; /** - * constants for the relevance array generating dynamicallis is simple: just - * 1 < < TYPE + * generating constants for the relevance array dynamically is simple: just + * 1 << TYPE */ 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 - * 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 * 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 = { RBITSTREAM | RBUNDLE | RITEM | RCOLLECTION | RCOMMUNITY, // 0 - READ diff --git a/dspace-api/src/main/java/org/dspace/ctask/general/MetadataValueLinkChecker.java b/dspace-api/src/main/java/org/dspace/ctask/general/MetadataValueLinkChecker.java index 5c3cf49e65..61d244832d 100644 --- a/dspace-api/src/main/java/org/dspace/ctask/general/MetadataValueLinkChecker.java +++ b/dspace-api/src/main/java/org/dspace/ctask/general/MetadataValueLinkChecker.java @@ -17,7 +17,7 @@ import java.util.List; * 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:// * - * 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 */ diff --git a/dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java b/dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java index b50c6e2161..47cd55a91f 100644 --- a/dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java +++ b/dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java @@ -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. */ private static Namespace getORENamespace() { diff --git a/dspace-api/src/main/java/org/dspace/statistics/SolrLogger.java b/dspace-api/src/main/java/org/dspace/statistics/SolrLogger.java index 6465e9f505..2e9ec47f96 100644 --- a/dspace-api/src/main/java/org/dspace/statistics/SolrLogger.java +++ b/dspace-api/src/main/java/org/dspace/statistics/SolrLogger.java @@ -1277,7 +1277,7 @@ public class SolrLogger 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(); yearRangeQuery.setQuery("*:*"); diff --git a/dspace-api/src/main/resources/spring/spring-dspace-addon-requestitem-services.xml b/dspace-api/src/main/resources/spring/spring-dspace-addon-requestitem-services.xml index da85ffd29a..c7e5c6f9ff 100644 --- a/dspace-api/src/main/resources/spring/spring-dspace-addon-requestitem-services.xml +++ b/dspace-api/src/main/resources/spring/spring-dspace-addon-requestitem-services.xml @@ -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. If you don't configure that or if the requested item doesn't have these metadata the submitter data are used as fail over - - + + --> diff --git a/dspace-api/src/test/java/org/dspace/storage/rdbms/MockDatabaseManager.java b/dspace-api/src/test/java/org/dspace/storage/rdbms/MockDatabaseManager.java index d43016f652..f88019fae6 100644 --- a/dspace-api/src/test/java/org/dspace/storage/rdbms/MockDatabaseManager.java +++ b/dspace-api/src/test/java/org/dspace/storage/rdbms/MockDatabaseManager.java @@ -1695,7 +1695,7 @@ public class MockDatabaseManager //exist in the file 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); Statement st = con.createStatement(); diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/JSPStep.java b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/JSPStep.java index 73daa3b7d7..456eaac293 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/JSPStep.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/JSPStep.java @@ -36,9 +36,9 @@ import org.dspace.core.Context; *
  • If showJSP() was specified from doPreProcessing(), then the JSP * specified will be displayed
    • *
  • If showJSP() was not specified from doPreProcessing(), then the - * doProcessing() method is called an the step completes immediately
    • - *
  • Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order - * to process the user input
    • + * doProcessing() method is called and the step completes immediately + *
  • Call doProcessing() method on appropriate AbstractProcessingStep after + * the user returns from the JSP, in order to process the user input
    • *
  • Call doPostProcessing() method to determine if more user interaction is * required, and if further JSPs need to be called.
    • *
  • If there are more "pages" in this step then, the process begins again diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPCCLicenseStep.java b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPCCLicenseStep.java index 93ad9e6c47..276099fac6 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPCCLicenseStep.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPCCLicenseStep.java @@ -42,9 +42,9 @@ import java.sql.SQLException; *
  • If showJSP() was specified from doPreProcessing(), then the JSP * specified will be displayed
    • *
  • If showJSP() was not specified from doPreProcessing(), then the - * doProcessing() method is called an the step completes immediately
    • - *
  • Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order - * to process the user input
    • + * doProcessing() method is called and the step completes immediately + *
  • Call doProcessing() method on appropriate AbstractProcessingStep after + * the user returns from the JSP, in order to process the user input
    • *
  • Call doPostProcessing() method to determine if more user interaction is * required, and if further JSPs need to be called.
    • *
  • If there are more "pages" in this step then, the process begins again diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPDescribeStep.java b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPDescribeStep.java index 86b14fe80a..f367852eb2 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPDescribeStep.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPDescribeStep.java @@ -45,9 +45,9 @@ import org.dspace.submit.step.DescribeStep; *
  • If showJSP() was specified from doPreProcessing(), then the JSP * specified will be displayed
    • *
  • If showJSP() was not specified from doPreProcessing(), then the - * doProcessing() method is called an the step completes immediately
    • - *
  • Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order - * to process the user input
    • + * doProcessing() method is called and the step completes immediately + *
  • Call doProcessing() method on appropriate AbstractProcessingStep after + * the user returns from the JSP, in order to process the user input
    • *
  • Call doPostProcessing() method to determine if more user interaction is * required, and if further JSPs need to be called.
    • *
  • If there are more "pages" in this step then, the process begins again diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPInitialQuestionsStep.java b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPInitialQuestionsStep.java index 64f39a302e..7a775366b4 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPInitialQuestionsStep.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPInitialQuestionsStep.java @@ -39,9 +39,9 @@ import org.dspace.submit.step.InitialQuestionsStep; *
  • If showJSP() was specified from doPreProcessing(), then the JSP * specified will be displayed
    • *
  • If showJSP() was not specified from doPreProcessing(), then the - * doProcessing() method is called an the step completes immediately
    • - *
  • Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order - * to process the user input
    • + * doProcessing() method is called and the step completes immediately + *
  • Call doProcessing() method on appropriate AbstractProcessingStep after + * the user returns from the JSP, in order to process the user input
    • *
  • Call doPostProcessing() method to determine if more user interaction is * required, and if further JSPs need to be called.
    • *
  • If there are more "pages" in this step then, the process begins again diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPLicenseStep.java b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPLicenseStep.java index 536c232513..0c022921f0 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPLicenseStep.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPLicenseStep.java @@ -44,9 +44,9 @@ import org.dspace.submit.step.LicenseStep; *
  • If showJSP() was specified from doPreProcessing(), then the JSP * specified will be displayed
    • *
  • If showJSP() was not specified from doPreProcessing(), then the - * doProcessing() method is called an the step completes immediately
    • - *
  • Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order - * to process the user input
    • + * doProcessing() method is called and the step completes immediately + *
  • Call doProcessing() method on appropriate AbstractProcessingStep after + * the user returns from the JSP, in order to process the user input
    • *
  • Call doPostProcessing() method to determine if more user interaction is * required, and if further JSPs need to be called.
    • *
  • If there are more "pages" in this step then, the process begins again diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPSampleStep.java b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPSampleStep.java index 4ba4c4a7b2..3f66c2a15e 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPSampleStep.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPSampleStep.java @@ -50,9 +50,9 @@ import org.dspace.submit.step.SampleStep; *
  • If showJSP() was specified from doPreProcessing(), then the JSP * specified will be displayed
    • *
  • If showJSP() was not specified from doPreProcessing(), then the - * doProcessing() method is called an the step completes immediately
    • - *
  • Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order - * to process the user input
    • + * doProcessing() method is called and the step completes immediately + *
  • Call doProcessing() method on appropriate AbstractProcessingStep after + * the user returns from the JSP, in order to process the user input
    • *
  • Call doPostProcessing() method to determine if more user interaction is * required, and if further JSPs need to be called.
    • *
  • If there are more "pages" in this step then, the process begins again diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPSelectCollectionStep.java b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPSelectCollectionStep.java index ced0d9bce4..91c5b9c265 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPSelectCollectionStep.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPSelectCollectionStep.java @@ -41,9 +41,9 @@ import org.dspace.submit.step.SelectCollectionStep; *
  • If showJSP() was specified from doPreProcessing(), then the JSP * specified will be displayed
    • *
  • If showJSP() was not specified from doPreProcessing(), then the - * doProcessing() method is called an the step completes immediately
    • - *
  • Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order - * to process the user input
    • + * doProcessing() method is called and the step completes immediately + *
  • Call doProcessing() method on appropriate AbstractProcessingStep after + * the user returns from the JSP, in order to process the user input
    • *
  • Call doPostProcessing() method to determine if more user interaction is * required, and if further JSPs need to be called.
    • *
  • If there are more "pages" in this step then, the process begins again diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPUploadStep.java b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPUploadStep.java index 8a3b0a5c24..685bcab2d5 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPUploadStep.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPUploadStep.java @@ -56,9 +56,9 @@ import com.google.gson.JsonElement; *
  • If showJSP() was specified from doPreProcessing(), then the JSP * specified will be displayed
    • *
  • If showJSP() was not specified from doPreProcessing(), then the - * doProcessing() method is called an the step completes immediately
    • - *
  • Call doProcessing() method on appropriate AbstractProcessingStep after the user returns from the JSP, in order - * to process the user input
    • + * doProcessing() method is called and the step completes immediately + *
  • Call doProcessing() method on appropriate AbstractProcessingStep after + * the user returns from the JSP, in order to process the user input
    • *
  • Call doPostProcessing() method to determine if more user interaction is * required, and if further JSPs need to be called.
    • *
  • If there are more "pages" in this step then, the process begins again diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPVerifyStep.java b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPVerifyStep.java index 22329a32ee..275c4495bf 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPVerifyStep.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPVerifyStep.java @@ -44,9 +44,9 @@ import org.dspace.core.LogManager; *
  • If showJSP() was specified from doPreProcessing(), then the JSP * specified will be displayed
    • *
  • If showJSP() was not specified from doPreProcessing(), then the - * doProcessing() method is called an the step completes immediately
    • - *
  • Call doProcessing() method after the user returns from the JSP, in order - * to process the user input
    • + * doProcessing() method is called and the step completes immediately + *
  • Call doProcessing() method on appropriate AbstractProcessingStep after + * the user returns from the JSP, in order to process the user input
    • *
  • Call doPostProcessing() method to determine if more user interaction is * required, and if further JSPs need to be called.
    • *
  • If there are more "pages" in this step then, the process begins again diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/util/XMLUtil.java b/dspace-jspui/src/main/java/org/dspace/app/webui/util/XMLUtil.java index 0d885fc463..2a453a6abc 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/util/XMLUtil.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/util/XMLUtil.java @@ -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(); dFactory.setNamespaceAware(true); DocumentBuilder dBuilder = dFactory.newDocumentBuilder(); diff --git a/dspace-sword/src/main/java/org/purl/sword/base/SWORDEntry.java b/dspace-sword/src/main/java/org/purl/sword/base/SWORDEntry.java index ba3d605658..a23f964891 100644 --- a/dspace-sword/src/main/java/org/purl/sword/base/SWORDEntry.java +++ b/dspace-sword/src/main/java/org/purl/sword/base/SWORDEntry.java @@ -32,7 +32,7 @@ public class SWORDEntry extends Entry protected SwordNoOp swordNoOp; /** - * Use to supply a verbose description. + * Used to supply a verbose description. */ protected SwordVerboseDescription swordVerboseDescription; @@ -49,7 +49,7 @@ public class SWORDEntry extends Entry protected SwordUserAgent swordUserAgent; /** - * The packaging infomation + * The packaging information */ private SwordPackaging swordPackaging; diff --git a/dspace-sword/src/main/java/org/purl/sword/client/SWORDClient.java b/dspace-sword/src/main/java/org/purl/sword/client/SWORDClient.java index 95b836c3cf..41fe686fce 100644 --- a/dspace-sword/src/main/java/org/purl/sword/client/SWORDClient.java +++ b/dspace-sword/src/main/java/org/purl/sword/client/SWORDClient.java @@ -15,77 +15,76 @@ import org.purl.sword.base.ServiceDocument; */ public interface SWORDClient { - /** - * 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 port The port number, e.g. 80. - */ - public void setServer( String server, int port ); - - /** - * Set the user credentials that are to be used for subsequent accesses. - * - * @param username The username. - * @param password The password. - */ - public void setCredentials( String username, String password ); + /** + * 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 port The port number, e.g. 80. + */ + public void setServer( String server, int port ); + + /** + * Set the user credentials that are to be used for subsequent accesses. + * + * @param username The username. + * @param password The password. + */ + public void setCredentials( String username, String password ); - /** + /** * Clear the credentials settings on the client. */ - public void clearCredentials(); + public void clearCredentials(); - /** - * Set the proxy that is to be used for subsequent accesses. - * - * @param host The host name, e.g. cache.host.com. - * @param port The port, e.g. 8080. - */ - public void setProxy( String host, int port ); - - /** - * Get the status result returned from the most recent network test. - * - * @return An the status code and message. - */ - public Status getStatus( ); - - /** - * Get a service document, specified in the URL. - * - * @param url The URL to connect to. - * @return A ServiceDocument that contains the Service details that were - * obained from the specified URL. - * - * @throws SWORDClientException If there is an error accessing the - * URL. - */ - public ServiceDocument getServiceDocument( String url ) throws SWORDClientException; - - /** - * Get a service document, specified in the URL. The document is accessed on - * behalf of the specified user. - * - * @param url The URL to connect to. - * @param onBehalfOf The username for the onBehalfOf access. - * @return A ServiceDocument that contains the Service details that were - * obained from the specified URL. - * - * @throws SWORDClientException If there is an error accessing the - * URL. - */ - public ServiceDocument getServiceDocument(String url, String onBehalfOf ) throws SWORDClientException; - - /** - * Post a file to the specified destination URL. - * - * @param message The message that defines the requirements for the operation. - * - * @return A DespoitResponse if the response is successful. If there was an error, - * null should be returned. - * - * @throws SWORDClientException If there is an error accessing the URL. - */ - public DepositResponse postFile( PostMessage message ) throws SWORDClientException; + /** + * Set the proxy that is to be used for subsequent accesses. + * + * @param host The host name, e.g. cache.host.com. + * @param port The port, e.g. 8080. + */ + public void setProxy( String host, int port ); + + /** + * Get the status result returned from the most recent network test. + * + * @return The status code and message. + */ + public Status getStatus( ); + + /** + * Get a service document, specified in the URL. + * + * @param url The URL to connect to. + * @return A ServiceDocument that contains the Service details that were + * obained from the specified URL. + * + * @throws SWORDClientException If there is an error accessing the + * URL. + */ + public ServiceDocument getServiceDocument( String url ) throws SWORDClientException; + + /** + * Get a service document, specified in the URL. The document is accessed on + * behalf of the specified user. + * + * @param url The URL to connect to. + * @param onBehalfOf The username for the onBehalfOf access. + * @return A ServiceDocument that contains the Service details that were + * obtained from the specified URL. + * + * @throws SWORDClientException If there is an error accessing the URL. + */ + public ServiceDocument getServiceDocument(String url, String onBehalfOf ) throws SWORDClientException; + + /** + * Post a file to the specified destination URL. + * + * @param message The message that defines the requirements for the operation. + * + * @return A DespoitResponse if the response is successful. If there was an error, + * null should be returned. + * + * @throws SWORDClientException If there is an error accessing the URL. + */ + public DepositResponse postFile( PostMessage message ) throws SWORDClientException; } diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/SearchItemForm.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/SearchItemForm.java index 89e712a97c..181a9c7fcd 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/SearchItemForm.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/SearchItemForm.java @@ -163,13 +163,13 @@ public class SearchItemForm extends AbstractDSpaceTransformer { /** * 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. */ private java.util.List performSearch(Collection collection, String query) throws SQLException, IOException { - // Search the repository + // Search the repository QueryArgs queryArgs = new QueryArgs(); queryArgs.setQuery(query); queryArgs.setPageSize(Integer.MAX_VALUE); diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionRecentSubmissions.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionRecentSubmissions.java index 4389ace1ff..2c0bea1d1b 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionRecentSubmissions.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionRecentSubmissions.java @@ -87,7 +87,7 @@ public class CollectionRecentSubmissions extends AbstractDSpaceTransformer imple * * The validity object will include the collection being viewed and * 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() { diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java index ff57c56d7c..57954909a3 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CollectionViewer.java @@ -83,7 +83,7 @@ public class CollectionViewer extends AbstractDSpaceTransformer implements Cache * * The validity object will include the collection being viewed and * 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() { diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityBrowser.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityBrowser.java index 1af28a08be..34a347cb1f 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityBrowser.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/CommunityBrowser.java @@ -47,7 +47,7 @@ import org.xml.sax.SAXException; /** * 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. * * The configuration option available: 999 @@ -106,7 +106,7 @@ public class CommunityBrowser extends AbstractDSpaceTransformer implements Cache /** * 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() { @@ -118,7 +118,7 @@ public class CommunityBrowser extends AbstractDSpaceTransformer implements Cache * Generate the cache validity object. * * 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() { @@ -352,7 +352,7 @@ public class CommunityBrowser extends AbstractDSpaceTransformer implements Cache TreeNode newRoot = new TreeNode(); - // Setup for breath-first traversal + // Setup for breadth-first traversal Stack stack = new Stack(); for (Community community : communities) @@ -364,7 +364,7 @@ public class CommunityBrowser extends AbstractDSpaceTransformer implements Cache { 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) { continue; diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/AbstractSearch.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/AbstractSearch.java index 037131ea72..467488ce92 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/AbstractSearch.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/AbstractSearch.java @@ -46,10 +46,10 @@ import java.util.List; /** * 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(). *

    - * See the implementors SimpleSearch. + * See the SimpleSearch implementation. * * @author Kevin Van de Velde (kevin 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 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", 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) { //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 metadataKey the metadata key {schema}.{element}.{qualifier} * @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 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); //We might also have it configured for ALL ! 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. *

    * 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 // 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 */ 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 - * 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 */ 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(); org.dspace.app.xmlui.wing.element.List sortList = searchControlsGear.addList("sort-options", org.dspace.app.xmlui.wing.element.List.TYPE_SIMPLE, "gear-selection"); diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/BrowseFacet.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/BrowseFacet.java index 582c9b2ea5..77fa2f66f7 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/BrowseFacet.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/BrowseFacet.java @@ -111,7 +111,7 @@ public class BrowseFacet extends AbstractDSpaceTransformer implements CacheableP *

    * The validity object will include the collection being viewed and * 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() { if (this.validity == null) { diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/CollectionSearch.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/CollectionSearch.java index df8c2bd2ba..0f5dcb2e56 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/CollectionSearch.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/CollectionSearch.java @@ -100,7 +100,7 @@ public class CollectionSearch extends AbstractDSpaceTransformer implements Cache * * The validity object will include the collection being viewed and * 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() { diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SearchFacetFilter.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SearchFacetFilter.java index 55a7009f5e..1a9914b604 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SearchFacetFilter.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SearchFacetFilter.java @@ -125,7 +125,7 @@ public class SearchFacetFilter extends AbstractDSpaceTransformer implements Cach *

    * The validity object will include the collection being viewed and * 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() { if (this.validity == null) { diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SidebarFacetsTransformer.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SidebarFacetsTransformer.java index 8af9ff5d1b..00573d67af 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SidebarFacetsTransformer.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SidebarFacetsTransformer.java @@ -43,7 +43,7 @@ import java.util.regex.Matcher; 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 Mark Diggory (markd at atmire dot com) @@ -106,7 +106,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen *

    * The validity object will include the collection being viewed and * 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() { if (this.validity == null) { @@ -203,7 +203,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen if (facetValues != null && 0 < facetValues.size()) { 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.setHead(T_FILTER_HEAD); @@ -219,7 +219,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen 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)){ 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*/) { 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()]), "&"); if(StringUtils.isNotEmpty(parametersString)){ parametersString += "&"; @@ -336,7 +336,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen if(facet.getType().equals(DiscoveryConfigurationParameters.TYPE_DATE)){ String dateFacet = facet.getIndexFieldName() + ".year"; 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 int oldestYear = -1; int newestYear = -1; @@ -349,7 +349,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen if(hasPattern){ filterQuery = matcher.group(0); //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 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){ DiscoverQuery yearRangeQuery = new DiscoverQuery(); @@ -410,7 +410,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen } 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; if(yearDifference != 0){ 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())); }else{ java.util.List facetQueries = new ArrayList(); - //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){ //Add a filter to remove the last year only if we aren't the last year int bottomYear = year - gap; @@ -456,11 +456,11 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen } } }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{ 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++; queryArgs.addFacetField(new DiscoverFacetField(facet.getIndexFieldName(), facet.getType(), facetLimit, facet.getSortOrder())); } diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SimpleSearch.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SimpleSearch.java index b4cfe3d3f0..a1ac499756 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SimpleSearch.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SimpleSearch.java @@ -162,7 +162,7 @@ public class SimpleSearch extends AbstractSearch implements CacheableProcessingC 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); } addHiddenFormFields("search", request, fqs, mainSearchDiv); diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/CollectionViewer.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/CollectionViewer.java index 5bbdab4db7..cb5a8a65e9 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/CollectionViewer.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/CollectionViewer.java @@ -79,7 +79,7 @@ public class CollectionViewer extends AbstractDSpaceTransformer implements Cache * * The validity object will include the collection being viewed and * 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() { diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/CompletedStep.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/CompletedStep.java index 8861edad18..472443bc78 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/CompletedStep.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/CompletedStep.java @@ -21,7 +21,7 @@ import org.dspace.authorize.AuthorizeException; 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 * expect next, i.e. the workflow, and gives the option to go home * or start another submission. diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/LicenseStep.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/LicenseStep.java index 03011b3f25..cb914fc5d5 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/LicenseStep.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/LicenseStep.java @@ -83,7 +83,7 @@ public class LicenseStep extends AbstractSubmissionStep UIException, SQLException, IOException, AuthorizeException { - // Get the full text for the actuial licese + // Get the full text for the actual licese Collection collection = submission.getCollection(); String actionURL = contextPath + "/handle/"+collection.getHandle() + "/submit/" + knot.getId() + ".continue"; String licenseText = LicenseUtils.getLicenseText(context @@ -112,7 +112,7 @@ public class LicenseStep extends AbstractSubmissionStep decision.setLabel(T_decision_label); 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) { log.info(LogManager.getHeader(context, "reject_license", submissionInfo.getSubmissionLogInfo())); diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/objectmanager/AbstractAdapter.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/objectmanager/AbstractAdapter.java index 91d1df294b..022b0b4b1d 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/objectmanager/AbstractAdapter.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/objectmanager/AbstractAdapter.java @@ -680,11 +680,11 @@ public abstract class AbstractAdapter AttributesImpl attributes = new AttributesImpl(); for (AttributeMap attributeMap : attributeMaps) { - boolean diffrentNamespaces = false; + boolean differentNamespaces = false; Namespace attributeNamespace = attributeMap.getNamespace(); if (attributeNamespace != null && !(attributeNamespace.URI.equals(elementNamespace.URI))) { - diffrentNamespaces = true; + differentNamespaces = true; } // copy each one over. @@ -695,7 +695,7 @@ public abstract class AbstractAdapter continue; } - if (diffrentNamespaces) + if (differentNamespaces) { attributes.addAttribute(attributeNamespace.URI, attr.getKey(), qName(attributeNamespace, attr.getKey()), "CDATA", attr.getValue()); diff --git a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/utils/DSpaceValidity.java b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/utils/DSpaceValidity.java index 446bdec686..2a43196a12 100644 --- a/dspace-xmlui/src/main/java/org/dspace/app/xmlui/utils/DSpaceValidity.java +++ b/dspace-xmlui/src/main/java/org/dspace/app/xmlui/utils/DSpaceValidity.java @@ -108,7 +108,7 @@ public class DSpaceValidity implements SourceValidity /** * 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 - * 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 * cache proves to be validated on this hit then the assumed * 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 * up. When this class is read back into memory the readObject(stream) method will be * called. @@ -448,7 +448,7 @@ public class DSpaceValidity implements SourceValidity } 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. return SourceValidity.INVALID; } diff --git a/dspace-xmlui/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap b/dspace-xmlui/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap index f8d68ed06f..873036d7c2 100644 --- a/dspace-xmlui/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap +++ b/dspace-xmlui/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap @@ -67,7 +67,7 @@ and searching the repository. + diff --git a/dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/discovery.xsl b/dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/discovery.xsl index 6a429b1fbc..f462e1550c 100644 --- a/dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/discovery.xsl +++ b/dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/aspect/artifactbrowser/discovery.xsl @@ -22,8 +22,8 @@ @@ -295,4 +295,4 @@ - \ No newline at end of file + diff --git a/dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/core/page-structure.xsl b/dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/core/page-structure.xsl index f7aa0e6389..f681332dd8 100644 --- a/dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/core/page-structure.xsl +++ b/dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/core/page-structure.xsl @@ -113,7 +113,7 @@ - + diff --git a/dspace-xmlui/src/main/webapp/themes/dri2xhtml/structural.xsl b/dspace-xmlui/src/main/webapp/themes/dri2xhtml/structural.xsl index 0aa590cd45..72058c8e25 100644 --- a/dspace-xmlui/src/main/webapp/themes/dri2xhtml/structural.xsl +++ b/dspace-xmlui/src/main/webapp/themes/dri2xhtml/structural.xsl @@ -161,7 +161,7 @@ - + diff --git a/dspace/config/crosswalks/QDC.properties b/dspace/config/crosswalks/QDC.properties index b2b3789103..08fa5fd983 100644 --- a/dspace/config/crosswalks/QDC.properties +++ b/dspace/config/crosswalks/QDC.properties @@ -5,7 +5,7 @@ # (See http://dublincore.org/schemas/xmls/qdc/2003/04/02/dc.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 # Revision: $Revision$ diff --git a/dspace/config/modules/oai.cfg b/dspace/config/modules/oai.cfg index d9b2fd1475..f5cf967a5a 100644 --- a/dspace/config/modules/oai.cfg +++ b/dspace/config/modules/oai.cfg @@ -35,9 +35,9 @@ cache.dir = ${dspace.dir}/var/oai ### 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} -# 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} 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 @@ -53,17 +53,17 @@ harvester.oai.metadataformats.dim = http://www.dspace.org/xmlns/dspace/dim, DSpa # default: 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. #harvester.timePadding = 120 # 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 # 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 -# 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 # maxHeartbeat are the lower and upper bounds on this timeframe. Measured in seconds. # Default minHeartbeat is 30. Default maxHeartbeat is 3600. diff --git a/dspace/config/spring/api/requestitem.xml b/dspace/config/spring/api/requestitem.xml index da85ffd29a..c7e5c6f9ff 100644 --- a/dspace/config/spring/api/requestitem.xml +++ b/dspace/config/spring/api/requestitem.xml @@ -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. If you don't configure that or if the requested item doesn't have these metadata the submitter data are used as fail over - - + + --> diff --git a/dspace/solr/statistics/conf/schema.xml b/dspace/solr/statistics/conf/schema.xml index fb75d9bea9..da41b68a17 100644 --- a/dspace/solr/statistics/conf/schema.xml +++ b/dspace/solr/statistics/conf/schema.xml @@ -246,7 +246,7 @@ string matched by the pattern. 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 -->