- verified copyright headers

- optimized imports - ran code formatting git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@467926 13f79535-47bb-0310-9956-ffa450edef68
author: Edwin L. Punzalan <epunzalan@apache.org> 2006-10-26 09:15:23 +0000
committer: Edwin L. Punzalan <epunzalan@apache.org> 2006-10-26 09:15:23 +0000
commit: 2b1e907f1070d1ceef1f9e211363af3aacd2b95c (patch)
tree: 87e3dc71eb1d1c01c214771d04c1dc98359deb3a
parent: 15fe0128dd35bc08124b4ee76d59b360ad6541cb (diff)
download: archiva-2b1e907f1070d1ceef1f9e211363af3aacd2b95c.tar.gz
archiva-2b1e907f1070d1ceef1f9e211363af3aacd2b95c.zip
131 files changed, 1348 insertions, 445 deletions
diff --git a/archiva-applet/pom.xml b/archiva-applet/pom.xml
index adef730f9..02c37b541 100644
--- a/archiva-applet/pom.xml
+++ b/archiva-applet/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -15,7 +16,7 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
diff --git a/archiva-configuration/pom.xml b/archiva-configuration/pom.xml
index 6caa30b55..7725fa2ec 100644
--- a/archiva-configuration/pom.xml
+++ b/archiva-configuration/pom.xml
@@ -1,5 +1,22 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
diff --git a/archiva-configuration/src/test/conf/corrupt.xml b/archiva-configuration/src/test/conf/corrupt.xml
index 2476f91ff..ed0c05c89 100644
--- a/archiva-configuration/src/test/conf/corrupt.xml
+++ b/archiva-configuration/src/test/conf/corrupt.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -5,7 +6,7 @@
   ~ 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,
diff --git a/archiva-configuration/src/test/conf/repository-manager.xml b/archiva-configuration/src/test/conf/repository-manager.xml
index a3f1f2745..8dd9d4c97 100644
--- a/archiva-configuration/src/test/conf/repository-manager.xml
+++ b/archiva-configuration/src/test/conf/repository-manager.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -7,7 +6,7 @@
   ~ 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,
diff --git a/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java
index f4f90c0a3..cfe704267 100644
--- a/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java
+++ b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java
@@ -1,11 +1,5 @@
 package org.apache.maven.archiva.configuration;
 
-import org.codehaus.plexus.PlexusTestCase;
-import org.easymock.MockControl;
-
-import java.io.File;
-import java.util.Properties;
-
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
  *
@@ -13,7 +7,7 @@ import java.util.Properties;
  * 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,
@@ -22,6 +16,12 @@ import java.util.Properties;
  * limitations under the License.
  */
 
+import org.codehaus.plexus.PlexusTestCase;
+import org.easymock.MockControl;
+
+import java.io.File;
+import java.util.Properties;
+
 /**
  * Test the configuration store.
  *
diff --git a/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
index 6cfbe4a90..ffa76304f 100644
--- a/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
+++ b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
@@ -1,103 +1,103 @@
-package org.apache.maven.archiva.configuration;
-
-/*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * 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.
- */
-
-import org.codehaus.plexus.PlexusTestCase;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @author Edwin Punzalan
- */
-public class MavenProxyPropertyLoaderTest
-    extends PlexusTestCase
-{
-    private static final int DEFAULT_CACHE_PERIOD = 3600;
-
-    private MavenProxyPropertyLoader loader;
-
-    public void testLoadValidMavenProxyConfiguration()
-        throws IOException, InvalidConfigurationException
-    {
-        File confFile = getTestFile( "src/test/conf/maven-proxy-complete.conf" );
-
-        Configuration configuration = new Configuration();
-        Proxy proxy = new Proxy();
-        proxy.setHost( "original-host" );
-        configuration.setProxy( proxy ); // overwritten
-        configuration.setIndexPath( "index-path" ); // existing value
-
-        loader.load( new FileInputStream( confFile ), configuration );
-
-        List list = configuration.getRepositories();
-        assertEquals( "check single managed repository", 1, list.size() );
-        RepositoryConfiguration managedRepository = (RepositoryConfiguration) list.iterator().next();
-        assertEquals( "cache path changed", "target", managedRepository.getDirectory() );
-
-        assertEquals( "Count repositories", 4, configuration.getProxiedRepositories().size() );
-
-        list = configuration.getProxiedRepositories();
-        ProxiedRepositoryConfiguration repo = (ProxiedRepositoryConfiguration) list.get( 0 );
-        assertEquals( "Repository name not as expected", "local-repo", repo.getId() );
-        assertEquals( "Repository url does not match its name", "file://target", repo.getUrl() );
-        assertEquals( "Repository cache period check failed", 0, repo.getSnapshotsInterval() );
-        assertFalse( "Repository failure caching check failed", repo.isCacheFailures() );
-
-        repo = (ProxiedRepositoryConfiguration) list.get( 1 );
-        assertEquals( "Repository name not as expected", "www-ibiblio-org", repo.getId() );
-        assertEquals( "Repository url does not match its name", "http://www.ibiblio.org/maven2", repo.getUrl() );
-        assertEquals( "Repository cache period check failed", DEFAULT_CACHE_PERIOD, repo.getSnapshotsInterval() );
-        assertTrue( "Repository failure caching check failed", repo.isCacheFailures() );
-
-        repo = (ProxiedRepositoryConfiguration) list.get( 2 );
-        assertEquals( "Repository name not as expected", "dist-codehaus-org", repo.getId() );
-        assertEquals( "Repository url does not match its name", "http://dist.codehaus.org", repo.getUrl() );
-        assertEquals( "Repository cache period check failed", DEFAULT_CACHE_PERIOD, repo.getSnapshotsInterval() );
-        assertTrue( "Repository failure caching check failed", repo.isCacheFailures() );
-
-        repo = (ProxiedRepositoryConfiguration) list.get( 3 );
-        assertEquals( "Repository name not as expected", "private-example-com", repo.getId() );
-        assertEquals( "Repository url does not match its name", "http://private.example.com/internal", repo.getUrl() );
-        assertEquals( "Repository cache period check failed", DEFAULT_CACHE_PERIOD, repo.getSnapshotsInterval() );
-        assertFalse( "Repository failure caching check failed", repo.isCacheFailures() );
-    }
-
-    public void testInvalidConfiguration()
-    {
-        Configuration configuration = new Configuration();
-        try
-        {
-            loader.load( new Properties(), configuration );
-            fail( "Incomplete config should have failed" );
-        }
-        catch ( InvalidConfigurationException e )
-        {
-            assertTrue( true );
-        }
-    }
-
-    protected void setUp()
-        throws Exception
-    {
-        super.setUp();
-        loader = new MavenProxyPropertyLoader();
-    }
-}
+package org.apache.maven.archiva.configuration;
+
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * 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.
+ */
+
+import org.codehaus.plexus.PlexusTestCase;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @author Edwin Punzalan
+ */
+public class MavenProxyPropertyLoaderTest
+    extends PlexusTestCase
+{
+    private static final int DEFAULT_CACHE_PERIOD = 3600;
+
+    private MavenProxyPropertyLoader loader;
+
+    public void testLoadValidMavenProxyConfiguration()
+        throws IOException, InvalidConfigurationException
+    {
+        File confFile = getTestFile( "src/test/conf/maven-proxy-complete.conf" );
+
+        Configuration configuration = new Configuration();
+        Proxy proxy = new Proxy();
+        proxy.setHost( "original-host" );
+        configuration.setProxy( proxy ); // overwritten
+        configuration.setIndexPath( "index-path" ); // existing value
+
+        loader.load( new FileInputStream( confFile ), configuration );
+
+        List list = configuration.getRepositories();
+        assertEquals( "check single managed repository", 1, list.size() );
+        RepositoryConfiguration managedRepository = (RepositoryConfiguration) list.iterator().next();
+        assertEquals( "cache path changed", "target", managedRepository.getDirectory() );
+
+        assertEquals( "Count repositories", 4, configuration.getProxiedRepositories().size() );
+
+        list = configuration.getProxiedRepositories();
+        ProxiedRepositoryConfiguration repo = (ProxiedRepositoryConfiguration) list.get( 0 );
+        assertEquals( "Repository name not as expected", "local-repo", repo.getId() );
+        assertEquals( "Repository url does not match its name", "file://target", repo.getUrl() );
+        assertEquals( "Repository cache period check failed", 0, repo.getSnapshotsInterval() );
+        assertFalse( "Repository failure caching check failed", repo.isCacheFailures() );
+
+        repo = (ProxiedRepositoryConfiguration) list.get( 1 );
+        assertEquals( "Repository name not as expected", "www-ibiblio-org", repo.getId() );
+        assertEquals( "Repository url does not match its name", "http://www.ibiblio.org/maven2", repo.getUrl() );
+        assertEquals( "Repository cache period check failed", DEFAULT_CACHE_PERIOD, repo.getSnapshotsInterval() );
+        assertTrue( "Repository failure caching check failed", repo.isCacheFailures() );
+
+        repo = (ProxiedRepositoryConfiguration) list.get( 2 );
+        assertEquals( "Repository name not as expected", "dist-codehaus-org", repo.getId() );
+        assertEquals( "Repository url does not match its name", "http://dist.codehaus.org", repo.getUrl() );
+        assertEquals( "Repository cache period check failed", DEFAULT_CACHE_PERIOD, repo.getSnapshotsInterval() );
+        assertTrue( "Repository failure caching check failed", repo.isCacheFailures() );
+
+        repo = (ProxiedRepositoryConfiguration) list.get( 3 );
+        assertEquals( "Repository name not as expected", "private-example-com", repo.getId() );
+        assertEquals( "Repository url does not match its name", "http://private.example.com/internal", repo.getUrl() );
+        assertEquals( "Repository cache period check failed", DEFAULT_CACHE_PERIOD, repo.getSnapshotsInterval() );
+        assertFalse( "Repository failure caching check failed", repo.isCacheFailures() );
+    }
+
+    public void testInvalidConfiguration()
+    {
+        Configuration configuration = new Configuration();
+        try
+        {
+            loader.load( new Properties(), configuration );
+            fail( "Incomplete config should have failed" );
+        }
+        catch ( InvalidConfigurationException e )
+        {
+            assertTrue( true );
+        }
+    }
+
+    protected void setUp()
+        throws Exception
+    {
+        super.setUp();
+        loader = new MavenProxyPropertyLoader();
+    }
+}
diff --git a/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml b/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml
index 64a1849a3..80e47dc0c 100644
--- a/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml
+++ b/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -5,7 +6,7 @@
   ~ 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,
diff --git a/archiva-converter/pom.xml b/archiva-converter/pom.xml
index 5de65c928..842a2015c 100644
--- a/archiva-converter/pom.xml
+++ b/archiva-converter/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml b/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml
index 00b1a09ef..9670e97d8 100644
--- a/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml
+++ b/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml b/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
index 5ed142599..41ebf5ecc 100644
--- a/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
+++ b/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
index 031fb19b6..d64cc798f 100644
--- a/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
+++ b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
index db6ce9a7f..957437470 100644
--- a/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
+++ b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml b/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
index f4d211741..1dd7f9ff9 100644
--- a/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
+++ b/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <metadata>
   <groupId>test</groupId>
   <artifactId>newversion-artifact</artifactId>
diff --git a/archiva-core/pom.xml b/archiva-core/pom.xml
index 78e4b9384..ef36c6fd0 100644
--- a/archiva-core/pom.xml
+++ b/archiva-core/pom.xml
@@ -1,5 +1,22 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java
index eeb4b6895..b9622cf08 100644
--- a/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java
+++ b/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java
@@ -1,5 +1,21 @@
 package org.apache.maven.archiva;
 
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * 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.
+ */
+
 import org.apache.maven.archiva.converter.RepositoryConversionException;
 import org.apache.maven.archiva.converter.RepositoryConverter;
 import org.apache.maven.archiva.discoverer.ArtifactDiscoverer;
diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java
index 7e7076350..56b47f336 100644
--- a/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java
+++ b/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java
@@ -1,5 +1,21 @@
 package org.apache.maven.archiva;
 
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * 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.
+ */
+
 import org.apache.maven.archiva.converter.RepositoryConversionException;
 import org.apache.maven.archiva.discoverer.DiscovererException;
 
diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java
index 53632ecac..cf3c04c6a 100644
--- a/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java
+++ b/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java
@@ -17,15 +17,15 @@ package org.apache.maven.archiva.proxy;
  */
 
 import org.apache.maven.archiva.configuration.Configuration;
+import org.apache.maven.archiva.configuration.ConfigurationChangeException;
+import org.apache.maven.archiva.configuration.ConfigurationChangeListener;
 import org.apache.maven.archiva.configuration.ConfigurationStore;
 import org.apache.maven.archiva.configuration.ConfigurationStoreException;
 import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory;
+import org.apache.maven.archiva.configuration.InvalidConfigurationException;
 import org.apache.maven.archiva.configuration.ProxiedRepositoryConfiguration;
 import org.apache.maven.archiva.configuration.Proxy;
 import org.apache.maven.archiva.configuration.RepositoryConfiguration;
-import org.apache.maven.archiva.configuration.ConfigurationChangeListener;
-import org.apache.maven.archiva.configuration.InvalidConfigurationException;
-import org.apache.maven.archiva.configuration.ConfigurationChangeException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.apache.maven.wagon.proxy.ProxyInfo;
diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java
index e91949af3..1dd291b00 100644
--- a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java
+++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java
@@ -18,9 +18,9 @@ package org.apache.maven.archiva.scheduler.executors;
 
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ConfigurationStore;
+import org.apache.maven.archiva.configuration.ConfigurationStoreException;
 import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory;
 import org.apache.maven.archiva.configuration.RepositoryConfiguration;
-import org.apache.maven.archiva.configuration.ConfigurationStoreException;
 import org.apache.maven.archiva.discoverer.ArtifactDiscoverer;
 import org.apache.maven.archiva.discoverer.DiscovererException;
 import org.apache.maven.archiva.discoverer.MetadataDiscoverer;
diff --git a/archiva-core/src/main/resources/META-INF/plexus/components.xml b/archiva-core/src/main/resources/META-INF/plexus/components.xml
index 38934f21e..6bc98f985 100644
--- a/archiva-core/src/main/resources/META-INF/plexus/components.xml
+++ b/archiva-core/src/main/resources/META-INF/plexus/components.xml
@@ -1,4 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <component-set>
   <components>
 
diff --git a/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java b/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java
index e5621ea91..27acf5067 100644
--- a/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java
+++ b/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java
@@ -1,5 +1,21 @@
 package org.apache.maven.archiva;
 
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * 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.
+ */
+
 import org.codehaus.plexus.PlexusTestCase;
 
 import java.io.File;
diff --git a/archiva-discoverer/pom.xml b/archiva-discoverer/pom.xml
index fed41016b..6dcd73f97 100755
--- a/archiva-discoverer/pom.xml
+++ b/archiva-discoverer/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java
index 10276a640..a016dba01 100644
--- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java
@@ -22,7 +22,6 @@ import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java
index a26054d76..9e90ddee8 100644
--- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java
@@ -1,7 +1,5 @@
 package org.apache.maven.archiva.discoverer;
 
-import java.util.Iterator;
-
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
  *
@@ -18,6 +16,8 @@ import java.util.Iterator;
  * limitations under the License.
  */
 
+import java.util.Iterator;
+
 /**
  * @author Edwin Punzalan
  */
diff --git a/archiva-discoverer/src/site/apt/design.apt b/archiva-discoverer/src/site/apt/design.apt
index 2adf0e3f0..2045d72de 100644
--- a/archiva-discoverer/src/site/apt/design.apt
+++ b/archiva-discoverer/src/site/apt/design.apt
@@ -6,6 +6,23 @@
  24 July 2006
  -----
 
+~~ Copyright 2006 The Apache Software Foundation.
+~~
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
 Discoverer Design
 
   The artifact discoverer is designed to traverse the paths in the repository and identify files that are part of
diff --git a/archiva-discoverer/src/test/repository/javax/maven-metadata.xml b/archiva-discoverer/src/test/repository/javax/maven-metadata.xml
index 17775863b..6a325c75d 100644
--- a/archiva-discoverer/src/test/repository/javax/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/javax/maven-metadata.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml b/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
index 17775863b..6a325c75d 100644
--- a/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
+++ b/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml b/archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
index 214b7dc28..4bd60a052 100644
--- a/archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
+++ b/archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml b/archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml
index 17775863b..6a325c75d 100644
--- a/archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml
+++ b/archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml
index 22f46c19b..6fa3c6b90 100644
--- a/archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <metadata>
   <groupId>org.apache.maven</groupId>
 </metadata>
 \ No newline at end of file
diff --git a/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
index 71fc9790f..069e7d40e 100644
--- a/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <metadata>
   <groupId>org.apache.maven.update</groupId>
   <artifactId>test-not-updated</artifactId>
diff --git a/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
index fc17a16d7..3fd0a360f 100644
--- a/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <metadata>
   <groupId>org.apache.maven.update</groupId>
   <artifactId>test-updated</artifactId>
diff --git a/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
index 9bb9b5a58..c7dfc7f8d 100644
--- a/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <metadata>
   <groupId>org.apache.testgroup</groupId>
   <artifactId>discovery</artifactId>
diff --git a/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
index 50215f42b..a88c6f2df 100644
--- a/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <metadata>
   <groupId>org.apache.testgroup</groupId>
   <artifactId>discovery</artifactId>
diff --git a/archiva-indexer/pom.xml b/archiva-indexer/pom.xml
index 8f5aa5e51..1d1e9cb46 100644
--- a/archiva-indexer/pom.xml
+++ b/archiva-indexer/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -15,7 +16,7 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva</artifactId>
diff --git a/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java
index 8a1e49d39..a5decd7bc 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java
@@ -1,8 +1,5 @@
 package org.apache.maven.archiva.indexer.record;
 
-import java.util.Date;
-import java.util.List;
-
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
  *
@@ -19,6 +16,9 @@ import java.util.List;
  * limitations under the License.
  */
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * The a record with the fields in the minimal index.
  *
diff --git a/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java
index 4998c3119..1966bdb99 100644
--- a/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java
@@ -1,9 +1,5 @@
 package org.apache.maven.archiva.indexer.record;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
  *
@@ -20,6 +16,10 @@ import java.util.List;
  * limitations under the License.
  */
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * The a record with the fields in the standard index.
  *
diff --git a/archiva-indexer/src/site/apt/design.apt b/archiva-indexer/src/site/apt/design.apt
index c442f57d8..aea3f9634 100644
--- a/archiva-indexer/src/site/apt/design.apt
+++ b/archiva-indexer/src/site/apt/design.apt
@@ -6,6 +6,23 @@
  25 July 2006
  -----
 
+~~ Copyright 2006 The Apache Software Foundation.
+~~
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
 Indexer Design
 
   <<Note: The current indexer design is under review. This document will grow into what it should be, and the code and
diff --git a/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml
index 4f48f07cd..4d685d716 100644
--- a/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml
+++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <metadata>
   <groupId>org.apache.maven</groupId>
   <artifactId>maven-artifact</artifactId>
diff --git a/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml
index f4c4eb8b3..6943f34a2 100644
--- a/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml
+++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <metadata>
   <groupId>org.apache.maven</groupId>
   <artifactId>maven-artifact</artifactId>
diff --git a/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml b/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml
index 3a837529b..ac464ab31 100644
--- a/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml
+++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <metadata>
   <groupId>org.apache.maven</groupId>
   <plugins>
diff --git a/archiva-indexer/src/test/repository/test/maven-metadata.xml b/archiva-indexer/src/test/repository/test/maven-metadata.xml
index 7d6ae9f04..e993531ad 100644
--- a/archiva-indexer/src/test/repository/test/maven-metadata.xml
+++ b/archiva-indexer/src/test/repository/test/maven-metadata.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <metadata>
   <groupId>test</groupId>
   <plugins>
diff --git a/archiva-plexus-application/pom.xml b/archiva-plexus-application/pom.xml
index 6eb24f1cc..c42102e5a 100644
--- a/archiva-plexus-application/pom.xml
+++ b/archiva-plexus-application/pom.xml
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
diff --git a/archiva-plexus-application/src/conf/application.xml b/archiva-plexus-application/src/conf/application.xml
index 6ed734cc6..b21c3c3c5 100644
--- a/archiva-plexus-application/src/conf/application.xml
+++ b/archiva-plexus-application/src/conf/application.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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>
 
   <services>
diff --git a/archiva-plexus-application/src/conf/plexus.xml b/archiva-plexus-application/src/conf/plexus.xml
index f997fa797..55c17787f 100644
--- a/archiva-plexus-application/src/conf/plexus.xml
+++ b/archiva-plexus-application/src/conf/plexus.xml
@@ -1 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <plexus/>
diff --git a/archiva-plexus-runtime/pom.xml b/archiva-plexus-runtime/pom.xml
index 2c204db34..78faecf65 100644
--- a/archiva-plexus-runtime/pom.xml
+++ b/archiva-plexus-runtime/pom.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
diff --git a/archiva-plexus-runtime/src/conf/plexus.xml b/archiva-plexus-runtime/src/conf/plexus.xml
index 2ba9fecbb..8bd749ea2 100644
--- a/archiva-plexus-runtime/src/conf/plexus.xml
+++ b/archiva-plexus-runtime/src/conf/plexus.xml
@@ -1,4 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
 
 <plexus> 
   <load-on-start>
diff --git a/archiva-plexus-runtime/src/main/assembly/bin.xml b/archiva-plexus-runtime/src/main/assembly/bin.xml
index 590ea9164..97d5b5ce8 100644
--- a/archiva-plexus-runtime/src/main/assembly/bin.xml
+++ b/archiva-plexus-runtime/src/main/assembly/bin.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <assembly>
   <id>bin</id>
   <formats>
diff --git a/archiva-proxy/pom.xml b/archiva-proxy/pom.xml
index eb027f60e..6f3bd7c91 100644
--- a/archiva-proxy/pom.xml
+++ b/archiva-proxy/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-proxy/src/site/apt/how-to.apt b/archiva-proxy/src/site/apt/how-to.apt
index 14cf1ef4b..4f7d7eb51 100644
--- a/archiva-proxy/src/site/apt/how-to.apt
+++ b/archiva-proxy/src/site/apt/how-to.apt
@@ -1,3 +1,20 @@
+~~ Copyright 2006 The Apache Software Foundation.
+~~
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
 ProxyManager
 
   The ProxyManager is designed to be used as a simple object or bean for use by
diff --git a/archiva-reports-standard/pom.xml b/archiva-reports-standard/pom.xml
index da0737a8e..29cc5b48c 100755
--- a/archiva-reports-standard/pom.xml
+++ b/archiva-reports-standard/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportGroup.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportGroup.java
index eec3b01f9..50a5a4bab 100644
--- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportGroup.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportGroup.java
@@ -1,12 +1,5 @@
 package org.apache.maven.archiva.reporting;
 
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
-import org.apache.maven.model.Model;
-
-import java.util.Map;
-
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
  *
@@ -23,6 +16,13 @@ import java.util.Map;
  * limitations under the License.
  */
 
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.apache.maven.model.Model;
+
+import java.util.Map;
+
 /**
  * A grouping or report processors for execution as a visible report from the web interface - eg, "health",
  * "old artifacts", etc.
diff --git a/archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml b/archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml
index a8ea6e7e0..0e044a3bd 100644
--- a/archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml
+++ b/archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml b/archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml
index 44c9d51ff..9e6f5c68a 100644
--- a/archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml
+++ b/archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml
@@ -1,4 +1,5 @@
-This file is here to make sure that it will not be processed during unit <!--
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,4 +15,5 @@ This file is here to make sure that it will not be processed during unit <!--
   ~ limitations under the License.
   -->
 
+This file is here to make sure that it will not be processed during unit 
     test.
 \ No newline at end of file
diff --git a/archiva-reports-standard/src/test/repository/maven-metadata.xml b/archiva-reports-standard/src/test/repository/maven-metadata.xml
index 9efaee38c..2b1b5b1a1 100644
--- a/archiva-reports-standard/src/test/repository/maven-metadata.xml
+++ b/archiva-reports-standard/src/test/repository/maven-metadata.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml
index 862124666..f0c16341f 100644
--- a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml
+++ b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <component-set>
   <components>
     <component>
diff --git a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml
index caee1840a..34b01e482 100644
--- a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml
+++ b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.xml b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.xml
index 032e17e16..1f7cfcecd 100644
--- a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.xml
+++ b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-repository-layer/pom.xml b/archiva-repository-layer/pom.xml
index 3b177c22e..af8029c4f 100644
--- a/archiva-repository-layer/pom.xml
+++ b/archiva-repository-layer/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -16,7 +15,8 @@
   ~ limitations under the License.
   -->
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
diff --git a/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml b/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml
index bb105fbcb..b468d3eb7 100644
--- a/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml
+++ b/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-security/pom.xml b/archiva-security/pom.xml
index e43414aa4..da4f8e867 100644
--- a/archiva-security/pom.xml
+++ b/archiva-security/pom.xml
@@ -1,4 +1,22 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>archiva</artifactId>
     <groupId>org.apache.maven.archiva</groupId>
diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java b/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java
index c8ba7d127..caf4766b2 100644
--- a/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java
+++ b/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java
@@ -18,8 +18,8 @@ package org.apache.maven.archiva.security;
 
 import org.codehaus.plexus.rbac.profile.AbstractRoleProfile;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @todo why does this need to be created in the client app?
diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java b/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java
index 91c730d20..fd76c1e2f 100644
--- a/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java
+++ b/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java
@@ -18,8 +18,8 @@ package org.apache.maven.archiva.security;
 
 import org.codehaus.plexus.rbac.profile.AbstractDynamicRoleProfile;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @plexus.component role="org.codehaus.plexus.rbac.profile.DynamicRoleProfile"
diff --git a/archiva-security/src/main/resources/META-INF/plexus/components.xml b/archiva-security/src/main/resources/META-INF/plexus/components.xml
index 8accc36fe..3f5190db0 100644
--- a/archiva-security/src/main/resources/META-INF/plexus/components.xml
+++ b/archiva-security/src/main/resources/META-INF/plexus/components.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <component-set>
   <components>
     <!-- TODO: wouldn't need to redeclare if it was composition -->
diff --git a/archiva-utils/pom.xml b/archiva-utils/pom.xml
index baa86124e..5225338f0 100644
--- a/archiva-utils/pom.xml
+++ b/archiva-utils/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml
index 31c84b009..7103e4654 100644
--- a/archiva-webapp/pom.xml
+++ b/archiva-webapp/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" ?>
-
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -120,8 +119,8 @@
       <version>2.1-SNAPSHOT</version>
       <exclusions>
         <exclusion>
-            <groupId>plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
+          <groupId>plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -190,12 +189,12 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
       <version>1.2</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-mail-sender-javamail</artifactId>
       <version>1.0-alpha-3</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
@@ -239,13 +238,20 @@
               <includes>
                 <!-- TODO: META-INF shouldn't be required, seems to be an issue with the current war plugin -->
                 <include>META-INF</include>
-                <include>WEB-INF/classes</include>      <!-- Classes and Resources from other wars -->
-                <include>WEB-INF/lib</include>          <!-- Dependencies from other wars -->
-                <include>WEB-INF/database</include>     <!-- Database location configured in application.xml -->
-                <include>WEB-INF/logs</include>         <!-- Log file location specified in application.xml -->
-                <include>pss</include>                  <!-- plexus-security css and javascript -->
-                <include>WEB-INF/jsp/pss</include>      <!-- plexus-security jsps -->
-                <include>WEB-INF/template/pss</include> <!-- plexus-security xwork templates -->
+                <include>WEB-INF/classes</include>
+                <!-- Classes and Resources from other wars -->
+                <include>WEB-INF/lib</include>
+                <!-- Dependencies from other wars -->
+                <include>WEB-INF/database</include>
+                <!-- Database location configured in application.xml -->
+                <include>WEB-INF/logs</include>
+                <!-- Log file location specified in application.xml -->
+                <include>pss</include>
+                <!-- plexus-security css and javascript -->
+                <include>WEB-INF/jsp/pss</include>
+                <!-- plexus-security jsps -->
+                <include>WEB-INF/template/pss</include>
+                <!-- plexus-security xwork templates -->
               </includes>
             </fileset>
           </filesets>
diff --git a/archiva-webapp/src/jetty-env.xml b/archiva-webapp/src/jetty-env.xml
index 09d573d9f..4b577ef78 100644
--- a/archiva-webapp/src/jetty-env.xml
+++ b/archiva-webapp/src/jetty-env.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
 
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
 <Configure class="org.mortbay.jetty.webapp.WebAppContext">
 
 <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java
index 10a6945ee..3db1c6b02 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java
@@ -16,20 +16,18 @@ package org.apache.maven.archiva.web.action;
  * limitations under the License.
  */
 
+import com.opensymphony.webwork.interceptor.ServletResponseAware;
 import org.apache.maven.archiva.proxy.ProxyException;
 import org.apache.maven.archiva.proxy.ProxyManager;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 
-import com.opensymphony.webwork.interceptor.ServletResponseAware;
-
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * Proxy functionality.
  *
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
index 9b573b652..bc6f44321 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
@@ -31,8 +31,8 @@ import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
 import org.apache.maven.archiva.indexer.lucene.LuceneQuery;
 import org.apache.maven.archiva.indexer.lucene.LuceneRepositoryArtifactIndex;
 import org.apache.maven.archiva.indexer.record.StandardIndexRecordFields;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 import org.apache.maven.archiva.web.util.VersionMerger;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.io.File;
 import java.net.MalformedURLException;
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
index 7ca7cb817..208d92597 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
@@ -28,6 +28,7 @@ import org.apache.maven.archiva.indexer.RepositoryIndexException;
 import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
 import org.apache.maven.archiva.indexer.lucene.LuceneQuery;
 import org.apache.maven.archiva.indexer.record.StandardArtifactIndexRecord;
+import org.apache.maven.archiva.web.util.VersionMerger;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -46,7 +47,6 @@ import org.apache.maven.report.projectinfo.dependencies.ReportResolutionListener
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-import org.apache.maven.archiva.web.util.VersionMerger;
 
 import java.io.File;
 import java.io.IOException;
@@ -55,7 +55,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java
index b86eaefb7..8d93a4d21 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java
@@ -25,14 +25,14 @@ import org.apache.maven.archiva.configuration.ConfigurationStore;
 import org.apache.maven.archiva.configuration.ConfigurationStoreException;
 import org.apache.maven.archiva.configuration.InvalidConfigurationException;
 import org.apache.maven.archiva.security.ArchivaRoleConstants;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+import org.codehaus.plexus.rbac.profile.RoleProfileException;
+import org.codehaus.plexus.rbac.profile.RoleProfileManager;
 import org.codehaus.plexus.security.rbac.RbacManagerException;
 import org.codehaus.plexus.security.rbac.Resource;
 import org.codehaus.plexus.security.ui.web.interceptor.SecureAction;
 import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
 import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException;
-import org.codehaus.plexus.rbac.profile.RoleProfileException;
-import org.codehaus.plexus.rbac.profile.RoleProfileManager;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.io.IOException;
 
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java
index a93f4dcae..63206a74d 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java
@@ -23,11 +23,11 @@ import org.apache.maven.archiva.configuration.ConfigurationStore;
 import org.apache.maven.archiva.configuration.ConfigurationStoreException;
 import org.apache.maven.archiva.configuration.InvalidConfigurationException;
 import org.apache.maven.archiva.security.ArchivaRoleConstants;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+import org.codehaus.plexus.security.rbac.Resource;
 import org.codehaus.plexus.security.ui.web.interceptor.SecureAction;
 import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
 import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException;
-import org.codehaus.plexus.security.rbac.Resource;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.io.IOException;
 
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java
index 78b5e1d94..3d2a3a396 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java
@@ -18,11 +18,7 @@ package org.apache.maven.archiva.web.action.admin;
 
 import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration;
 import org.apache.maven.archiva.configuration.RepositoryConfiguration;
-import org.apache.maven.archiva.security.ArchivaRoleConstants;
 import org.codehaus.plexus.rbac.profile.RoleProfileException;
-import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
-import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException;
-import org.codehaus.plexus.security.rbac.Resource;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java
index 8da33970d..e65d586dd 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java
@@ -19,11 +19,11 @@ package org.apache.maven.archiva.web.action.admin;
 import org.apache.maven.archiva.scheduler.RepositoryTaskScheduler;
 import org.apache.maven.archiva.scheduler.TaskExecutionException;
 import org.apache.maven.archiva.security.ArchivaRoleConstants;
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+import org.codehaus.plexus.security.rbac.Resource;
+import org.codehaus.plexus.security.ui.web.interceptor.SecureAction;
 import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
 import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException;
-import org.codehaus.plexus.security.ui.web.interceptor.SecureAction;
-import org.codehaus.plexus.security.rbac.Resource;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * Configures the application.
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java
index 1ab400de5..0e985135f 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java
@@ -1,17 +1,7 @@
 package org.apache.maven.archiva.web.check;
 
-import org.apache.maven.archiva.configuration.ConfigurationStore;
-import org.apache.maven.archiva.configuration.ConfigurationStoreException;
-import org.apache.maven.archiva.configuration.RepositoryConfiguration;
-import org.codehaus.plexus.rbac.profile.RoleProfileException;
-import org.codehaus.plexus.rbac.profile.RoleProfileManager;
-import org.codehaus.plexus.security.system.check.EnvironmentCheck;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-
-import java.util.Iterator;
-import java.util.List;
 /*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2005-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +16,17 @@ import java.util.List;
  * limitations under the License.
  */
 
+import org.apache.maven.archiva.configuration.ConfigurationStore;
+import org.apache.maven.archiva.configuration.ConfigurationStoreException;
+import org.apache.maven.archiva.configuration.RepositoryConfiguration;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.rbac.profile.RoleProfileException;
+import org.codehaus.plexus.rbac.profile.RoleProfileManager;
+import org.codehaus.plexus.security.system.check.EnvironmentCheck;
+
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * RoleExistanceEnvironmentCheck:
  *
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java
index 1eade2b46..3970478f0 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java
@@ -16,6 +16,8 @@ package org.apache.maven.archiva.web.servlet.repository;
  * limitations under the License.
  */
 
+import it.could.webdav.DAVTransaction;
+import it.could.webdav.DAVUtilities;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ConfigurationStore;
 import org.apache.maven.archiva.configuration.ConfigurationStoreException;
@@ -33,19 +35,15 @@ import org.codehaus.plexus.security.ui.web.filter.authentication.HttpAuthenticat
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
 
-import it.could.webdav.DAVTransaction;
-import it.could.webdav.DAVUtilities;
-
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * RepositoryAccess - access read/write to the repository.
  *
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryMapping.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryMapping.java
index 587b88359..00957372a 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryMapping.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryMapping.java
@@ -16,17 +16,16 @@ package org.apache.maven.archiva.web.servlet.repository;
  * limitations under the License.
  */
 
+import it.could.webdav.DAVListener;
+import it.could.webdav.DAVProcessor;
+import it.could.webdav.DAVRepository;
+import it.could.webdav.DAVResource;
 import org.apache.maven.archiva.configuration.RepositoryConfiguration;
 import org.codehaus.plexus.logging.Logger;
 
 import java.io.File;
 import java.io.IOException;
 
-import it.could.webdav.DAVListener;
-import it.could.webdav.DAVProcessor;
-import it.could.webdav.DAVRepository;
-import it.could.webdav.DAVResource;
-
 /**
  * RepositoryMapping 
  *
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java
index d74799f70..b926ed008 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java
@@ -16,17 +16,17 @@ package org.apache.maven.archiva.web.util;
  * limitations under the License.
  */
 
-import org.apache.maven.model.Dependency;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.archiva.indexer.record.StandardArtifactIndexRecord;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.maven.model.Dependency;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java
index 63b9f3995..16b6d8fce 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java
@@ -1,62 +1,62 @@
-package org.apache.maven.archiva.web.validator;
-
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * 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.
- */
-
-import com.opensymphony.xwork.validator.validators.ValidatorSupport;
-import com.opensymphony.xwork.validator.ValidationException;
-import com.opensymphony.xwork.validator.ValidatorContext;
-
-/**
- *
- * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
- */
-public class IntervalValidator
-    extends ValidatorSupport
-{
-
-    public void validate( Object obj )
-        throws ValidationException
-    {
-        String snapshotsPolicy = ( String ) getFieldValue( "snapshotsPolicy", obj );
-        String releasesPolicy = ( String ) getFieldValue( "releasesPolicy", obj );
-        Integer snapshotsInterval = ( Integer ) getFieldValue( "snapshotsInterval", obj );
-        Integer releasesInterval = ( Integer ) getFieldValue( "releasesInterval", obj );
-
-        ValidatorContext ctxt = getValidatorContext();
-
-        if( !snapshotsPolicy.equals( "interval" ) )
-        {
-            if( snapshotsInterval.intValue() != 0 )
-            {
-                ctxt.addActionError( "Snapshots Interval must be set to zero." );
-            }
-        }
-              
-        if( !releasesPolicy.equals( "interval" ) )
-        {
-            if( releasesInterval.intValue() != 0 )
-            {
-                ctxt.addActionError( "Releases Interval must be set to zero." );
-            }
-        }
-
-        if( ctxt.hasActionErrors() )
-        {
-            return;
-        }
-    }
-}
+package org.apache.maven.archiva.web.validator;
+
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * 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.
+ */
+
+import com.opensymphony.xwork.validator.ValidationException;
+import com.opensymphony.xwork.validator.ValidatorContext;
+import com.opensymphony.xwork.validator.validators.ValidatorSupport;
+
+/**
+ *
+ * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
+ */
+public class IntervalValidator
+    extends ValidatorSupport
+{
+
+    public void validate( Object obj )
+        throws ValidationException
+    {
+        String snapshotsPolicy = ( String ) getFieldValue( "snapshotsPolicy", obj );
+        String releasesPolicy = ( String ) getFieldValue( "releasesPolicy", obj );
+        Integer snapshotsInterval = ( Integer ) getFieldValue( "snapshotsInterval", obj );
+        Integer releasesInterval = ( Integer ) getFieldValue( "releasesInterval", obj );
+
+        ValidatorContext ctxt = getValidatorContext();
+
+        if( !snapshotsPolicy.equals( "interval" ) )
+        {
+            if( snapshotsInterval.intValue() != 0 )
+            {
+                ctxt.addActionError( "Snapshots Interval must be set to zero." );
+            }
+        }
+              
+        if( !releasesPolicy.equals( "interval" ) )
+        {
+            if( releasesInterval.intValue() != 0 )
+            {
+                ctxt.addActionError( "Releases Interval must be set to zero." );
+            }
+        }
+
+        if( ctxt.hasActionErrors() )
+        {
+            return;
+        }
+    }
+}
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java
index 42977bd08..c515acf46 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java
@@ -1,111 +1,111 @@
-package org.apache.maven.archiva.web.validator;
-
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * 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.
- */
-
-import com.opensymphony.xwork.validator.validators.ValidatorSupport;
-import com.opensymphony.xwork.validator.ValidationException;
-import com.opensymphony.xwork.validator.ValidatorContext;
-
-/**
- * Validator for synced repository form. The values to be validated depends on the
- * selected sync method to be used.
- *
- * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
- */
-public class SyncedRepositoryValidator
-    extends ValidatorSupport
-{
-
-    public void validate( Object obj )
-        throws ValidationException
-    {
-
-        String method = ( String ) getFieldValue( "method", obj );
-        ValidatorContext ctxt = getValidatorContext();
-
-        if( method.equals( "rsync" ) )
-        {
-            String rsyncHost = ( String ) getFieldValue( "rsyncHost", obj );
-            if( rsyncHost == null || rsyncHost.equals("") )
-            {
-                ctxt.addActionError( "Rsync host is required." );
-            }
-
-            String rsyncDirectory = ( String ) getFieldValue( "rsyncDirectory", obj );
-            if( rsyncDirectory == null || rsyncDirectory.equals("") )
-            {
-                ctxt.addActionError( "Rsync directory is required." );
-            }
-
-            String rsyncMethod = ( String ) getFieldValue( "rsyncMethod", obj );
-            if( rsyncMethod == null || rsyncMethod.equals("") )
-            {
-                ctxt.addActionError( "Rsync method is required." );
-            }
-            else
-            {
-                if( !rsyncMethod.equals( "anonymous" ) && !rsyncMethod.equals( "ssh" ) )
-                {
-                    ctxt.addActionError( "Invalid rsync method" );
-                }
-            }
-
-            String username = ( String ) getFieldValue( "username", obj );
-            if( username == null || username.equals("") )
-            {
-                ctxt.addActionError( "Username is required." );
-            }
-
-        }
-        else if ( method.equals( "svn" ) )
-        {
-            String svnUrl = ( String ) getFieldValue( "svnUrl", obj );
-            if( svnUrl == null || svnUrl.equals("") )
-            {
-                ctxt.addActionError( "SVN url is required." );
-            }
-
-            String username = ( String ) getFieldValue( "username", obj );
-            if( username == null || username.equals("") )
-            {
-                ctxt.addActionError( "Username is required." );
-            }
-        }
-        else if ( method.equals( "cvs" ) )
-        {
-            String cvsRoot = ( String ) getFieldValue( "cvsRoot", obj );
-            if( cvsRoot == null || cvsRoot.equals("") )
-            {
-                ctxt.addActionError( "CVS root is required." );
-            }
-        }
-        else if ( method.equals( "file" ) )
-        {
-            String directory = ( String ) getFieldValue( "directory", obj );
-            if( directory == null || directory.equals("") )
-            {
-                ctxt.addActionError( "Directory is required." );
-            }
-        }
-
-        if( ctxt.hasActionErrors() )
-        {
-            return;
-        }
-    }
-
-}
+package org.apache.maven.archiva.web.validator;
+
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * 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.
+ */
+
+import com.opensymphony.xwork.validator.ValidationException;
+import com.opensymphony.xwork.validator.ValidatorContext;
+import com.opensymphony.xwork.validator.validators.ValidatorSupport;
+
+/**
+ * Validator for synced repository form. The values to be validated depends on the
+ * selected sync method to be used.
+ *
+ * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
+ */
+public class SyncedRepositoryValidator
+    extends ValidatorSupport
+{
+
+    public void validate( Object obj )
+        throws ValidationException
+    {
+
+        String method = ( String ) getFieldValue( "method", obj );
+        ValidatorContext ctxt = getValidatorContext();
+
+        if( method.equals( "rsync" ) )
+        {
+            String rsyncHost = ( String ) getFieldValue( "rsyncHost", obj );
+            if( rsyncHost == null || rsyncHost.equals("") )
+            {
+                ctxt.addActionError( "Rsync host is required." );
+            }
+
+            String rsyncDirectory = ( String ) getFieldValue( "rsyncDirectory", obj );
+            if( rsyncDirectory == null || rsyncDirectory.equals("") )
+            {
+                ctxt.addActionError( "Rsync directory is required." );
+            }
+
+            String rsyncMethod = ( String ) getFieldValue( "rsyncMethod", obj );
+            if( rsyncMethod == null || rsyncMethod.equals("") )
+            {
+                ctxt.addActionError( "Rsync method is required." );
+            }
+            else
+            {
+                if( !rsyncMethod.equals( "anonymous" ) && !rsyncMethod.equals( "ssh" ) )
+                {
+                    ctxt.addActionError( "Invalid rsync method" );
+                }
+            }
+
+            String username = ( String ) getFieldValue( "username", obj );
+            if( username == null || username.equals("") )
+            {
+                ctxt.addActionError( "Username is required." );
+            }
+
+        }
+        else if ( method.equals( "svn" ) )
+        {
+            String svnUrl = ( String ) getFieldValue( "svnUrl", obj );
+            if( svnUrl == null || svnUrl.equals("") )
+            {
+                ctxt.addActionError( "SVN url is required." );
+            }
+
+            String username = ( String ) getFieldValue( "username", obj );
+            if( username == null || username.equals("") )
+            {
+                ctxt.addActionError( "Username is required." );
+            }
+        }
+        else if ( method.equals( "cvs" ) )
+        {
+            String cvsRoot = ( String ) getFieldValue( "cvsRoot", obj );
+            if( cvsRoot == null || cvsRoot.equals("") )
+            {
+                ctxt.addActionError( "CVS root is required." );
+            }
+        }
+        else if ( method.equals( "file" ) )
+        {
+            String directory = ( String ) getFieldValue( "directory", obj );
+            if( directory == null || directory.equals("") )
+            {
+                ctxt.addActionError( "Directory is required." );
+            }
+        }
+
+        if( ctxt.hasActionErrors() )
+        {
+            return;
+        }
+    }
+
+}
diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index ddf294dd9..d19eda1c2 100644
--- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml
index 771a8ab6b..6de73f94b 100644
--- a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-quickSearch-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-quickSearch-validation.xml
index 961cb7c8d..b47dc5732 100644
--- a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-quickSearch-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-quickSearch-validation.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml
index 60b774bc7..a4b6c4dc3 100644
--- a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml
index cbff19aba..9f1863275 100644
--- a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -5,7 +6,7 @@
   ~ 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,
diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml
index d94b4791d..7bc822e73 100644
--- a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml
index a6297bc66..e9ca1b2f1 100644
--- a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -5,7 +6,7 @@
   ~ 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,
diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml
index 6ca060037..6ce896027 100644
--- a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -5,7 +6,7 @@
   ~ 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,
diff --git a/archiva-webapp/src/main/resources/validators.xml b/archiva-webapp/src/main/resources/validators.xml
index 758717b03..8eb5c2429 100644
--- a/archiva-webapp/src/main/resources/validators.xml
+++ b/archiva-webapp/src/main/resources/validators.xml
@@ -1,18 +1,35 @@
-<validators>
-  <validator name="required" class="com.opensymphony.xwork.validator.validators.RequiredFieldValidator"/>
-  <validator name="requiredstring" class="com.opensymphony.xwork.validator.validators.RequiredStringValidator"/>
-  <validator name="int" class="com.opensymphony.xwork.validator.validators.IntRangeFieldValidator"/>
-  <validator name="double" class="com.opensymphony.xwork.validator.validators.DoubleRangeFieldValidator"/>
-  <validator name="date" class="com.opensymphony.xwork.validator.validators.DateRangeFieldValidator"/>
-  <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
-  <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
-  <validator name="email" class="com.opensymphony.xwork.validator.validators.EmailValidator"/>
-  <validator name="url" class="com.opensymphony.xwork.validator.validators.URLValidator"/>
-  <validator name="visitor" class="com.opensymphony.xwork.validator.validators.VisitorFieldValidator"/>
-  <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
-  <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
-  <validator name="regex" class="com.opensymphony.xwork.validator.validators.RegexFieldValidator"/>
-  <validator name="interval" class="org.apache.maven.archiva.web.validator.IntervalValidator"/>
-  <validator name="syncedrepo" class="org.apache.maven.archiva.web.validator.SyncedRepositoryValidator"/> 
-</validators>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
+<validators>
+  <validator name="required" class="com.opensymphony.xwork.validator.validators.RequiredFieldValidator"/>
+  <validator name="requiredstring" class="com.opensymphony.xwork.validator.validators.RequiredStringValidator"/>
+  <validator name="int" class="com.opensymphony.xwork.validator.validators.IntRangeFieldValidator"/>
+  <validator name="double" class="com.opensymphony.xwork.validator.validators.DoubleRangeFieldValidator"/>
+  <validator name="date" class="com.opensymphony.xwork.validator.validators.DateRangeFieldValidator"/>
+  <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
+  <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
+  <validator name="email" class="com.opensymphony.xwork.validator.validators.EmailValidator"/>
+  <validator name="url" class="com.opensymphony.xwork.validator.validators.URLValidator"/>
+  <validator name="visitor" class="com.opensymphony.xwork.validator.validators.VisitorFieldValidator"/>
+  <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
+  <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
+  <validator name="regex" class="com.opensymphony.xwork.validator.validators.RegexFieldValidator"/>
+  <validator name="interval" class="org.apache.maven.archiva.web.validator.IntervalValidator"/>
+  <validator name="syncedrepo" class="org.apache.maven.archiva.web.validator.SyncedRepositoryValidator"/> 
+</validators>
+
diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml
index 35ac7aa93..021d2e9cb 100644
--- a/archiva-webapp/src/main/resources/xwork.xml
+++ b/archiva-webapp/src/main/resources/xwork.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml b/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
index 03131ae9f..54fced097 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
+++ b/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/web.xml b/archiva-webapp/src/main/webapp/WEB-INF/web.xml
index 88c26e056..624c7205b 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/archiva-webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/servlet/repository/RepositoryAccessTest.xml b/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/servlet/repository/RepositoryAccessTest.xml
index 24fd42912..016231648 100644
--- a/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/servlet/repository/RepositoryAccessTest.xml
+++ b/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/servlet/repository/RepositoryAccessTest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/pom.xml b/design/white-site/pom.xml
index 20365a8c0..8fca86dea 100644
--- a/design/white-site/pom.xml
+++ b/design/white-site/pom.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
diff --git a/design/white-site/src/site/site.xml b/design/white-site/src/site/site.xml
index bd75d798d..615af85ad 100644
--- a/design/white-site/src/site/site.xml
+++ b/design/white-site/src/site/site.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
 <project name="Archiva">
   <bannerLeft>
     <src>http://www.apache.org/images/asf_logo_wide.gif</src>
diff --git a/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml b/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml
index e602756e9..d3146e480 100644
--- a/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/admin/add-repository.xml b/design/white-site/src/site/xdoc/admin/add-repository.xml
index 3b25774a9..570ba00fa 100644
--- a/design/white-site/src/site/xdoc/admin/add-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/add-repository.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/admin/add-sync-repository.xml b/design/white-site/src/site/xdoc/admin/add-sync-repository.xml
index 17bd5c501..866c29db7 100644
--- a/design/white-site/src/site/xdoc/admin/add-sync-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/add-sync-repository.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/admin/config.xml b/design/white-site/src/site/xdoc/admin/config.xml
index 1c6e5e84d..1594a3fe4 100644
--- a/design/white-site/src/site/xdoc/admin/config.xml
+++ b/design/white-site/src/site/xdoc/admin/config.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml b/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml
index 4da2ed828..55977afef 100644
--- a/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/admin/delete-repository.xml b/design/white-site/src/site/xdoc/admin/delete-repository.xml
index db9fe0002..56cf9971d 100644
--- a/design/white-site/src/site/xdoc/admin/delete-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/delete-repository.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml b/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml
index e1c417edf..7172efa9d 100644
--- a/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml
index 1e53a2c7c..89644a759 100644
--- a/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml
index 6813198f4..6b4752f89 100644
--- a/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml
index 75ab75277..71d3f5411 100644
--- a/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml
index 50d107ad4..05ac81523 100644
--- a/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/admin/index.xml b/design/white-site/src/site/xdoc/admin/index.xml
index f3b0046a0..0cba9b303 100644
--- a/design/white-site/src/site/xdoc/admin/index.xml
+++ b/design/white-site/src/site/xdoc/admin/index.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/admin/login.xml b/design/white-site/src/site/xdoc/admin/login.xml
index f98e8f53e..014005d96 100644
--- a/design/white-site/src/site/xdoc/admin/login.xml
+++ b/design/white-site/src/site/xdoc/admin/login.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/admin/proxies.xml b/design/white-site/src/site/xdoc/admin/proxies.xml
index 80076b45f..1ec35ec9b 100644
--- a/design/white-site/src/site/xdoc/admin/proxies.xml
+++ b/design/white-site/src/site/xdoc/admin/proxies.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/admin/sync.xml b/design/white-site/src/site/xdoc/admin/sync.xml
index 75901de6c..0ab4ac7fe 100644
--- a/design/white-site/src/site/xdoc/admin/sync.xml
+++ b/design/white-site/src/site/xdoc/admin/sync.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/admin/user-details.xml b/design/white-site/src/site/xdoc/admin/user-details.xml
index a559e0651..c6700a4c9 100644
--- a/design/white-site/src/site/xdoc/admin/user-details.xml
+++ b/design/white-site/src/site/xdoc/admin/user-details.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/admin/user-results.xml b/design/white-site/src/site/xdoc/admin/user-results.xml
index dc324c09b..6da482a7a 100644
--- a/design/white-site/src/site/xdoc/admin/user-results.xml
+++ b/design/white-site/src/site/xdoc/admin/user-results.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/admin/users.xml b/design/white-site/src/site/xdoc/admin/users.xml
index c89004aef..2db64dada 100644
--- a/design/white-site/src/site/xdoc/admin/users.xml
+++ b/design/white-site/src/site/xdoc/admin/users.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/design/white-site/src/site/xdoc/artifact.xml b/design/white-site/src/site/xdoc/artifact.xml
index 72d9c4720..65dd1786b 100644
--- a/design/white-site/src/site/xdoc/artifact.xml
+++ b/design/white-site/src/site/xdoc/artifact.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/browse.xml b/design/white-site/src/site/xdoc/browse.xml
index a2b63fe87..ba1e722d9 100644
--- a/design/white-site/src/site/xdoc/browse.xml
+++ b/design/white-site/src/site/xdoc/browse.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/browse2.xml b/design/white-site/src/site/xdoc/browse2.xml
index be7ba01d3..a0674eb57 100644
--- a/design/white-site/src/site/xdoc/browse2.xml
+++ b/design/white-site/src/site/xdoc/browse2.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/browse3.xml b/design/white-site/src/site/xdoc/browse3.xml
index 4f3cb6bff..37af1eef9 100644
--- a/design/white-site/src/site/xdoc/browse3.xml
+++ b/design/white-site/src/site/xdoc/browse3.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/dependedon.xml b/design/white-site/src/site/xdoc/dependedon.xml
index 0787c54f9..7fbcc2f83 100644
--- a/design/white-site/src/site/xdoc/dependedon.xml
+++ b/design/white-site/src/site/xdoc/dependedon.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -5,7 +6,7 @@
   ~ 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,
@@ -14,7 +15,6 @@
   ~ limitations under the License.
   -->
 
-
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/dependencies.xml b/design/white-site/src/site/xdoc/dependencies.xml
index a88d8d79a..2a6d15d9f 100644
--- a/design/white-site/src/site/xdoc/dependencies.xml
+++ b/design/white-site/src/site/xdoc/dependencies.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -5,7 +6,7 @@
   ~ 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,
@@ -14,7 +15,6 @@
   ~ limitations under the License.
   -->
 
-
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/find-artifact.xml b/design/white-site/src/site/xdoc/find-artifact.xml
index a81831556..859e64256 100644
--- a/design/white-site/src/site/xdoc/find-artifact.xml
+++ b/design/white-site/src/site/xdoc/find-artifact.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/index.xml b/design/white-site/src/site/xdoc/index.xml
index 3098eb6de..e47b90ce0 100644
--- a/design/white-site/src/site/xdoc/index.xml
+++ b/design/white-site/src/site/xdoc/index.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/mail-lists.xml b/design/white-site/src/site/xdoc/mail-lists.xml
index 497c96836..b55eaad51 100644
--- a/design/white-site/src/site/xdoc/mail-lists.xml
+++ b/design/white-site/src/site/xdoc/mail-lists.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -5,7 +6,7 @@
   ~ 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,
@@ -14,7 +15,6 @@
   ~ limitations under the License.
   -->
 
-
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/reports.xml b/design/white-site/src/site/xdoc/reports.xml
index f0d95f5f2..0d7b629fb 100644
--- a/design/white-site/src/site/xdoc/reports.xml
+++ b/design/white-site/src/site/xdoc/reports.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/results.xml b/design/white-site/src/site/xdoc/results.xml
index 1fe78a04b..d8aa67a93 100644
--- a/design/white-site/src/site/xdoc/results.xml
+++ b/design/white-site/src/site/xdoc/results.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/design/white-site/src/site/xdoc/sync.xml b/design/white-site/src/site/xdoc/sync.xml
index e09bde156..e17c65c8d 100644
--- a/design/white-site/src/site/xdoc/sync.xml
+++ b/design/white-site/src/site/xdoc/sync.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ 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.
+  -->
+
 <document>
   <properties>
     <title>Archiva</title>
diff --git a/maven-meeper/pom.xml b/maven-meeper/pom.xml
index 158a2c353..af343cbdc 100644
--- a/maven-meeper/pom.xml
+++ b/maven-meeper/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
diff --git a/maven-meeper/src/site/apt/repository-synchronization-refactor-20050406.apt b/maven-meeper/src/site/apt/repository-synchronization-refactor-20050406.apt
index 41b9ad188..df62682a9 100644
--- a/maven-meeper/src/site/apt/repository-synchronization-refactor-20050406.apt
+++ b/maven-meeper/src/site/apt/repository-synchronization-refactor-20050406.apt
@@ -6,6 +6,23 @@
   2005-April-06
   ---
   
+~~ Copyright 2006 The Apache Software Foundation.
+~~
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
 Summary of Changes for the Maven Repository Synchronization Process
 
 *Abstract
diff --git a/pom.xml b/pom.xml
index ae083bfa5..d6522c9ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
diff --git a/src/site/apt/guides/developing/index.apt b/src/site/apt/guides/developing/index.apt
index a271fd722..b29a9e6c1 100644
--- a/src/site/apt/guides/developing/index.apt
+++ b/src/site/apt/guides/developing/index.apt
@@ -1,33 +1,50 @@
- -----
- Developing Archiva
- -----
- Henri Yandell
- -----
- 20 October 2006
- -----
-
-Goal
-
-  The idea here is to explain how to develop Archiva; or at least to provide some 
-  insight into what is what within the maven/archiva/ directory.
-
-Subprojects
-
-  The following subprojects exist within Archiva:
-
-  * archiva-applet - The progress bar on the checksum checking page.
-  * archiva-configuration - A facade on top of the Plexus configuration XML.
-  * archiva-converter - ????
-  * archiva-core - central code, business objects, modello etc.
-  * archiva-discoverer - monitors the managed repositories and kicks off the indexing.
-  * archiva-indexer - the lucene indexing.
-  * archiva-plexus-application - archiva can run on plexus as well as as a war. This creates a plexus app.
-  * archiva-plexus-runtime - archiva can run on plexus as well as as a war. This runs lots of apps.
-  * archiva-proxy - proxy repositories?
-  * archiva-reports-standard - a couple of reports are implemented. Not very pluginable yet.
-  * archiva-repository-layer - ????
-  * archiva-security - webapp security
-  * archiva-utils - some handy archiva specific utils
-  * archiva-webapp - creates a war file
-  * design - contains a mock-up currently
-  * maven-meeper - rsync scripts to sync repositories. Also converts m1 repositories to m2 repositories.
+ -----
+ Developing Archiva
+ -----
+ Henri Yandell
+ -----
+ 20 October 2006
+ -----
+
+~~ Copyright 2006 The Apache Software Foundation.
+~~
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
+Goal
+
+  The idea here is to explain how to develop Archiva; or at least to provide some 
+  insight into what is what within the maven/archiva/ directory.
+
+Subprojects
+
+  The following subprojects exist within Archiva:
+
+  * archiva-applet - The progress bar on the checksum checking page.
+  * archiva-configuration - A facade on top of the Plexus configuration XML.
+  * archiva-converter - ????
+  * archiva-core - central code, business objects, modello etc.
+  * archiva-discoverer - monitors the managed repositories and kicks off the indexing.
+  * archiva-indexer - the lucene indexing.
+  * archiva-plexus-application - archiva can run on plexus as well as as a war. This creates a plexus app.
+  * archiva-plexus-runtime - archiva can run on plexus as well as as a war. This runs lots of apps.
+  * archiva-proxy - proxy repositories?
+  * archiva-reports-standard - a couple of reports are implemented. Not very pluginable yet.
+  * archiva-repository-layer - ????
+  * archiva-security - webapp security
+  * archiva-utils - some handy archiva specific utils
+  * archiva-webapp - creates a war file
+  * design - contains a mock-up currently
+  * maven-meeper - rsync scripts to sync repositories. Also converts m1 repositories to m2 repositories.
diff --git a/src/site/apt/guides/getting-started/index.apt b/src/site/apt/guides/getting-started/index.apt
index 26c22821e..e6ee4a266 100644
--- a/src/site/apt/guides/getting-started/index.apt
+++ b/src/site/apt/guides/getting-started/index.apt
@@ -6,6 +6,23 @@
  1 October 2006
  -----
 
+~~ Copyright 2006 The Apache Software Foundation.
+~~
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
 To checkout the latest code
 
   Using Subversion, either checkout from {{http://svn.apache.org/repos/asf/maven/archiva/trunk/}} or to get all of Maven 2, checkout from {{http://svn.apache.org/repos/asf/maven/trunks/}}.
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index c0ff76a54..9142cc08b 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -6,6 +6,23 @@
  25 May 2006
  -----
 
+~~ Copyright 2006 The Apache Software Foundation.
+~~
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
 Welcome to Maven Archiva
 
   Archiva (the Maven repository manager) is currently under development. It provides several pieces of functionality for your remote repository:
diff --git a/src/site/apt/repository-sync.apt b/src/site/apt/repository-sync.apt
index 5c7ed4c88..73e709abc 100644
--- a/src/site/apt/repository-sync.apt
+++ b/src/site/apt/repository-sync.apt
@@ -6,4 +6,21 @@
  12 October 2006
  ------
 
+~~ Copyright 2006 The Apache Software Foundation.
+~~
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
 Repository Synchronization
author	Edwin L. Punzalan <epunzalan@apache.org>	2006-10-26 09:15:23 +0000
committer	Edwin L. Punzalan <epunzalan@apache.org>	2006-10-26 09:15:23 +0000
commit	2b1e907f1070d1ceef1f9e211363af3aacd2b95c (patch)
tree	87e3dc71eb1d1c01c214771d04c1dc98359deb3a
parent	15fe0128dd35bc08124b4ee76d59b360ad6541cb (diff)
download	archiva-2b1e907f1070d1ceef1f9e211363af3aacd2b95c.tar.gz archiva-2b1e907f1070d1ceef1f9e211363af3aacd2b95c.zip