diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000000..9dfa4bfd60
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,29 @@
+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.
\ No newline at end of file
diff --git a/api/LICENSE.txt b/api/LICENSE.txt
new file mode 100644
index 0000000000..9dfa4bfd60
--- /dev/null
+++ b/api/LICENSE.txt
@@ -0,0 +1,29 @@
+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.
\ No newline at end of file
diff --git a/api/pom.xml b/api/pom.xml
index 812ab5784f..2476f3998c 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.dspace</groupId>
     <artifactId>dspace-services-api</artifactId>
-    <name>DSpace Core API</name>
+    <name>DSpace Services API</name>
     <description>The core services API for DSpace</description>
     <url>http://projects.dspace.org</url>
     <inceptionYear>Monday, September 1, 2008</inceptionYear>
diff --git a/api/src/main/java/org/dspace/constants/Constants.java b/api/src/main/java/org/dspace/constants/Constants.java
index 98c8e53266..49f1803eb8 100644
--- a/api/src/main/java/org/dspace/constants/Constants.java
+++ b/api/src/main/java/org/dspace/constants/Constants.java
@@ -1,39 +1,13 @@
 /*
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/constants/Constants.java $
+ * $Id: $
+ * $URL: $
+ * Constants.java - DSpace2 - Oct 6, 2008 2:22:36 AM - azeckoski
+ **************************************************************************
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * $Revision: 3434 $
- * 
- * $Date: 2009-02-04 10:00:29 -0800 (Wed, 04 Feb 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.constants;
 
diff --git a/api/src/main/java/org/dspace/kernel/Activator.java b/api/src/main/java/org/dspace/kernel/Activator.java
index 5b17e56d3c..cad83ecb2a 100644
--- a/api/src/main/java/org/dspace/kernel/Activator.java
+++ b/api/src/main/java/org/dspace/kernel/Activator.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.kernel;
diff --git a/api/src/main/java/org/dspace/kernel/CommonLifecycle.java b/api/src/main/java/org/dspace/kernel/CommonLifecycle.java
index a10ea9bc20..ef68f28268 100644
--- a/api/src/main/java/org/dspace/kernel/CommonLifecycle.java
+++ b/api/src/main/java/org/dspace/kernel/CommonLifecycle.java
@@ -1,21 +1,14 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache 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.apache.org/licenses/LICENSE-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.
+ * $Id: $
+ * $URL: $
+ * CommonLifecycle.java - DS2 - Feb 24, 2009 11:44:14 AM - azeckoski
+ **************************************************************************
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  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
  */
-
 package org.dspace.kernel;
 
 /**
diff --git a/api/src/main/java/org/dspace/kernel/DSpaceKernel.java b/api/src/main/java/org/dspace/kernel/DSpaceKernel.java
index 4d81d7f992..c429903779 100644
--- a/api/src/main/java/org/dspace/kernel/DSpaceKernel.java
+++ b/api/src/main/java/org/dspace/kernel/DSpaceKernel.java
@@ -3,15 +3,14 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
-
 package org.dspace.kernel;
 
 import org.dspace.services.ConfigurationService;
diff --git a/api/src/main/java/org/dspace/kernel/DSpaceKernelManager.java b/api/src/main/java/org/dspace/kernel/DSpaceKernelManager.java
index 43ee70a22d..aa65911946 100644
--- a/api/src/main/java/org/dspace/kernel/DSpaceKernelManager.java
+++ b/api/src/main/java/org/dspace/kernel/DSpaceKernelManager.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.kernel;
diff --git a/api/src/main/java/org/dspace/kernel/ServiceManager.java b/api/src/main/java/org/dspace/kernel/ServiceManager.java
index 78cc98a052..06c144f32c 100644
--- a/api/src/main/java/org/dspace/kernel/ServiceManager.java
+++ b/api/src/main/java/org/dspace/kernel/ServiceManager.java
@@ -1,39 +1,13 @@
 /*
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/kernel/ServiceManager.java $
+ * $Id: $
+ * $URL: $
+ * ServiceManager.java - DS2 - Feb 24, 2009 11:44:14 AM - azeckoski
+ **************************************************************************
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * $Revision: 3242 $
- * 
- * $Date: 2008-10-27 09:07:03 -0700 (Mon, 27 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.kernel;
 
diff --git a/api/src/main/java/org/dspace/kernel/mixins/ConfigChangeListener.java b/api/src/main/java/org/dspace/kernel/mixins/ConfigChangeListener.java
index 54aa94ce10..5f54ccf4b8 100644
--- a/api/src/main/java/org/dspace/kernel/mixins/ConfigChangeListener.java
+++ b/api/src/main/java/org/dspace/kernel/mixins/ConfigChangeListener.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.kernel.mixins;
diff --git a/api/src/main/java/org/dspace/kernel/mixins/InitializedService.java b/api/src/main/java/org/dspace/kernel/mixins/InitializedService.java
index f13e920962..ab0edaee3a 100644
--- a/api/src/main/java/org/dspace/kernel/mixins/InitializedService.java
+++ b/api/src/main/java/org/dspace/kernel/mixins/InitializedService.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.kernel.mixins;
diff --git a/api/src/main/java/org/dspace/kernel/mixins/OrderedService.java b/api/src/main/java/org/dspace/kernel/mixins/OrderedService.java
index e1e687adf0..c80736b503 100644
--- a/api/src/main/java/org/dspace/kernel/mixins/OrderedService.java
+++ b/api/src/main/java/org/dspace/kernel/mixins/OrderedService.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.kernel.mixins;
diff --git a/api/src/main/java/org/dspace/kernel/mixins/ServiceChangeListener.java b/api/src/main/java/org/dspace/kernel/mixins/ServiceChangeListener.java
index 5986de89ac..4e2cab2e5a 100644
--- a/api/src/main/java/org/dspace/kernel/mixins/ServiceChangeListener.java
+++ b/api/src/main/java/org/dspace/kernel/mixins/ServiceChangeListener.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.kernel.mixins;
diff --git a/api/src/main/java/org/dspace/kernel/mixins/ServiceManagerReadyAware.java b/api/src/main/java/org/dspace/kernel/mixins/ServiceManagerReadyAware.java
index eb18cd8f06..50b6489d00 100644
--- a/api/src/main/java/org/dspace/kernel/mixins/ServiceManagerReadyAware.java
+++ b/api/src/main/java/org/dspace/kernel/mixins/ServiceManagerReadyAware.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.kernel.mixins;
diff --git a/api/src/main/java/org/dspace/kernel/mixins/ShutdownService.java b/api/src/main/java/org/dspace/kernel/mixins/ShutdownService.java
index 1948e6b510..d408807b04 100644
--- a/api/src/main/java/org/dspace/kernel/mixins/ShutdownService.java
+++ b/api/src/main/java/org/dspace/kernel/mixins/ShutdownService.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.kernel.mixins;
diff --git a/api/src/main/java/org/dspace/providers/CacheProvider.java b/api/src/main/java/org/dspace/providers/CacheProvider.java
index 2e766b2f6c..47e25a454b 100644
--- a/api/src/main/java/org/dspace/providers/CacheProvider.java
+++ b/api/src/main/java/org/dspace/providers/CacheProvider.java
@@ -1,39 +1,13 @@
 /*
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/providers/CacheProvider.java $
+ * $Id: $
+ * $URL: $
+ * CacheProvider.java - DS2 - Feb 24, 2009 11:44:14 AM - azeckoski
+ **************************************************************************
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * $Revision: 3236 $
- * 
- * $Date: 2008-10-24 09:46:39 -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.providers;
 
diff --git a/api/src/main/java/org/dspace/services/CachingService.java b/api/src/main/java/org/dspace/services/CachingService.java
index 3d585a3e66..6ebd4f2c65 100644
--- a/api/src/main/java/org/dspace/services/CachingService.java
+++ b/api/src/main/java/org/dspace/services/CachingService.java
@@ -1,41 +1,14 @@
 /*
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/services/CachingService.java $
+ * $Id: $
+ * $URL: $
+ * CachingService.java - DSpace2 - Oct 6, 2008 2:22:36 AM - azeckoski
+ **************************************************************************
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * $Revision: 3253 $
- * 
- * $Date: 2008-10-30 05:02:18 -0700 (Thu, 30 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;
 
 import java.util.List;
diff --git a/api/src/main/java/org/dspace/services/ConfigurationService.java b/api/src/main/java/org/dspace/services/ConfigurationService.java
index b53a580c22..43f82163a1 100644
--- a/api/src/main/java/org/dspace/services/ConfigurationService.java
+++ b/api/src/main/java/org/dspace/services/ConfigurationService.java
@@ -1,39 +1,13 @@
 /*
- * $URL: https://scm.dspace.org/svn/repo/dspace2/core/trunk/api/src/main/java/org/dspace/services/ConfigurationService.java $
+ * $Id: $
+ * $URL: $
+ * ConfigurationService.java - DSpace2 - Oct 6, 2008 2:22:36 AM - azeckoski
+ **************************************************************************
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * $Revision: 3434 $
- * 
- * $Date: 2009-02-04 10:00:29 -0800 (Wed, 04 Feb 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;
 
diff --git a/api/src/main/java/org/dspace/services/EventService.java b/api/src/main/java/org/dspace/services/EventService.java
index a29662b760..df34097098 100644
--- a/api/src/main/java/org/dspace/services/EventService.java
+++ b/api/src/main/java/org/dspace/services/EventService.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services;
diff --git a/api/src/main/java/org/dspace/services/RequestService.java b/api/src/main/java/org/dspace/services/RequestService.java
index 0de541963a..12fb986633 100644
--- a/api/src/main/java/org/dspace/services/RequestService.java
+++ b/api/src/main/java/org/dspace/services/RequestService.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services;
diff --git a/api/src/main/java/org/dspace/services/SessionService.java b/api/src/main/java/org/dspace/services/SessionService.java
index d6c1c5bfb2..10c943613a 100644
--- a/api/src/main/java/org/dspace/services/SessionService.java
+++ b/api/src/main/java/org/dspace/services/SessionService.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services;
diff --git a/api/src/main/java/org/dspace/services/model/Event.java b/api/src/main/java/org/dspace/services/model/Event.java
index 7d7b1fa730..367ebc722d 100644
--- a/api/src/main/java/org/dspace/services/model/Event.java
+++ b/api/src/main/java/org/dspace/services/model/Event.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.model;
diff --git a/api/src/main/java/org/dspace/services/model/EventListener.java b/api/src/main/java/org/dspace/services/model/EventListener.java
index 547e66b31d..1eb19f739a 100644
--- a/api/src/main/java/org/dspace/services/model/EventListener.java
+++ b/api/src/main/java/org/dspace/services/model/EventListener.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.model;
diff --git a/api/src/main/java/org/dspace/services/model/RequestInterceptor.java b/api/src/main/java/org/dspace/services/model/RequestInterceptor.java
index 5a251c055f..97c8e9576c 100644
--- a/api/src/main/java/org/dspace/services/model/RequestInterceptor.java
+++ b/api/src/main/java/org/dspace/services/model/RequestInterceptor.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.model;
diff --git a/api/src/main/java/org/dspace/services/model/Session.java b/api/src/main/java/org/dspace/services/model/Session.java
index a1edd6ccbe..95f358232d 100644
--- a/api/src/main/java/org/dspace/services/model/Session.java
+++ b/api/src/main/java/org/dspace/services/model/Session.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.model;
diff --git a/impl/LICENSE.txt b/impl/LICENSE.txt
new file mode 100644
index 0000000000..9dfa4bfd60
--- /dev/null
+++ b/impl/LICENSE.txt
@@ -0,0 +1,29 @@
+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.
\ No newline at end of file
diff --git a/impl/pom.xml b/impl/pom.xml
index 2d7b595788..5642aaf43b 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.dspace</groupId>
     <artifactId>dspace-services-impl</artifactId>
-    <name>DSpace Core IMPL</name>
+    <name>DSpace Services Implementation</name>
     <description>The implementation of the DSpace 2 services</description>
     <url>http://projects.dspace.org</url>
     <inceptionYear>Monday, September 1, 2008</inceptionYear>
diff --git a/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelImpl.java b/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelImpl.java
index 790c741cec..67bbe88eee 100644
--- a/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelImpl.java
+++ b/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelImpl.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager;
diff --git a/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelInit.java b/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelInit.java
index a1994c4a6f..633daed64f 100644
--- a/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelInit.java
+++ b/impl/src/main/java/org/dspace/servicemanager/DSpaceKernelInit.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager;
diff --git a/impl/src/main/java/org/dspace/servicemanager/DSpaceServiceManager.java b/impl/src/main/java/org/dspace/servicemanager/DSpaceServiceManager.java
index f070697324..07cd61fe45 100644
--- a/impl/src/main/java/org/dspace/servicemanager/DSpaceServiceManager.java
+++ b/impl/src/main/java/org/dspace/servicemanager/DSpaceServiceManager.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager;
diff --git a/impl/src/main/java/org/dspace/servicemanager/ExternalServiceManagerSystem.java b/impl/src/main/java/org/dspace/servicemanager/ExternalServiceManagerSystem.java
index d15cfeadf6..6d92a91e14 100644
--- a/impl/src/main/java/org/dspace/servicemanager/ExternalServiceManagerSystem.java
+++ b/impl/src/main/java/org/dspace/servicemanager/ExternalServiceManagerSystem.java
@@ -1,3 +1,14 @@
+/*
+ * $Id: $
+ * $URL: $
+ * ExternalServiceManagerSystem.java - DSpace2 - Oct 6, 2008 2:22:36 AM - azeckoski
+ **************************************************************************
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  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
+ */
 package org.dspace.servicemanager;
 
 import org.dspace.servicemanager.config.DSpaceConfigurationService;
@@ -7,6 +18,8 @@ import java.util.List;
 /**
  * Interface for modular service manager systems.
  * Provides a generic initialization routine, in leiu of hardcoded constructors
+ * 
+ * @author Aaron Zeckoski (azeckoski @ gmail.com)
  */
 public interface ExternalServiceManagerSystem extends ServiceManagerSystem {
     /**
diff --git a/impl/src/main/java/org/dspace/servicemanager/ServiceConfig.java b/impl/src/main/java/org/dspace/servicemanager/ServiceConfig.java
index e628a330c2..83fc3df894 100644
--- a/impl/src/main/java/org/dspace/servicemanager/ServiceConfig.java
+++ b/impl/src/main/java/org/dspace/servicemanager/ServiceConfig.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager;
diff --git a/impl/src/main/java/org/dspace/servicemanager/ServiceManagerSystem.java b/impl/src/main/java/org/dspace/servicemanager/ServiceManagerSystem.java
index b2bd687576..4e7c0bb50b 100644
--- a/impl/src/main/java/org/dspace/servicemanager/ServiceManagerSystem.java
+++ b/impl/src/main/java/org/dspace/servicemanager/ServiceManagerSystem.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager;
diff --git a/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfig.java b/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfig.java
index 9c29475bcf..91d8a5eef3 100644
--- a/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfig.java
+++ b/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfig.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.config;
diff --git a/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java b/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java
index 3dd2190602..7317e873fa 100644
--- a/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java
+++ b/impl/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.config;
diff --git a/impl/src/main/java/org/dspace/servicemanager/example/ConcreteExample.java b/impl/src/main/java/org/dspace/servicemanager/example/ConcreteExample.java
index aef4dc2cde..a141439824 100644
--- a/impl/src/main/java/org/dspace/servicemanager/example/ConcreteExample.java
+++ b/impl/src/main/java/org/dspace/servicemanager/example/ConcreteExample.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.example;
diff --git a/impl/src/main/java/org/dspace/servicemanager/example/EventListenerExample.java b/impl/src/main/java/org/dspace/servicemanager/example/EventListenerExample.java
index b07d71a690..6c9c2303cf 100644
--- a/impl/src/main/java/org/dspace/servicemanager/example/EventListenerExample.java
+++ b/impl/src/main/java/org/dspace/servicemanager/example/EventListenerExample.java
@@ -1,9 +1,25 @@
+/*
+ * $Id: $
+ * $URL: $
+ * EventListenerExampe.java - DSpace2 - Oct 3, 2009 2:22:36 AM - mdiggory
+ **************************************************************************
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  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
+ */
 package org.dspace.servicemanager.example;
 
 import org.apache.log4j.Logger;
 import org.dspace.services.model.Event;
 import org.dspace.services.model.EventListener;
 
+/**
+ * 
+ * @author Mark Diggory (mdiggory at atmire.com)
+ * @version $Revision: $
+ */
 public class EventListenerExample implements EventListener{
 
 	/** log4j category */
diff --git a/impl/src/main/java/org/dspace/servicemanager/example/RequestInterceptorExample.java b/impl/src/main/java/org/dspace/servicemanager/example/RequestInterceptorExample.java
index fdca423211..4029d37956 100644
--- a/impl/src/main/java/org/dspace/servicemanager/example/RequestInterceptorExample.java
+++ b/impl/src/main/java/org/dspace/servicemanager/example/RequestInterceptorExample.java
@@ -1,3 +1,14 @@
+/*
+ * $Id: $
+ * $URL: $
+ * RequestInterceptorExample.java - DSpace2 - Oct 3, 2009 2:22:36 AM - mdiggory
+ **************************************************************************
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  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
+ */
 package org.dspace.servicemanager.example;
 
 import org.dspace.services.RequestService;
@@ -8,8 +19,8 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 
- * @author mdiggory
- *
+ * @author Mark Diggory (mdiggory at atmire.com)
+ * @version $Revision: $
  */
 public class RequestInterceptorExample implements RequestInterceptor {
 
diff --git a/impl/src/main/java/org/dspace/servicemanager/example/ServiceExample.java b/impl/src/main/java/org/dspace/servicemanager/example/ServiceExample.java
index 3130004858..6f4081fdf3 100644
--- a/impl/src/main/java/org/dspace/servicemanager/example/ServiceExample.java
+++ b/impl/src/main/java/org/dspace/servicemanager/example/ServiceExample.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.example;
diff --git a/impl/src/main/java/org/dspace/servicemanager/example/ServiceExampleImpl.java b/impl/src/main/java/org/dspace/servicemanager/example/ServiceExampleImpl.java
index ea96839f31..27af6eba46 100644
--- a/impl/src/main/java/org/dspace/servicemanager/example/ServiceExampleImpl.java
+++ b/impl/src/main/java/org/dspace/servicemanager/example/ServiceExampleImpl.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.example;
diff --git a/impl/src/main/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListener.java b/impl/src/main/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListener.java
index 74c19cd6c1..d6de8b344e 100644
--- a/impl/src/main/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListener.java
+++ b/impl/src/main/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListener.java
@@ -1,41 +1,14 @@
 /*
+ * $Id: $
  * $URL: $
+ * DSpaceKernelServletContextListener.java - DSpace2 - Oct 6, 2008 2:22:36 AM - azeckoski
+ **************************************************************************
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * $Revision: $
- * 
- * $Date: $
- *
- * 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.servicemanager.servlet;
 
 import java.io.File;
diff --git a/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanFactoryPostProcessor.java b/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanFactoryPostProcessor.java
index ee305952e0..888bc6f500 100644
--- a/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanFactoryPostProcessor.java
+++ b/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanFactoryPostProcessor.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.spring;
diff --git a/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanPostProcessor.java b/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanPostProcessor.java
index 4b2464b5f1..3de0db65bd 100644
--- a/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanPostProcessor.java
+++ b/impl/src/main/java/org/dspace/servicemanager/spring/DSpaceBeanPostProcessor.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.spring;
diff --git a/impl/src/main/java/org/dspace/servicemanager/spring/ResourceFinder.java b/impl/src/main/java/org/dspace/servicemanager/spring/ResourceFinder.java
index 695df33ffd..c8bfa2a644 100644
--- a/impl/src/main/java/org/dspace/servicemanager/spring/ResourceFinder.java
+++ b/impl/src/main/java/org/dspace/servicemanager/spring/ResourceFinder.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.spring;
diff --git a/impl/src/main/java/org/dspace/servicemanager/spring/SpringServiceManager.java b/impl/src/main/java/org/dspace/servicemanager/spring/SpringServiceManager.java
index a96840e889..507e9c819a 100644
--- a/impl/src/main/java/org/dspace/servicemanager/spring/SpringServiceManager.java
+++ b/impl/src/main/java/org/dspace/servicemanager/spring/SpringServiceManager.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.spring;
diff --git a/impl/src/main/java/org/dspace/services/caching/CachingServiceImpl.java b/impl/src/main/java/org/dspace/services/caching/CachingServiceImpl.java
index b952cfaa80..04224f2801 100644
--- a/impl/src/main/java/org/dspace/services/caching/CachingServiceImpl.java
+++ b/impl/src/main/java/org/dspace/services/caching/CachingServiceImpl.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.caching;
diff --git a/impl/src/main/java/org/dspace/services/caching/ThreadLocalMap.java b/impl/src/main/java/org/dspace/services/caching/ThreadLocalMap.java
index 033f9c1f6e..2f9a183b4b 100644
--- a/impl/src/main/java/org/dspace/services/caching/ThreadLocalMap.java
+++ b/impl/src/main/java/org/dspace/services/caching/ThreadLocalMap.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.caching;
diff --git a/impl/src/main/java/org/dspace/services/caching/model/EhcacheCache.java b/impl/src/main/java/org/dspace/services/caching/model/EhcacheCache.java
index 3b1f665652..7fea05ba29 100644
--- a/impl/src/main/java/org/dspace/services/caching/model/EhcacheCache.java
+++ b/impl/src/main/java/org/dspace/services/caching/model/EhcacheCache.java
@@ -3,15 +3,14 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
-
 package org.dspace.services.caching.model;
 
 import java.io.Serializable;
diff --git a/impl/src/main/java/org/dspace/services/caching/model/MapCache.java b/impl/src/main/java/org/dspace/services/caching/model/MapCache.java
index be301bf1fe..a2563829e1 100644
--- a/impl/src/main/java/org/dspace/services/caching/model/MapCache.java
+++ b/impl/src/main/java/org/dspace/services/caching/model/MapCache.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.caching.model;
diff --git a/impl/src/main/java/org/dspace/services/events/SystemEventService.java b/impl/src/main/java/org/dspace/services/events/SystemEventService.java
index f649c58f06..4c52c2d6c2 100644
--- a/impl/src/main/java/org/dspace/services/events/SystemEventService.java
+++ b/impl/src/main/java/org/dspace/services/events/SystemEventService.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.events;
diff --git a/impl/src/main/java/org/dspace/services/sessions/SessionRequestServiceImpl.java b/impl/src/main/java/org/dspace/services/sessions/SessionRequestServiceImpl.java
index 26ba422dda..6a21f94bfd 100644
--- a/impl/src/main/java/org/dspace/services/sessions/SessionRequestServiceImpl.java
+++ b/impl/src/main/java/org/dspace/services/sessions/SessionRequestServiceImpl.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.sessions;
diff --git a/impl/src/main/java/org/dspace/services/sessions/model/InternalHttpSession.java b/impl/src/main/java/org/dspace/services/sessions/model/InternalHttpSession.java
index 71185504e2..e0b64fbfdc 100644
--- a/impl/src/main/java/org/dspace/services/sessions/model/InternalHttpSession.java
+++ b/impl/src/main/java/org/dspace/services/sessions/model/InternalHttpSession.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.sessions.model;
diff --git a/impl/src/main/java/org/dspace/services/sessions/model/SessionImpl.java b/impl/src/main/java/org/dspace/services/sessions/model/SessionImpl.java
index ca1eea1fa2..bb2f9d0747 100644
--- a/impl/src/main/java/org/dspace/services/sessions/model/SessionImpl.java
+++ b/impl/src/main/java/org/dspace/services/sessions/model/SessionImpl.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.sessions.model;
diff --git a/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelImplTest.java b/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelImplTest.java
index 678868ae0f..8b6195a804 100644
--- a/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelImplTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelImplTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager;
diff --git a/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelManagerTest.java b/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelManagerTest.java
index e0f3447642..11cb229eef 100644
--- a/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelManagerTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/DSpaceKernelManagerTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager;
diff --git a/impl/src/test/java/org/dspace/servicemanager/DSpaceServiceManagerTest.java b/impl/src/test/java/org/dspace/servicemanager/DSpaceServiceManagerTest.java
index ce8d0af3fa..1f575ca7a5 100644
--- a/impl/src/test/java/org/dspace/servicemanager/DSpaceServiceManagerTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/DSpaceServiceManagerTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager;
diff --git a/impl/src/test/java/org/dspace/servicemanager/DSpaceTest.java b/impl/src/test/java/org/dspace/servicemanager/DSpaceTest.java
index dc6015cec8..a085955b28 100644
--- a/impl/src/test/java/org/dspace/servicemanager/DSpaceTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/DSpaceTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager;
diff --git a/impl/src/test/java/org/dspace/servicemanager/MockServiceManagerSystem.java b/impl/src/test/java/org/dspace/servicemanager/MockServiceManagerSystem.java
index f15e0c38cd..01b6436a75 100644
--- a/impl/src/test/java/org/dspace/servicemanager/MockServiceManagerSystem.java
+++ b/impl/src/test/java/org/dspace/servicemanager/MockServiceManagerSystem.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager;
diff --git a/impl/src/test/java/org/dspace/servicemanager/SampleAnnotationBean.java b/impl/src/test/java/org/dspace/servicemanager/SampleAnnotationBean.java
index c4637405e9..590a50dceb 100644
--- a/impl/src/test/java/org/dspace/servicemanager/SampleAnnotationBean.java
+++ b/impl/src/test/java/org/dspace/servicemanager/SampleAnnotationBean.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager;
diff --git a/impl/src/test/java/org/dspace/servicemanager/ServiceMixinManagerTest.java b/impl/src/test/java/org/dspace/servicemanager/ServiceMixinManagerTest.java
index 4aa8105878..d68b611405 100644
--- a/impl/src/test/java/org/dspace/servicemanager/ServiceMixinManagerTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/ServiceMixinManagerTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager;
diff --git a/impl/src/test/java/org/dspace/servicemanager/config/DSpaceConfigurationServiceTest.java b/impl/src/test/java/org/dspace/servicemanager/config/DSpaceConfigurationServiceTest.java
index d8b39e1a53..323dbee514 100644
--- a/impl/src/test/java/org/dspace/servicemanager/config/DSpaceConfigurationServiceTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/config/DSpaceConfigurationServiceTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.config;
diff --git a/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService1.java b/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService1.java
index 0547a44bcf..1b4516d0cf 100644
--- a/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService1.java
+++ b/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService1.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.fakeservices;
diff --git a/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService2.java b/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService2.java
index dac3ffa8aa..3b3ee5eb76 100644
--- a/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService2.java
+++ b/impl/src/test/java/org/dspace/servicemanager/fakeservices/FakeService2.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.fakeservices;
diff --git a/impl/src/test/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListenerTest.java b/impl/src/test/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListenerTest.java
index bbb15faccc..7ef36c16a9 100644
--- a/impl/src/test/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListenerTest.java
+++ b/impl/src/test/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListenerTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.servlet;
diff --git a/impl/src/test/java/org/dspace/servicemanager/spring/SpringAnnotationBean.java b/impl/src/test/java/org/dspace/servicemanager/spring/SpringAnnotationBean.java
index c03f555c0c..b8e6a3c0da 100644
--- a/impl/src/test/java/org/dspace/servicemanager/spring/SpringAnnotationBean.java
+++ b/impl/src/test/java/org/dspace/servicemanager/spring/SpringAnnotationBean.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.spring;
diff --git a/impl/src/test/java/org/dspace/servicemanager/spring/TestSpringServiceManager.java b/impl/src/test/java/org/dspace/servicemanager/spring/TestSpringServiceManager.java
index 8eaa6fd145..5a77e29990 100644
--- a/impl/src/test/java/org/dspace/servicemanager/spring/TestSpringServiceManager.java
+++ b/impl/src/test/java/org/dspace/servicemanager/spring/TestSpringServiceManager.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.servicemanager.spring;
diff --git a/impl/src/test/java/org/dspace/services/caching/CachingServiceTest.java b/impl/src/test/java/org/dspace/services/caching/CachingServiceTest.java
index 5cd788ce74..a814273c89 100644
--- a/impl/src/test/java/org/dspace/services/caching/CachingServiceTest.java
+++ b/impl/src/test/java/org/dspace/services/caching/CachingServiceTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.caching;
diff --git a/impl/src/test/java/org/dspace/services/caching/EhcacheCacheTest.java b/impl/src/test/java/org/dspace/services/caching/EhcacheCacheTest.java
index 2650303c51..fe33ae5887 100644
--- a/impl/src/test/java/org/dspace/services/caching/EhcacheCacheTest.java
+++ b/impl/src/test/java/org/dspace/services/caching/EhcacheCacheTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.caching;
diff --git a/impl/src/test/java/org/dspace/services/events/EventListenerBothFilters.java b/impl/src/test/java/org/dspace/services/events/EventListenerBothFilters.java
index b689be4fa8..d3dc9b28eb 100644
--- a/impl/src/test/java/org/dspace/services/events/EventListenerBothFilters.java
+++ b/impl/src/test/java/org/dspace/services/events/EventListenerBothFilters.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.events;
diff --git a/impl/src/test/java/org/dspace/services/events/EventListenerNameFilter.java b/impl/src/test/java/org/dspace/services/events/EventListenerNameFilter.java
index 6a7f45eb40..1a84dfca88 100644
--- a/impl/src/test/java/org/dspace/services/events/EventListenerNameFilter.java
+++ b/impl/src/test/java/org/dspace/services/events/EventListenerNameFilter.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.events;
diff --git a/impl/src/test/java/org/dspace/services/events/EventListenerNoFilter.java b/impl/src/test/java/org/dspace/services/events/EventListenerNoFilter.java
index 51a8a2e792..0f09c3dbf6 100644
--- a/impl/src/test/java/org/dspace/services/events/EventListenerNoFilter.java
+++ b/impl/src/test/java/org/dspace/services/events/EventListenerNoFilter.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.events;
diff --git a/impl/src/test/java/org/dspace/services/events/EventServiceTest.java b/impl/src/test/java/org/dspace/services/events/EventServiceTest.java
index b94496cbb4..ab1c1c449c 100644
--- a/impl/src/test/java/org/dspace/services/events/EventServiceTest.java
+++ b/impl/src/test/java/org/dspace/services/events/EventServiceTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.events;
diff --git a/impl/src/test/java/org/dspace/services/session/MockRequestInterceptor.java b/impl/src/test/java/org/dspace/services/session/MockRequestInterceptor.java
index 04b8afbe0b..a78aa89f03 100644
--- a/impl/src/test/java/org/dspace/services/session/MockRequestInterceptor.java
+++ b/impl/src/test/java/org/dspace/services/session/MockRequestInterceptor.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.session;
diff --git a/impl/src/test/java/org/dspace/services/session/SessionRequestServiceImplTest.java b/impl/src/test/java/org/dspace/services/session/SessionRequestServiceImplTest.java
index a6ab11ecee..ff418de193 100644
--- a/impl/src/test/java/org/dspace/services/session/SessionRequestServiceImplTest.java
+++ b/impl/src/test/java/org/dspace/services/session/SessionRequestServiceImplTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.services.session;
diff --git a/impl/src/test/java/org/dspace/test/DSpaceAbstractKernelTest.java b/impl/src/test/java/org/dspace/test/DSpaceAbstractKernelTest.java
index 5cf30c2349..05b46dfd65 100644
--- a/impl/src/test/java/org/dspace/test/DSpaceAbstractKernelTest.java
+++ b/impl/src/test/java/org/dspace/test/DSpaceAbstractKernelTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.test;
diff --git a/impl/src/test/java/org/dspace/test/DSpaceAbstractRequestTest.java b/impl/src/test/java/org/dspace/test/DSpaceAbstractRequestTest.java
index 040be9d514..9b4fdf17f7 100644
--- a/impl/src/test/java/org/dspace/test/DSpaceAbstractRequestTest.java
+++ b/impl/src/test/java/org/dspace/test/DSpaceAbstractRequestTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.test;
diff --git a/impl/src/test/java/org/dspace/test/DSpaceAbstractTest.java b/impl/src/test/java/org/dspace/test/DSpaceAbstractTest.java
index c0d1579eea..a199c84088 100644
--- a/impl/src/test/java/org/dspace/test/DSpaceAbstractTest.java
+++ b/impl/src/test/java/org/dspace/test/DSpaceAbstractTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.test;
diff --git a/impl/src/test/java/org/dspace/test/TestAbstractDSpaceRequestTest.java b/impl/src/test/java/org/dspace/test/TestAbstractDSpaceRequestTest.java
index b23ca3c617..6c4c0f1390 100644
--- a/impl/src/test/java/org/dspace/test/TestAbstractDSpaceRequestTest.java
+++ b/impl/src/test/java/org/dspace/test/TestAbstractDSpaceRequestTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.test;
diff --git a/impl/src/test/java/org/dspace/test/TestAbstractDSpaceTest.java b/impl/src/test/java/org/dspace/test/TestAbstractDSpaceTest.java
index 4af2aa0e10..cdabcf9da5 100644
--- a/impl/src/test/java/org/dspace/test/TestAbstractDSpaceTest.java
+++ b/impl/src/test/java/org/dspace/test/TestAbstractDSpaceTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.test;
diff --git a/pom.xml b/pom.xml
index d367497b57..7cd9e04a50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,14 +5,14 @@
     <groupId>org.dspace</groupId>
     <artifactId>dspace-services</artifactId>
     <packaging>pom</packaging>
-    <name>DSpace Parent Project</name>
+    <name>DSpace Services Modules</name>
     <url>http://projects.dspace.org</url>
     <organization>
         <name>The DSpace Foundation</name>
         <url>http://www.dspace.org</url>
     </organization>
     <version>2.0.0-SNAPSHOT</version><!-- dspace2.version -->
-
+    
     <build>
         <plugins>
             <!-- java 1.5 or higher -->
@@ -34,6 +34,7 @@
                         </manifest>
                     </archive>
                 </configuration>
+                
                 <executions>
                     <execution>
                         <goals>
@@ -243,9 +244,8 @@
     </dependencyManagement>
     <licenses>
         <license>
-            <name>DSpace Sourcecode License</name>
+            <name>The Duraspace Foundation License.</name>
             <url>LICENSE.txt</url>
-            <distribution>repo</distribution>
             <comments> A BSD compatable OSS license for the DSpace codebase.</comments>
         </license>
     </licenses>
diff --git a/utils/LICENSE.txt b/utils/LICENSE.txt
new file mode 100644
index 0000000000..9dfa4bfd60
--- /dev/null
+++ b/utils/LICENSE.txt
@@ -0,0 +1,29 @@
+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.
\ No newline at end of file
diff --git a/utils/pom.xml b/utils/pom.xml
index 05aaca21a4..bd39512ec4 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -3,8 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.dspace</groupId>
     <artifactId>dspace-services-utils</artifactId>
-    <name>DSpace Utilities</name>
-    <description>The core utilities for DSpace</description>
+    <name>DSpace Services Utilities</name>
+    <description>The core services utilities for DSpace</description>
     <url>http://projects.dspace.org</url>
     <inceptionYear>2008</inceptionYear>
     <parent>
diff --git a/utils/src/main/java/org/dspace/utils/StreamUtils.java b/utils/src/main/java/org/dspace/utils/StreamUtils.java
index 84a106a1ff..ca85efb37d 100644
--- a/utils/src/main/java/org/dspace/utils/StreamUtils.java
+++ b/utils/src/main/java/org/dspace/utils/StreamUtils.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.utils;
diff --git a/utils/src/main/java/org/dspace/utils/servicemanager/NotProvider.java b/utils/src/main/java/org/dspace/utils/servicemanager/NotProvider.java
index 955213220f..8990c8a59e 100644
--- a/utils/src/main/java/org/dspace/utils/servicemanager/NotProvider.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/NotProvider.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.utils.servicemanager;
diff --git a/utils/src/main/java/org/dspace/utils/servicemanager/OrderedServiceComparator.java b/utils/src/main/java/org/dspace/utils/servicemanager/OrderedServiceComparator.java
index 24682e272f..8ad3833947 100644
--- a/utils/src/main/java/org/dspace/utils/servicemanager/OrderedServiceComparator.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/OrderedServiceComparator.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.utils.servicemanager;
diff --git a/utils/src/main/java/org/dspace/utils/servicemanager/ProviderHolder.java b/utils/src/main/java/org/dspace/utils/servicemanager/ProviderHolder.java
index 4936878e0e..e43f018c99 100644
--- a/utils/src/main/java/org/dspace/utils/servicemanager/ProviderHolder.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/ProviderHolder.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.utils.servicemanager;
diff --git a/utils/src/main/java/org/dspace/utils/servicemanager/ProviderNotFoundException.java b/utils/src/main/java/org/dspace/utils/servicemanager/ProviderNotFoundException.java
index 9a15fd5f1b..9233be62b9 100644
--- a/utils/src/main/java/org/dspace/utils/servicemanager/ProviderNotFoundException.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/ProviderNotFoundException.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.utils.servicemanager;
diff --git a/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStack.java b/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStack.java
index 717afcfb5a..dcde54100e 100644
--- a/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStack.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStack.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.utils.servicemanager;
diff --git a/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStackComparator.java b/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStackComparator.java
index ba4f095903..63d2bda758 100644
--- a/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStackComparator.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/ProviderStackComparator.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.utils.servicemanager;
diff --git a/utils/src/main/java/org/dspace/utils/servicemanager/RequestExecutor.java b/utils/src/main/java/org/dspace/utils/servicemanager/RequestExecutor.java
index 046cea06cb..d4bea387e5 100644
--- a/utils/src/main/java/org/dspace/utils/servicemanager/RequestExecutor.java
+++ b/utils/src/main/java/org/dspace/utils/servicemanager/RequestExecutor.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.utils.servicemanager;
diff --git a/utils/src/main/java/org/dspace/utils/servlet/DSpaceWebappServletFilter.java b/utils/src/main/java/org/dspace/utils/servlet/DSpaceWebappServletFilter.java
index be8e62e113..b93650a32b 100644
--- a/utils/src/main/java/org/dspace/utils/servlet/DSpaceWebappServletFilter.java
+++ b/utils/src/main/java/org/dspace/utils/servlet/DSpaceWebappServletFilter.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.utils.servlet;
diff --git a/utils/src/test/java/org/dspace/utils/servicemanager/ProviderHolderTest.java b/utils/src/test/java/org/dspace/utils/servicemanager/ProviderHolderTest.java
index f81caa4b8a..68e8b0cdd5 100644
--- a/utils/src/test/java/org/dspace/utils/servicemanager/ProviderHolderTest.java
+++ b/utils/src/test/java/org/dspace/utils/servicemanager/ProviderHolderTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.utils.servicemanager;
diff --git a/utils/src/test/java/org/dspace/utils/servicemanager/ProviderStackTest.java b/utils/src/test/java/org/dspace/utils/servicemanager/ProviderStackTest.java
index 592b3677b3..da4056596b 100644
--- a/utils/src/test/java/org/dspace/utils/servicemanager/ProviderStackTest.java
+++ b/utils/src/test/java/org/dspace/utils/servicemanager/ProviderStackTest.java
@@ -3,13 +3,13 @@
  * $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
  **************************************************************************
- * Copyright (c) 2008 Aaron Zeckoski
- * Licensed under the Apache License, Version 2.0
+ * Copyright (c) 2002-2009, The Duraspace Foundation.  All rights reserved.
+ * Licensed under the Duraspace Foundation License.
  * 
- * A copy of the Apache License has been included in this 
- * distribution and is available at: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 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
  *
- * Aaron Zeckoski (azeckoski @ gmail.com) (aaronz @ vt.edu) (aaron @ caret.cam.ac.uk)
+ * 
  */
 
 package org.dspace.utils.servicemanager;