diff --git a/redback-data-management/src/main/java/org/codehaus/plexus/redback/management/DataManagementTool.java b/redback-data-management/src/main/java/org/codehaus/plexus/redback/management/DataManagementTool.java
index 64279c90..c6a4e9a5 100644
--- a/redback-data-management/src/main/java/org/codehaus/plexus/redback/management/DataManagementTool.java
+++ b/redback-data-management/src/main/java/org/codehaus/plexus/redback/management/DataManagementTool.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.redback.management;
 
 /*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *      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.
+ * 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.
  */
 
 import org.codehaus.plexus.redback.keys.KeyManager;
diff --git a/redback-data-management/src/main/java/org/codehaus/plexus/redback/management/JdoDataManagementTool.java b/redback-data-management/src/main/java/org/codehaus/plexus/redback/management/JdoDataManagementTool.java
index ca19ea3f..6c166571 100644
--- a/redback-data-management/src/main/java/org/codehaus/plexus/redback/management/JdoDataManagementTool.java
+++ b/redback-data-management/src/main/java/org/codehaus/plexus/redback/management/JdoDataManagementTool.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.redback.management;
 
 /*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *      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.
+ * 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.
  */
 
 import java.io.File;
diff --git a/redback-data-management/src/test/java/org/codehaus/plexus/redback/management/DataManagementTest.java b/redback-data-management/src/test/java/org/codehaus/plexus/redback/management/DataManagementTest.java
index 89f25556..a537794d 100644
--- a/redback-data-management/src/test/java/org/codehaus/plexus/redback/management/DataManagementTest.java
+++ b/redback-data-management/src/test/java/org/codehaus/plexus/redback/management/DataManagementTest.java
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.redback.management;
 
 /*
- * Copyright 2006
+ * 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
  *
- * Licensed 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
  *
- *      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.
+ * 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.
  */
 
 import junit.framework.TestCase;
diff --git a/redback-data-management/src/test/resources/expected-keys.xml b/redback-data-management/src/test/resources/expected-keys.xml
index 6273197e..088974c3 100644
--- a/redback-data-management/src/test/resources/expected-keys.xml
+++ b/redback-data-management/src/test/resources/expected-keys.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0"?>
+
+<!--
+  ~ 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.
+  -->
 <authenticationKeyDatabase>
   <keys>
     <key>
diff --git a/redback-data-management/src/test/resources/expected-rbac.xml b/redback-data-management/src/test/resources/expected-rbac.xml
index f7ecdb5f..b202474f 100644
--- a/redback-data-management/src/test/resources/expected-rbac.xml
+++ b/redback-data-management/src/test/resources/expected-rbac.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0"?>
+
+<!--
+  ~ 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.
+  -->
 <rbacDatabase>
   <roles>
     <role>
diff --git a/redback-data-management/src/test/resources/expected-users.xml b/redback-data-management/src/test/resources/expected-users.xml
index 8cfbda92..1584278a 100644
--- a/redback-data-management/src/test/resources/expected-users.xml
+++ b/redback-data-management/src/test/resources/expected-users.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0"?>
+
+<!--
+  ~ 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.
+  -->
 <userDatabase>
   <users>
     <user>
diff --git a/redback-data-management/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties b/redback-data-management/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties
index 694dbb0c..6409f97c 100644
--- a/redback-data-management/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties
+++ b/redback-data-management/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties
@@ -1,19 +1,22 @@
+# 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.
+
 jdbc.url=jdbc:derby:target/database;create=true
-#
-# Copyright 2006 The Codehaus.
-#
-# Licensed 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.
-#
+
 
 # --------------------------------------------------------------------
 # Application Configuration