Complete Licensing Cleanup using Maven license plugin to filter licenses. Let maven pom point to canonical license file.

git-svn-id: http://scm.dspace.org/svn/repo/modules/dspace-services/trunk@4378 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2025-10-17 06:53:09 +00:00 · 2009-10-06 19:30:12 +00:00
parent 82e47b9040
commit 7856f178b2
100 changed files with 718 additions and 1150 deletions
--- a/api/LICENSE.txt
+++ b/api/LICENSE.txt
@@ -1,29 +0,0 @@
-Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
- Neither the name of the Duraspace Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
--- a/api/src/main/java/org/dspace/constants/Constants.java
+++ b/api/src/main/java/org/dspace/constants/Constants.java
@@ -1,12 +1,11 @@
-/*
- * $Id: $
- * $URL: $
- * Constants.java - DSpace2 - Oct 6, 2008 2:22:36 AM - azeckoski
+/**
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.constants;
--- a/api/src/main/java/org/dspace/kernel/Activator.java
+++ b/api/src/main/java/org/dspace/kernel/Activator.java
@@ -1,17 +1,13 @@
 /**
- * $Id: Activator.java 3492 2009-02-24 16:03:56Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/kernel/Activator.java $
- * Activator.java - DS2 - Feb 24, 2009 11:44:14 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.kernel;


--- a/api/src/main/java/org/dspace/kernel/CommonLifecycle.java
+++ b/api/src/main/java/org/dspace/kernel/CommonLifecycle.java
@@ -1,12 +1,11 @@
-/*
- * $Id: $
- * $URL: $
- * CommonLifecycle.java - DS2 - Feb 24, 2009 11:44:14 AM - azeckoski
+/**
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.kernel;
--- a/api/src/main/java/org/dspace/kernel/DSpaceKernel.java
+++ b/api/src/main/java/org/dspace/kernel/DSpaceKernel.java
@@ -1,15 +1,12 @@
 /**
- * $Id: DSpaceKernel.java 3221 2008-10-21 16:19:57Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/kernel/DSpaceKernel.java $
- * DSpaceKernel.java - DSpace2 - Oct 6, 2008 2:22:36 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
 package org.dspace.kernel;

--- a/api/src/main/java/org/dspace/kernel/DSpaceKernelManager.java
+++ b/api/src/main/java/org/dspace/kernel/DSpaceKernelManager.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceKernelManager.java 3433 2009-02-04 10:16:39Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/kernel/DSpaceKernelManager.java $
- * DSpaceKernelManager.java - DSpace2 - Oct 6, 2008 2:35:01 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.kernel;

 import java.lang.management.ManagementFactory;
--- a/api/src/main/java/org/dspace/kernel/ServiceManager.java
+++ b/api/src/main/java/org/dspace/kernel/ServiceManager.java
@@ -1,12 +1,11 @@
-/*
- * $Id: $
- * $URL: $
- * ServiceManager.java - DS2 - Feb 24, 2009 11:44:14 AM - azeckoski
+/**
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.kernel;
--- a/api/src/main/java/org/dspace/kernel/mixins/ConfigChangeListener.java
+++ b/api/src/main/java/org/dspace/kernel/mixins/ConfigChangeListener.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ConfigChangeListener.java 3229 2008-10-23 13:13:58Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/kernel/mixins/ConfigChangeListener.java $
- * ConfigChangeListener.java - DSpace2 - Oct 20, 2008 11:38:44 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.kernel.mixins;

 import java.util.List;
--- a/api/src/main/java/org/dspace/kernel/mixins/InitializedService.java
+++ b/api/src/main/java/org/dspace/kernel/mixins/InitializedService.java
@@ -1,17 +1,13 @@
 /**
- * $Id: InitializedService.java 3229 2008-10-23 13:13:58Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/kernel/mixins/InitializedService.java $
- * InitializingService.java - DSpace2 - Oct 23, 2008 12:00:01 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.kernel.mixins;

 /**
--- a/api/src/main/java/org/dspace/kernel/mixins/OrderedService.java
+++ b/api/src/main/java/org/dspace/kernel/mixins/OrderedService.java
@@ -1,17 +1,13 @@
 /**
- * $Id: OrderedService.java 3236 2008-10-24 16:46:39Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/kernel/mixins/OrderedService.java $
- * OrderedService.java - DSpace2 - Oct 24, 2008 4:54:26 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.kernel.mixins;


--- a/api/src/main/java/org/dspace/kernel/mixins/ServiceChangeListener.java
+++ b/api/src/main/java/org/dspace/kernel/mixins/ServiceChangeListener.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ServiceChangeListener.java 3242 2008-10-27 16:07:03Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/kernel/mixins/ServiceChangeListener.java $
- * ServiceChangeListener.java - DSpace2 - Oct 24, 2008 6:39:29 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.kernel.mixins;

 import java.util.List;
--- a/api/src/main/java/org/dspace/kernel/mixins/ServiceManagerReadyAware.java
+++ b/api/src/main/java/org/dspace/kernel/mixins/ServiceManagerReadyAware.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ServiceManagerReadyAware.java 3497 2009-02-25 17:39:08Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/kernel/mixins/ServiceManagerReadyAware.java $
- * ServiceManagerReadyAware.java - DS2 - Feb 25, 2009 11:41:35 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.kernel.mixins;

 import org.dspace.kernel.ServiceManager;
--- a/api/src/main/java/org/dspace/kernel/mixins/ShutdownService.java
+++ b/api/src/main/java/org/dspace/kernel/mixins/ShutdownService.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ShutdownService.java 3229 2008-10-23 13:13:58Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/kernel/mixins/ShutdownService.java $
- * DestroyedService.java - DSpace2 - Oct 23, 2008 12:03:43 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.kernel.mixins;


--- a/api/src/main/java/org/dspace/providers/CacheProvider.java
+++ b/api/src/main/java/org/dspace/providers/CacheProvider.java
@@ -1,12 +1,11 @@
-/*
- * $Id: $
- * $URL: $
- * CacheProvider.java - DS2 - Feb 24, 2009 11:44:14 AM - azeckoski
+/**
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.providers;
--- a/api/src/main/java/org/dspace/services/CachingService.java
+++ b/api/src/main/java/org/dspace/services/CachingService.java
@@ -1,12 +1,11 @@
-/*
- * $Id: $
- * $URL: $
- * CachingService.java - DSpace2 - Oct 6, 2008 2:22:36 AM - azeckoski
+/**
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.services;
--- a/api/src/main/java/org/dspace/services/ConfigurationService.java
+++ b/api/src/main/java/org/dspace/services/ConfigurationService.java
@@ -1,12 +1,11 @@
-/*
- * $Id: $
- * $URL: $
- * ConfigurationService.java - DSpace2 - Oct 6, 2008 2:22:36 AM - azeckoski
+/**
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.services;
--- a/api/src/main/java/org/dspace/services/EventService.java
+++ b/api/src/main/java/org/dspace/services/EventService.java
@@ -1,17 +1,13 @@
 /**
- * $Id: EventService.java 3307 2008-11-19 16:28:28Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/services/EventService.java $
- * EventService.java - DSpace2 - Oct 9, 2008 2:12:48 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services;

 import org.dspace.services.model.Event;
--- a/api/src/main/java/org/dspace/services/RequestService.java
+++ b/api/src/main/java/org/dspace/services/RequestService.java
@@ -1,17 +1,13 @@
 /**
- * $Id: RequestService.java 3285 2008-11-13 18:30:54Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/services/RequestService.java $
- * RequestService.java - DSpace2 - Oct 14, 2008 4:59:22 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services;

 import org.dspace.services.model.RequestInterceptor;
--- a/api/src/main/java/org/dspace/services/SessionService.java
+++ b/api/src/main/java/org/dspace/services/SessionService.java
@@ -1,17 +1,13 @@
 /**
- * $Id: SessionService.java 3406 2009-01-30 10:57:39Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/services/SessionService.java $
- * SessionService.java - DSpace2 - Oct 14, 2008 11:44:57 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services;

 import java.util.List;
--- a/api/src/main/java/org/dspace/services/model/Cache.java
+++ b/api/src/main/java/org/dspace/services/model/Cache.java
@@ -1,39 +1,12 @@
-/*
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/services/model/Cache.java $
+/**
+ * $Id$
+ * $URL$
+ * *************************************************************************
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * $Revision: 3599 $
- * 
- * $Date: 2009-03-17 00:23:54 -0700 (Tue, 17 Mar 2009) $
- *
- * Copyright (c) 2008, The DSpace Foundation.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of the DSpace Foundation nor the names of its 
- * contributors may be used to endorse or promote products derived from 
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
+ * A copy of the DuraSpace License has been included in this
+ * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.services.model;

--- a/api/src/main/java/org/dspace/services/model/CacheConfig.java
+++ b/api/src/main/java/org/dspace/services/model/CacheConfig.java
@@ -1,39 +1,12 @@
-/*
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/services/model/CacheConfig.java $
+/**
+ * $Id$
+ * $URL$
+ * *************************************************************************
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * $Revision: 3231 $
- * 
- * $Date: 2008-10-24 02:10:30 -0700 (Fri, 24 Oct 2008) $
- *
- * Copyright (c) 2008, The DSpace Foundation.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of the DSpace Foundation nor the names of its 
- * contributors may be used to endorse or promote products derived from 
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
+ * A copy of the DuraSpace License has been included in this
+ * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.services.model;

--- a/api/src/main/java/org/dspace/services/model/Event.java
+++ b/api/src/main/java/org/dspace/services/model/Event.java
@@ -1,17 +1,13 @@
 /**
- * $Id: Event.java 3688 2009-04-07 10:06:23Z grahamtriggs $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/services/model/Event.java $
- * Event.java - DSpace2 - Oct 9, 2008 2:22:48 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.model;

 import java.io.Serializable;
--- a/api/src/main/java/org/dspace/services/model/EventListener.java
+++ b/api/src/main/java/org/dspace/services/model/EventListener.java
@@ -1,17 +1,13 @@
 /**
- * $Id: EventListener.java 3599 2009-03-17 07:23:54Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/services/model/EventListener.java $
- * EventListener.java - DSpace2 - Oct 9, 2008 2:43:00 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.model;


--- a/api/src/main/java/org/dspace/services/model/RequestInterceptor.java
+++ b/api/src/main/java/org/dspace/services/model/RequestInterceptor.java
@@ -1,17 +1,13 @@
 /**
- * $Id: RequestInterceptor.java 3299 2008-11-18 14:22:36Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/services/model/RequestInterceptor.java $
- * RequestInterceptor.java - DSpace2 - Oct 14, 2008 5:06:38 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.model;

 import org.dspace.kernel.mixins.OrderedService;
--- a/api/src/main/java/org/dspace/services/model/Session.java
+++ b/api/src/main/java/org/dspace/services/model/Session.java
@@ -1,17 +1,13 @@
 /**
- * $Id: Session.java 3246 2008-10-28 18:02:05Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/services/model/Session.java $
- * Session.java - DSpace2 - Oct 14, 2008 11:46:22 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.model;

 import java.util.Map;
--- a/impl/LICENSE.txt
+++ b/impl/LICENSE.txt
@@ -1,29 +0,0 @@
-Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
- Neither the name of the Duraspace Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
--- a/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelImpl.java
+++ b/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelImpl.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceKernelImpl.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelImpl.java $
- * DSpaceKernelImpl.java - DSpace2 - Oct 6, 2008 2:55:53 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager;

 import java.lang.management.ManagementFactory;
--- a/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelInit.java
+++ b/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelInit.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceKernelInit.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelInit.java $
- * DSpaceKernelImpl.java - DSpace2 - Oct 6, 2008 2:55:53 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager;

 import java.lang.management.ManagementFactory;
--- a/impl/src/main/java/org/dspace/servicemanager/DSpaceServiceManager.java
+++ b/impl/src/main/java/org/dspace/servicemanager/DSpaceServiceManager.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceServiceManager.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/DSpaceServiceManager.java $
- * DSpaceServiceManager.java - DSpace2 - Oct 6, 2008 3:10:09 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager;

 import java.util.ArrayList;
--- a/impl/src/main/java/org/dspace/servicemanager/ExternalServiceManagerSystem.java
+++ b/impl/src/main/java/org/dspace/servicemanager/ExternalServiceManagerSystem.java
@@ -1,12 +1,11 @@
-/*
- * $Id: $
- * $URL: $
- * ExternalServiceManagerSystem.java - DSpace2 - Oct 6, 2008 2:22:36 AM - azeckoski
+/**
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.servicemanager;
--- a/impl/src/main/java/org/dspace/servicemanager/ServiceConfig.java
+++ b/impl/src/main/java/org/dspace/servicemanager/ServiceConfig.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ServiceConfig.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/ServiceConfig.java $
- * ServiceConfig.java - DSpace2 - Oct 5, 2008 8:08:22 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager;

 import org.dspace.servicemanager.config.DSpaceConfig;
--- a/impl/src/main/java/org/dspace/servicemanager/ServiceManagerSystem.java
+++ b/impl/src/main/java/org/dspace/servicemanager/ServiceManagerSystem.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ServiceManagerSystem.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/ServiceManagerSystem.java $
- * ServiceManagerSystem.java - DSpace2 - Oct 5, 2008 3:23:22 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager;

 import java.util.Map;
--- a/impl/src/main/java/org/dspace/servicemanager/ServiceMixinManager.java
+++ b/impl/src/main/java/org/dspace/servicemanager/ServiceMixinManager.java
@@ -1,23 +1,13 @@
 /**
- * $Id: ServiceMixinManager.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/ServiceMixinManager.java $
- * EBlogic.java - entity-broker - Apr 15, 2008 4:29:18 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2007, 2008 Sakai Foundation
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * Licensed under the Educational Community License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.osedu.org/licenses/ECL-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * A copy of the DuraSpace License has been included in this
+ * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
-
 package org.dspace.servicemanager;

 import java.io.Serializable;
--- a/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfig.java
+++ b/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfig.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceConfig.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfig.java $
- * DSpaceConfig.java - DSpace2 - Oct 5, 2008 3:35:35 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.config;

 import org.dspace.kernel.Activator;
--- a/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java
+++ b/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceConfigurationService.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java $
- * DSpaceConfigurationService.java - DSpace2 - Oct 6, 2008 3:31:04 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.config;

 import java.io.File;
--- a/impl/src/main/java/org/dspace/servicemanager/example/ConcreteExample.java
+++ b/impl/src/main/java/org/dspace/servicemanager/example/ConcreteExample.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ConcreteExample.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/example/ConcreteExample.java $
- * ConcreteExample.java - DSpace2 - Oct 16, 2008 12:40:47 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.example;

 /**
--- a/impl/src/main/java/org/dspace/servicemanager/example/EventListenerExample.java
+++ b/impl/src/main/java/org/dspace/servicemanager/example/EventListenerExample.java
@@ -1,12 +1,11 @@
-/*
- * $Id: $
- * $URL: $
- * EventListenerExampe.java - DSpace2 - Oct 3, 2009 2:22:36 AM - mdiggory
+/**
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.servicemanager.example;
@@ -18,7 +17,7 @@ import org.dspace.services.model.EventListener;
 /**
 * 
 * @author Mark Diggory (mdiggory at atmire.com)
- * @version $Revision: $
+ * @version $Revision$
 */
 public class EventListenerExample implements EventListener{

--- a/impl/src/main/java/org/dspace/servicemanager/example/RequestInterceptorExample.java
+++ b/impl/src/main/java/org/dspace/servicemanager/example/RequestInterceptorExample.java
@@ -1,12 +1,11 @@
-/*
- * $Id: $
- * $URL: $
- * RequestInterceptorExample.java - DSpace2 - Oct 3, 2009 2:22:36 AM - mdiggory
+/**
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.servicemanager.example;
@@ -20,7 +19,7 @@ import org.slf4j.LoggerFactory;
 /**
 * 
 * @author Mark Diggory (mdiggory at atmire.com)
- * @version $Revision: $
+ * @version $Revision$
 */
 public class RequestInterceptorExample implements RequestInterceptor {

--- a/impl/src/main/java/org/dspace/servicemanager/example/ServiceExample.java
+++ b/impl/src/main/java/org/dspace/servicemanager/example/ServiceExample.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ServiceExample.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/example/ServiceExample.java $
- * ServiceExample.java - DSpace2 - Oct 16, 2008 12:29:26 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.example;


--- a/impl/src/main/java/org/dspace/servicemanager/example/ServiceExampleImpl.java
+++ b/impl/src/main/java/org/dspace/servicemanager/example/ServiceExampleImpl.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ServiceExampleImpl.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/example/ServiceExampleImpl.java $
- * ServiceExampleImpl.java - DSpace2 - Oct 16, 2008 12:29:15 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.example;

 import org.springframework.beans.factory.annotation.Autowired;
--- a/impl/src/main/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListener.java
+++ b/impl/src/main/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListener.java
@@ -1,12 +1,11 @@
-/*
- * $Id: $
- * $URL: $
- * DSpaceKernelServletContextListener.java - DSpace2 - Oct 6, 2008 2:22:36 AM - azeckoski
+/**
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.servicemanager.servlet;
--- a/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanFactoryPostProcessor.java
+++ b/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanFactoryPostProcessor.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceBeanFactoryPostProcessor.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanFactoryPostProcessor.java $
- * ForceLazyBeanFactoryPostProcessor.java - DSpace2 - Oct 5, 2008 9:53:13 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.spring;

 import java.util.ArrayList;
--- a/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanPostProcessor.java
+++ b/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanPostProcessor.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceBeanPostProcessor.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanPostProcessor.java $
- * DSpaceBeanPostProcessor.java - DSpace2 - Oct 23, 2008 12:48:11 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.spring;

 import org.dspace.servicemanager.DSpaceServiceManager;
--- a/impl/src/main/java/org/dspace/servicemanager/spring/ResourceFinder.java
+++ b/impl/src/main/java/org/dspace/servicemanager/spring/ResourceFinder.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ResourceFinder.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/spring/ResourceFinder.java $
- * ResourceFinder.java - caching - May 29, 2008 11:59:02 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.spring;

 import java.io.File;
--- a/impl/src/main/java/org/dspace/servicemanager/spring/SpringServiceManager.java
+++ b/impl/src/main/java/org/dspace/servicemanager/spring/SpringServiceManager.java
@@ -1,17 +1,13 @@
 /**
- * $Id: SpringServiceManager.java 3887 2009-06-18 03:45:35Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/servicemanager/spring/SpringServiceManager.java $
- * SpringServiceManager.java - DSpace2 - Oct 5, 2008 8:26:59 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.spring;

 import java.util.ArrayList;
--- a/impl/src/main/java/org/dspace/services/caching/CachingServiceImpl.java
+++ b/impl/src/main/java/org/dspace/services/caching/CachingServiceImpl.java
@@ -1,17 +1,13 @@
 /**
- * $Id: CachingServiceImpl.java 3688 2009-04-07 10:06:23Z grahamtriggs $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/services/caching/CachingServiceImpl.java $
- * CachingServiceImpl.java - DSpace2 - Oct 23, 2008 10:38:23 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.caching;

 import java.io.InputStream;
--- a/impl/src/main/java/org/dspace/services/caching/ThreadLocalMap.java
+++ b/impl/src/main/java/org/dspace/services/caching/ThreadLocalMap.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ThreadLocalMap.java 3310 2008-11-20 10:21:15Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/services/caching/ThreadLocalMap.java $
- * ThreadLocalMap.java - DSpace2 - Oct 23, 2008 11:07:46 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.caching;

 import java.util.HashMap;
--- a/impl/src/main/java/org/dspace/services/caching/model/EhcacheCache.java
+++ b/impl/src/main/java/org/dspace/services/caching/model/EhcacheCache.java
@@ -1,15 +1,12 @@
 /**
- * $Id: EhcacheCache.java 3311 2008-11-20 12:15:14Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/services/caching/model/EhcacheCache.java $
- * EhcacheCache.java - DSpace2 - Oct 23, 2008 11:26:12 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
 package org.dspace.services.caching.model;

--- a/impl/src/main/java/org/dspace/services/caching/model/MapCache.java
+++ b/impl/src/main/java/org/dspace/services/caching/model/MapCache.java
@@ -1,17 +1,13 @@
 /**
- * $Id: MapCache.java 3311 2008-11-20 12:15:14Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/services/caching/model/MapCache.java $
- * MapCache.java - DSpace2 - Oct 23, 2008 11:40:59 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.caching.model;

 import java.util.ArrayList;
--- a/impl/src/main/java/org/dspace/services/events/SystemEventService.java
+++ b/impl/src/main/java/org/dspace/services/events/SystemEventService.java
@@ -1,17 +1,13 @@
 /**
- * $Id: SystemEventService.java 3523 2009-03-05 14:58:10Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/services/events/SystemEventService.java $
- * TempEventService.java - DS2 - Nov 19, 2008 4:02:31 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.events;

 import java.util.Collections;
--- a/impl/src/main/java/org/dspace/services/sessions/SessionRequestServiceImpl.java
+++ b/impl/src/main/java/org/dspace/services/sessions/SessionRequestServiceImpl.java
@@ -1,17 +1,13 @@
 /**
- * $Id: SessionRequestServiceImpl.java 3523 2009-03-05 14:58:10Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/services/sessions/SessionRequestServiceImpl.java $
- * SessionServiceImpl.java - DSpace2 - Oct 28, 2008 10:08:51 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.sessions;

 import org.azeckoski.reflectutils.refmap.ReferenceMap;
--- a/impl/src/main/java/org/dspace/services/sessions/model/InternalHttpSession.java
+++ b/impl/src/main/java/org/dspace/services/sessions/model/InternalHttpSession.java
@@ -1,17 +1,13 @@
 /**
- * $Id: InternalHttpSession.java 3254 2008-10-30 12:17:38Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/services/sessions/model/InternalHttpSession.java $
- * InternalHttpSession.java - DSpace2 - Oct 29, 2008 4:11:27 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.sessions.model;

 import java.util.Enumeration;
--- a/impl/src/main/java/org/dspace/services/sessions/model/SessionImpl.java
+++ b/impl/src/main/java/org/dspace/services/sessions/model/SessionImpl.java
@@ -1,17 +1,13 @@
 /**
- * $Id: SessionImpl.java 3254 2008-10-30 12:17:38Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/main/java/org/dspace/services/sessions/model/SessionImpl.java $
- * Session.java - DSpace2 - Oct 14, 2008 11:46:22 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.sessions.model;

 import java.io.Serializable;
--- a/impl/src/main/resources/caching/ehcache-config.xml
+++ b/impl/src/main/resources/caching/ehcache-config.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    $Id$
+    $URL$
+    *************************************************************************
+    Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+    Licensed under the DuraSpace Foundation License.
+
+    A copy of the DuraSpace License has been included in this
+    distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
+
+-->
 <ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ehcache.xsd">

    <!-- Sets the path to the directory where cache .data files are created.
--- a/impl/src/main/resources/spring/spring-dspace-applicationContext.xml
+++ b/impl/src/main/resources/spring/spring-dspace-applicationContext.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    $Id$
+    $URL$
+    *************************************************************************
+    Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+    Licensed under the DuraSpace Foundation License.
+
+    A copy of the DuraSpace License has been included in this
+    distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
+
+-->
 <beans xmlns="http://www.springframework.org/schema/beans" 
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns:context="http://www.springframework.org/schema/context"
--- a/impl/src/main/resources/spring/spring-dspace-core-services.xml
+++ b/impl/src/main/resources/spring/spring-dspace-core-services.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    $Id$
+    $URL$
+    *************************************************************************
+    Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+    Licensed under the DuraSpace Foundation License.
+
+    A copy of the DuraSpace License has been included in this
+    distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
+
+-->
 <beans xmlns="http://www.springframework.org/schema/beans" 
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns:context="http://www.springframework.org/schema/context"
--- a/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelImplTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelImplTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceKernelImplTest.java 3409 2009-01-30 12:04:43Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelImplTest.java $
- * DSpaceKernelImplTest.java - DSpace2 - Oct 6, 2008 4:05:54 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager;

 import static org.junit.Assert.*;
--- a/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelManagerTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelManagerTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceKernelManagerTest.java 3409 2009-01-30 12:04:43Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelManagerTest.java $
- * DSpaceKernelManagerTest.java - DSpace2 - Oct 6, 2008 7:23:54 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager;

 import static org.junit.Assert.*;
--- a/impl/src/test/java/org/dspace/servicemanager/DSpaceServiceManagerTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/DSpaceServiceManagerTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceServiceManagerTest.java 3409 2009-01-30 12:04:43Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/DSpaceServiceManagerTest.java $
- * DSpaceServiceManagerTest.java - DSpace2 - Oct 6, 2008 4:00:53 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager;

 import static org.junit.Assert.*;
--- a/impl/src/test/java/org/dspace/servicemanager/DSpaceTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/DSpaceTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceTest.java 3283 2008-11-13 18:21:00Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/DSpaceTest.java $
- * DSpaceTest.java - DSpace2 - Oct 6, 2008 4:10:10 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager;

 import static org.junit.Assert.*;
--- a/impl/src/test/java/org/dspace/servicemanager/MockServiceManagerSystem.java
+++ b/impl/src/test/java/org/dspace/servicemanager/MockServiceManagerSystem.java
@@ -1,17 +1,13 @@
 /**
- * $Id: MockServiceManagerSystem.java 3232 2008-10-24 10:41:37Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/MockServiceManagerSystem.java $
- * MockServiceManagerSystem.java - DSpace2 - Oct 24, 2008 11:15:02 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager;

 import java.util.List;
--- a/impl/src/test/java/org/dspace/servicemanager/SampleAnnotationBean.java
+++ b/impl/src/test/java/org/dspace/servicemanager/SampleAnnotationBean.java
@@ -1,17 +1,13 @@
 /**
- * $Id: SampleAnnotationBean.java 3501 2009-02-26 14:04:46Z grahamtriggs $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/SampleAnnotationBean.java $
- * SampleAnnotationBean.java - DSpace2 - Oct 5, 2008 11:25:47 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager;

 import org.dspace.kernel.mixins.InitializedService;
--- a/impl/src/test/java/org/dspace/servicemanager/ServiceMixinManagerTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/ServiceMixinManagerTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ServiceMixinManagerTest.java 3241 2008-10-27 15:15:21Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/ServiceMixinManagerTest.java $
- * ServiceMixinManagerTest.java - DSpace2 - Oct 27, 2008 11:54:22 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager;

 import static org.junit.Assert.*;
--- a/impl/src/test/java/org/dspace/servicemanager/config/DSpaceConfigurationServiceTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/config/DSpaceConfigurationServiceTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceConfigurationServiceTest.java 3525 2009-03-05 16:52:10Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/config/DSpaceConfigurationServiceTest.java $
- * DSpaceConfigurationServiceTest.java - DSpace2 - Oct 8, 2008 3:01:39 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.config;

 import static org.junit.Assert.*;
--- a/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService1.java
+++ b/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService1.java
@@ -1,17 +1,13 @@
 /**
- * $Id: FakeService1.java 3299 2008-11-18 14:22:36Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService1.java $
- * FakeService1.java - DSpace2 - Oct 27, 2008 11:57:36 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.fakeservices;

 import java.io.Serializable;
--- a/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService2.java
+++ b/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService2.java
@@ -1,17 +1,13 @@
 /**
- * $Id: FakeService2.java 3299 2008-11-18 14:22:36Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService2.java $
- * FakeService2.java - DSpace2 - Oct 27, 2008 12:56:26 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.fakeservices;

 import java.io.Serializable;
--- a/impl/src/test/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListenerTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListenerTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceKernelServletContextListenerTest.java 3474 2009-02-11 12:03:47Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListenerTest.java $
- * DSpaceKernelServletFilterTest.java - DSpace2 - Oct 30, 2008 1:59:18 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.servlet;

 import static org.junit.Assert.*;
--- a/impl/src/test/java/org/dspace/servicemanager/servlet/SampleServlet.java
+++ b/impl/src/test/java/org/dspace/servicemanager/servlet/SampleServlet.java
@@ -1,23 +1,13 @@
 /**
- * $Id: SampleServlet.java 3523 2009-03-05 14:58:10Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/servlet/SampleServlet.java $
- * Example.java - entity-broker - 31 May 2007 7:01:11 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2007, 2008 Sakai Foundation
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * Licensed under the Educational Community License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.osedu.org/licenses/ECL-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * A copy of the DuraSpace License has been included in this
+ * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
-
 package org.dspace.servicemanager.servlet;

 import java.io.IOException;
--- a/impl/src/test/java/org/dspace/servicemanager/spring/SpringAnnotationBean.java
+++ b/impl/src/test/java/org/dspace/servicemanager/spring/SpringAnnotationBean.java
@@ -1,17 +1,13 @@
 /**
- * $Id: SpringAnnotationBean.java 3211 2008-10-16 13:22:12Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/spring/SpringAnnotationBean.java $
- * SampleAnnotationBean.java - DSpace2 - Oct 5, 2008 11:25:47 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.spring;

 import org.dspace.servicemanager.example.ConcreteExample;
--- a/impl/src/test/java/org/dspace/servicemanager/spring/TestSpringServiceManager.java
+++ b/impl/src/test/java/org/dspace/servicemanager/spring/TestSpringServiceManager.java
@@ -1,17 +1,13 @@
 /**
- * $Id: TestSpringServiceManager.java 3498 2009-02-25 19:08:10Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/servicemanager/spring/TestSpringServiceManager.java $
- * TestSpringServiceManager.java - DSpace2 - Oct 5, 2008 11:17:11 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.servicemanager.spring;

 import static org.junit.Assert.assertEquals;
--- a/impl/src/test/java/org/dspace/services/caching/CachingServiceTest.java
+++ b/impl/src/test/java/org/dspace/services/caching/CachingServiceTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: CachingServiceTest.java 3540 2009-03-09 12:37:46Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/services/caching/CachingServiceTest.java $
- * CachingServiceTest.java - DSpace2 - Oct 24, 2008 11:45:54 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.caching;

 import static org.junit.Assert.*;
--- a/impl/src/test/java/org/dspace/services/caching/EhcacheCacheTest.java
+++ b/impl/src/test/java/org/dspace/services/caching/EhcacheCacheTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: EhcacheCacheTest.java 3540 2009-03-09 12:37:46Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/services/caching/EhcacheCacheTest.java $
- * EhcacheCacheTest.java - DSpace2 - Oct 24, 2008 3:47:22 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.caching;

 import static org.junit.Assert.*;
--- a/impl/src/test/java/org/dspace/services/events/EventListenerBothFilters.java
+++ b/impl/src/test/java/org/dspace/services/events/EventListenerBothFilters.java
@@ -1,17 +1,13 @@
 /**
- * $Id: EventListenerBothFilters.java 3312 2008-11-20 16:59:22Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/services/events/EventListenerBothFilters.java $
- * TestEvent.java - DS2 - Nov 20, 2008 1:17:31 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.events;

 import org.dspace.services.model.EventListener;
--- a/impl/src/test/java/org/dspace/services/events/EventListenerNameFilter.java
+++ b/impl/src/test/java/org/dspace/services/events/EventListenerNameFilter.java
@@ -1,17 +1,13 @@
 /**
- * $Id: EventListenerNameFilter.java 3312 2008-11-20 16:59:22Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/services/events/EventListenerNameFilter.java $
- * TestEvent.java - DS2 - Nov 20, 2008 1:17:31 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.events;

 import org.dspace.services.model.EventListener;
--- a/impl/src/test/java/org/dspace/services/events/EventListenerNoFilter.java
+++ b/impl/src/test/java/org/dspace/services/events/EventListenerNoFilter.java
@@ -1,17 +1,13 @@
 /**
- * $Id: EventListenerNoFilter.java 3312 2008-11-20 16:59:22Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/services/events/EventListenerNoFilter.java $
- * TestEvent.java - DS2 - Nov 20, 2008 1:17:31 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.events;

 import java.util.List;
--- a/impl/src/test/java/org/dspace/services/events/EventServiceTest.java
+++ b/impl/src/test/java/org/dspace/services/events/EventServiceTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: EventServiceTest.java 3540 2009-03-09 12:37:46Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/services/events/EventServiceTest.java $
- * EventServiceTest.java - DS2 - Nov 20, 2008 12:24:17 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.events;

 import static org.junit.Assert.*;
--- a/impl/src/test/java/org/dspace/services/session/MockRequestInterceptor.java
+++ b/impl/src/test/java/org/dspace/services/session/MockRequestInterceptor.java
@@ -1,17 +1,13 @@
 /**
- * $Id: MockRequestInterceptor.java 3251 2008-10-29 17:15:31Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/services/session/MockRequestInterceptor.java $
- * MockRequestInterceptor.java - DSpace2 - Oct 29, 2008 4:55:59 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.session;

 import org.dspace.services.model.RequestInterceptor;
--- a/impl/src/test/java/org/dspace/services/session/SessionRequestServiceImplTest.java
+++ b/impl/src/test/java/org/dspace/services/session/SessionRequestServiceImplTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: SessionRequestServiceImplTest.java 3540 2009-03-09 12:37:46Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/services/session/SessionRequestServiceImplTest.java $
- * SessionRequestServiceImplTest.java - DSpace2 - Oct 29, 2008 3:58:55 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.services.session;

 import static org.junit.Assert.*;
--- a/impl/src/test/java/org/dspace/test/DSpaceAbstractKernelTest.java
+++ b/impl/src/test/java/org/dspace/test/DSpaceAbstractKernelTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceAbstractKernelTest.java 3563 2009-03-10 17:31:52Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/test/DSpaceAbstractKernelTest.java $
- * DSpaceKernelManagerTest.java - DSpace2 - Oct 6, 2008 7:23:54 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.test;

 import static org.junit.Assert.assertEquals;
--- a/impl/src/test/java/org/dspace/test/DSpaceAbstractRequestTest.java
+++ b/impl/src/test/java/org/dspace/test/DSpaceAbstractRequestTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceAbstractRequestTest.java 3563 2009-03-10 17:31:52Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/test/DSpaceAbstractRequestTest.java $
- * DSpaceKernelManagerTest.java - DSpace2 - Oct 6, 2008 7:23:54 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.test;

 import org.junit.After;
--- a/impl/src/test/java/org/dspace/test/DSpaceAbstractTest.java
+++ b/impl/src/test/java/org/dspace/test/DSpaceAbstractTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceAbstractTest.java 3563 2009-03-10 17:31:52Z mdiggory $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/test/DSpaceAbstractTest.java $
- * DSpaceKernelManagerTest.java - DSpace2 - Oct 6, 2008 7:23:54 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.test;

 import org.dspace.kernel.DSpaceKernel;
--- a/impl/src/test/java/org/dspace/test/TestAbstractDSpaceRequestTest.java
+++ b/impl/src/test/java/org/dspace/test/TestAbstractDSpaceRequestTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: TestAbstractDSpaceRequestTest.java 3540 2009-03-09 12:37:46Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/test/TestAbstractDSpaceRequestTest.java $
- * TestAbstractDSpaceTest.java - DSpace2 - Oct 21, 2008 4:26:40 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.test;

 import static org.junit.Assert.*;
--- a/impl/src/test/java/org/dspace/test/TestAbstractDSpaceTest.java
+++ b/impl/src/test/java/org/dspace/test/TestAbstractDSpaceTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: TestAbstractDSpaceTest.java 3540 2009-03-09 12:37:46Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/impl/src/test/java/org/dspace/test/TestAbstractDSpaceTest.java $
- * TestAbstractDSpaceTest.java - DSpace2 - Oct 21, 2008 4:26:40 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.test;

 import static org.junit.Assert.*;
--- a/impl/src/test/resources/ehcache-config.xml
+++ b/impl/src/test/resources/ehcache-config.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    $Id$
+    $URL$
+    *************************************************************************
+    Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+    Licensed under the DuraSpace Foundation License.
+
+    A copy of the DuraSpace License has been included in this
+    distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
+
+-->
 <ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ehcache.xsd">

    <!-- Sets the path to the directory where cache .data files are created.
--- a/impl/src/test/resources/spring/spring-test-beans.xml
+++ b/impl/src/test/resources/spring/spring-test-beans.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    $Id$
+    $URL$
+    *************************************************************************
+    Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+    Licensed under the DuraSpace Foundation License.
+
+    A copy of the DuraSpace License has been included in this
+    distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
+
+-->
 <beans xmlns="http://www.springframework.org/schema/beans" 
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns:context="http://www.springframework.org/schema/context"
--- a/impl/src/test/resources/spring/spring-test-services.xml
+++ b/impl/src/test/resources/spring/spring-test-services.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    $Id$
+    $URL$
+    *************************************************************************
+    Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+    Licensed under the DuraSpace Foundation License.
+
+    A copy of the DuraSpace License has been included in this
+    distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
+
+-->
 <beans xmlns="http://www.springframework.org/schema/beans" 
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns:context="http://www.springframework.org/schema/context"
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
    <parent>
        <artifactId>dspace-pom</artifactId>
        <groupId>org.dspace</groupId>
-        <version>1</version>
+        <version>2</version>
    </parent>
    
    <version>2.0.0-beta-SNAPSHOT</version>
@@ -165,14 +165,6 @@
        </dependencies>
    </dependencyManagement>

-    <licenses>
-        <license>
-            <name>The Duraspace Foundation License.</name>
-            <url>LICENSE.txt</url>
-            <comments> A BSD compatable OSS license for the DSpace codebase.</comments>
-        </license>
-    </licenses>
-
    <developers>
        <developer>
            <id>azeckoski</id>
--- a/utils/LICENSE.txt
+++ b/utils/LICENSE.txt
@@ -1,29 +0,0 @@
-Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
- Neither the name of the Duraspace Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
--- a/utils/src/main/java/org/dspace/utils/DSpace.java
+++ b/utils/src/main/java/org/dspace/utils/DSpace.java
@@ -1,39 +1,12 @@
-/*
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/utils/src/main/java/org/dspace/utils/DSpace.java $
+/**
+ * $Id$
+ * $URL$
+ * *************************************************************************
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * $Revision: 3607 $
- * 
- * $Date: 2009-03-17 19:33:30 -0700 (Tue, 17 Mar 2009) $
- *
- * Copyright (c) 2008, The DSpace Foundation.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of the DSpace Foundation nor the names of its 
- * contributors may be used to endorse or promote products derived from 
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
+ * A copy of the DuraSpace License has been included in this
+ * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
 */
 package org.dspace.utils;

--- a/utils/src/main/java/org/dspace/utils/StreamUtils.java
+++ b/utils/src/main/java/org/dspace/utils/StreamUtils.java
@@ -1,17 +1,13 @@
 /**
- * $Id: StreamUtils.java 3434 2009-02-04 18:00:29Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/utils/src/main/java/org/dspace/utils/StreamUtils.java $
- * StreamUtils.java - DS2 - Feb 4, 2009 3:19:01 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.utils;

 import java.io.BufferedReader;
--- a/utils/src/main/java/org/dspace/utils/servicemanager/NotProvider.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/NotProvider.java
@@ -1,17 +1,13 @@
 /**
- * $Id: NotProvider.java 3533 2009-03-06 12:06:27Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/utils/src/main/java/org/dspace/utils/servicemanager/NotProvider.java $
- * NotProvider.java - DS2 - Mar 6, 2009 11:40:10 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.utils.servicemanager;


--- a/utils/src/main/java/org/dspace/utils/servicemanager/OrderedServiceComparator.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/OrderedServiceComparator.java
@@ -1,17 +1,13 @@
 /**
- * $Id: OrderedServiceComparator.java 3678 2009-04-06 12:45:44Z grahamtriggs $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/utils/src/main/java/org/dspace/utils/servicemanager/OrderedServiceComparator.java $
- * OrderedBeanComparator.java - DSpace2 - Oct 24, 2008 5:01:44 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.utils.servicemanager;

 import java.util.Comparator;
--- a/utils/src/main/java/org/dspace/utils/servicemanager/ProviderHolder.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/ProviderHolder.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ProviderHolder.java 3477 2009-02-16 15:29:24Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/utils/src/main/java/org/dspace/utils/servicemanager/ProviderHolder.java $
- * ProviderHolder.java - DSpace2 - Oct 29, 2008 12:46:32 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.utils.servicemanager;

 import java.lang.ref.WeakReference;
--- a/utils/src/main/java/org/dspace/utils/servicemanager/ProviderNotFoundException.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/ProviderNotFoundException.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ProviderNotFoundException.java 3477 2009-02-16 15:29:24Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/utils/src/main/java/org/dspace/utils/servicemanager/ProviderNotFoundException.java $
- * ProviderNotFoundException.java - DS2 - Feb 16, 2009 2:34:56 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.utils.servicemanager;


--- a/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStack.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStack.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ProviderStack.java 3858 2009-06-04 11:51:04Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStack.java $
- * ProviderStack.java - DS2 - Feb 12, 2009 10:10:45 AM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.utils.servicemanager;

 import java.util.ArrayList;
--- a/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStackComparator.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStackComparator.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ProviderStackComparator.java 3678 2009-04-06 12:45:44Z grahamtriggs $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStackComparator.java $
- * OrderedBeanComparator.java - DSpace2 - Oct 24, 2008 5:01:44 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.utils.servicemanager;

 import java.util.Comparator;
--- a/utils/src/main/java/org/dspace/utils/servicemanager/RequestExecutor.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/RequestExecutor.java
@@ -1,17 +1,13 @@
 /**
- * $Id: RequestExecutor.java 3477 2009-02-16 15:29:24Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/utils/src/main/java/org/dspace/utils/servicemanager/RequestExecutor.java $
- * RequestExecutor.java - DSpace2 - Nov 14, 2008 1:41:49 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.utils.servicemanager;

 import java.lang.ref.WeakReference;
--- a/utils/src/main/java/org/dspace/utils/servlet/DSpaceWebappServletFilter.java
+++ b/utils/src/main/java/org/dspace/utils/servlet/DSpaceWebappServletFilter.java
@@ -1,17 +1,13 @@
 /**
- * $Id: DSpaceWebappServletFilter.java 3536 2009-03-06 14:27:24Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/utils/src/main/java/org/dspace/utils/servlet/DSpaceWebappServletFilter.java $
- * ServletFilter.java - DSpace2 - Oct 20, 2008 6:42:19 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.utils.servlet;

 import java.io.IOException;
--- a/utils/src/test/java/org/dspace/utils/servicemanager/ProviderHolderTest.java
+++ b/utils/src/test/java/org/dspace/utils/servicemanager/ProviderHolderTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ProviderHolderTest.java 3477 2009-02-16 15:29:24Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/utils/src/test/java/org/dspace/utils/servicemanager/ProviderHolderTest.java $
- * ProviderHolderTest.java - DS2 - Feb 16, 2009 1:33:04 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.utils.servicemanager;

 import static org.junit.Assert.*;
--- a/utils/src/test/java/org/dspace/utils/servicemanager/ProviderStackTest.java
+++ b/utils/src/test/java/org/dspace/utils/servicemanager/ProviderStackTest.java
@@ -1,17 +1,13 @@
 /**
- * $Id: ProviderStackTest.java 3491 2009-02-24 11:40:28Z azeckoski $
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/utils/src/test/java/org/dspace/utils/servicemanager/ProviderStackTest.java $
- * ProviderStackTest.java - DS2 - Feb 16, 2009 2:49:36 PM - azeckoski
+ * $Id$
+ * $URL$
 * *************************************************************************
- * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
- * Licensed under the Duraspace Foundation License.
+ * Copyright (c) 2002-2009, DuraSpace.  All rights reserved
+ * Licensed under the DuraSpace Foundation License.
 *
- * A copy of the Duraspace License has been included in this
+ * A copy of the DuraSpace License has been included in this
 * distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
- *
- * 
 */
-
 package org.dspace.utils.servicemanager;

 import static org.junit.Assert.*;