Merge pull request #1060 from tdonohue/DS-2701-service-api-cleanup

DS-2701: Fix license headers and DB migration naming convention
2025-10-07 01:54:22 +00:00 · 2015-09-18 08:45:05 +02:00
parent 322d25f3c7 c0feeccac1
commit 562b1defc8
86 changed files with 110 additions and 99 deletions
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V6_0_2015_03_06__DS_2701_Dso_Uuid_Migration.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V6_0_2015_03_06__DS_2701_Dso_Uuid_Migration.java
@@ -18,7 +18,7 @@ import java.sql.Connection;
 *
 * @author kevinvandevelde at atmire.com
 */
-public class V6_0_2015_03_06__Dso_Uuid_Migration implements JdbcMigration, MigrationChecksumProvider {
+public class V6_0_2015_03_06__DS_2701_Dso_Uuid_Migration implements JdbcMigration, MigrationChecksumProvider {

    private int checksum = -1;

--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V6.0_2015.03.07__DS-2701_Hibernate_migration.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V6.0_2015.03.07__DS-2701_Hibernate_migration.sql
@@ -6,6 +6,9 @@
 -- http://www.dspace.org/license/
 --

+------------------------------------------------------
+-- DS-2701 Service based API / Hibernate integration
+------------------------------------------------------
 DROP VIEW community2item;

 CREATE TABLE dspaceobject
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V6.0_2015.03.07__DS-2701_Hibernate_migration.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V6.0_2015.03.07__DS-2701_Hibernate_migration.sql
@@ -1,3 +1,14 @@
+--
+-- The contents of this file are subject to the license and copyright
+-- detailed in the LICENSE and NOTICE files at the root of the source
+-- tree and available online at
+--
+-- http://www.dspace.org/license/
+--
+
+------------------------------------------------------
+-- DS-2701 Service based API / Hibernate integration
+------------------------------------------------------
 DROP VIEW community2item;

 CREATE TABLE dspaceobject
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V6.0_2015.03.07__DS-2701_Hibernate_migration.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V6.0_2015.03.07__DS-2701_Hibernate_migration.sql
@@ -6,6 +6,9 @@
 -- http://www.dspace.org/license/
 --

+------------------------------------------------------
+-- DS-2701 Service based API / Hibernate integration
+------------------------------------------------------
 DROP VIEW community2item;

 CREATE TABLE dspaceobject
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/workflow/h2/basicWorkflow/V6.0_2015.08.11__DS-2701_Basic_Workflow_Migration.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/workflow/h2/basicWorkflow/V6.0_2015.08.11__DS-2701_Basic_Workflow_Migration.sql
@@ -6,6 +6,9 @@
 -- http://www.dspace.org/license/
 --

+------------------------------------------------------
+-- DS-2701 Service based API / Hibernate integration
+------------------------------------------------------
 ALTER TABLE workflowitem ALTER COLUMN item_id rename to item_legacy_id;
 ALTER TABLE workflowitem ADD COLUMN item_id UUID;
 ALTER TABLE workflowitem ADD CONSTRAINT workflowitem_item_id_fk FOREIGN KEY (item_id) REFERENCES Item;
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/workflow/oracle/basicWorkflow/V6.0_2015.08.11__DS-2701_Basic_Workflow_Migration.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/workflow/oracle/basicWorkflow/V6.0_2015.08.11__DS-2701_Basic_Workflow_Migration.sql
@@ -6,6 +6,9 @@
 -- http://www.dspace.org/license/
 --

+------------------------------------------------------
+-- DS-2701 Service based API / Hibernate integration
+------------------------------------------------------
 -- Alter workflow item
 ALTER TABLE workflowitem RENAME COLUMN item_id to item_legacy_id;
 ALTER TABLE workflowitem ADD item_id RAW(16) REFERENCES Item(uuid);
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/workflow/oracle/xmlworkflow/V6.0_2015.08.11__DS-2701_Xml_Workflow_Migration.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/workflow/oracle/xmlworkflow/V6.0_2015.08.11__DS-2701_Xml_Workflow_Migration.sql
@@ -6,15 +6,9 @@
 -- http://www.dspace.org/license/
 --

--
-- The contents of this file are subject to the license and copyright
-- detailed in the LICENSE and NOTICE files at the root of the source
-- tree and available online at
--
-- http://www.dspace.org/license/
--
-
-
+------------------------------------------------------
+-- DS-2701 Service based API / Hibernate integration
+------------------------------------------------------
 UPDATE collection SET workflow_step_1 = null;
 UPDATE collection SET workflow_step_2 = null;
 UPDATE collection SET workflow_step_3 = null;
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/workflow/postgres/basicWorkflow/V6.0_2015.08.11__DS-2701_Basic_Workflow_Migration.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/workflow/postgres/basicWorkflow/V6.0_2015.08.11__DS-2701_Basic_Workflow_Migration.sql
@@ -6,6 +6,9 @@
 -- http://www.dspace.org/license/
 --

+------------------------------------------------------
+-- DS-2701 Service based API / Hibernate integration
+------------------------------------------------------
 -- Alter workflow item
 ALTER TABLE workflowitem RENAME COLUMN item_id to item_legacy_id;
 ALTER TABLE workflowitem ADD COLUMN item_id UUID REFERENCES Item(uuid);
--- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/workflow/postgres/xmlworkflow/V6.0_2015.08.11__DS-2701_Xml_Workflow_Migration.sql
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/workflow/postgres/xmlworkflow/V6.0_2015.08.11__DS-2701_Xml_Workflow_Migration.sql
@@ -6,7 +6,9 @@
 -- http://www.dspace.org/license/
 --

-
+------------------------------------------------------
+-- DS-2701 Service based API / Hibernate integration
+------------------------------------------------------
 UPDATE collection SET workflow_step_1 = null;
 UPDATE collection SET workflow_step_2 = null;
 UPDATE collection SET workflow_step_3 = null;
--- a/dspace-sword/src/main/java/org/dspace/sword/ATOMCollectionGenerator.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/ATOMCollectionGenerator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/BitstreamEntryGenerator.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/BitstreamEntryGenerator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/CollectionCollectionGenerator.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/CollectionCollectionGenerator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/CollectionLocation.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/CollectionLocation.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
@@ -17,7 +17,6 @@ import org.dspace.content.Collection;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
-import org.dspace.handle.HandleServiceImpl;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;

--- a/dspace-sword/src/main/java/org/dspace/sword/CommunityCollectionGenerator.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/CommunityCollectionGenerator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/DSpaceATOMEntry.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/DSpaceATOMEntry.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/DSpaceSWORDErrorCodes.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/DSpaceSWORDErrorCodes.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/DSpaceSWORDException.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/DSpaceSWORDException.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/DSpaceSWORDServer.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/DSpaceSWORDServer.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/DepositManager.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/DepositManager.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
@@ -18,7 +18,6 @@ import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
-import org.dspace.content.service.CommunityService;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
 import org.dspace.core.Utils;
--- a/dspace-sword/src/main/java/org/dspace/sword/DepositResult.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/DepositResult.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/Depositor.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/Depositor.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/ItemCollectionGenerator.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/ItemCollectionGenerator.java
@@ -2,13 +2,12 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;

 import org.apache.commons.lang.StringUtils;
-import org.dspace.content.authority.Choice;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
 import org.purl.sword.base.Collection;
--- a/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/ItemEntryGenerator.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/ItemEntryGenerator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/LoadDSpaceConfig.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/LoadDSpaceConfig.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/MediaEntryManager.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/MediaEntryManager.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDAuthentication.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDAuthentication.java
@@ -2,12 +2,11 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;

-import org.dspace.authenticate.AuthenticationServiceImpl;
 import org.dspace.authenticate.factory.AuthenticateServiceFactory;
 import org.dspace.authenticate.service.AuthenticationService;
 import org.dspace.core.Context;
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDAuthenticator.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDAuthenticator.java
@@ -2,15 +2,13 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;

-import org.dspace.authenticate.AuthenticationServiceImpl;
 import org.dspace.authenticate.factory.AuthenticateServiceFactory;
 import org.dspace.authenticate.service.AuthenticationService;
-import org.dspace.authorize.AuthorizeServiceImpl;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.Collection;
@@ -25,12 +23,10 @@ import org.dspace.core.Constants;
 import org.dspace.authenticate.AuthenticationMethod;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
-import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.*;
 import org.apache.log4j.Logger;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
-import org.dspace.eperson.service.GroupService;
 import org.purl.sword.base.*;

 import java.sql.SQLException;
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDConfiguration.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDConfiguration.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDContext.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDContext.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDIngester.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDIngester.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDIngesterFactory.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDIngesterFactory.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDMETSIngester.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDMETSIngester.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
@@ -19,11 +19,9 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.packager.PackageIngester;
 import org.dspace.content.packager.PackageParameters;
 import org.dspace.content.service.ItemService;
-import org.dspace.content.service.MetadataValueService;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.PluginManager;
-import org.dspace.handle.HandleServiceImpl;

 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDProperties.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDProperties.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDService.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDService.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDUrlManager.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDUrlManager.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
@@ -11,7 +11,6 @@ import org.apache.commons.lang.StringUtils;
 import org.dspace.content.*;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamService;
-import org.dspace.handle.HandleServiceImpl;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.handle.factory.HandleServiceFactory;
--- a/dspace-sword/src/main/java/org/dspace/sword/ServiceDocumentManager.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/ServiceDocumentManager.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-sword/src/main/java/org/dspace/sword/SimpleFileIngester.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SimpleFileIngester.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/AbstractSimpleDC.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/AbstractSimpleDC.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */

--- a/dspace-swordv2/src/main/java/org/dspace/sword2/AbstractSwordContentIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/AbstractSwordContentIngester.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/AtomCollectionGenerator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/AtomCollectionGenerator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/AtomStatementDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/AtomStatementDisseminator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/BinaryContentIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/BinaryContentIngester.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionCollectionGenerator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionCollectionGenerator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionDepositManagerDSpace.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionDepositManagerDSpace.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionListManagerDSpace.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionListManagerDSpace.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/CommunityCollectionGenerator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/CommunityCollectionGenerator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/ContainerManagerDSpace.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/ContainerManagerDSpace.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceSwordAPI.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceSwordAPI.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceSwordException.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceSwordException.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceUriRegistry.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceUriRegistry.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/DepositResult.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/DepositResult.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/FeedContentDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/FeedContentDisseminator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/GenericStatementDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/GenericStatementDisseminator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/MediaResourceManagerDSpace.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/MediaResourceManagerDSpace.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/OreStatementDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/OreStatementDisseminator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/ReceiptGenerator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/ReceiptGenerator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/ServiceDocumentManagerDSpace.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/ServiceDocumentManagerDSpace.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleDCEntryDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleDCEntryDisseminator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleDCEntryIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleDCEntryIngester.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleDCMetadata.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleDCMetadata.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */

--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentDisseminator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentIngester.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/StatementManagerDSpace.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/StatementManagerDSpace.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordAuthenticator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordAuthenticator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordConfigurationDSpace.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordConfigurationDSpace.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordContentDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordContentDisseminator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordContentIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordContentIngester.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordContext.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordContext.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordDisseminatorFactory.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordDisseminatorFactory.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordEntryDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordEntryDisseminator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordEntryIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordEntryIngester.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordIngesterFactory.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordIngesterFactory.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSContentIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSContentIngester.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSPackageIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSPackageIngester.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordStatementDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordStatementDisseminator.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordUrlManager.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordUrlManager.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/TempFileInputStream.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/TempFileInputStream.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/VerboseDescription.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/VerboseDescription.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/VersionManager.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/VersionManager.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManager.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManager.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerDefault.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerDefault.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerFactory.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerFactory.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerUnrestricted.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerUnrestricted.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowTools.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowTools.java
@@ -2,7 +2,7 @@
 * The contents of this file are subject to the license and copyright
 * detailed in the LICENSE and NOTICE files at the root of the source
 * tree and available online at
- * <p>
+ *
 * http://www.dspace.org/license/
 */
 package org.dspace.sword2;