move tags into file so it is well formed

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@673279 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
index 75ff15c3a0545212a48db864c91be897e45cc14f..70c88d4d8754d4bd2bd60fd9520988e5e2e9f096 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
@@ -99,9 +99,8 @@ public class ArchivaConfigurationTest
         repo = new File( getBasedir(), "/target/test-classes/existing_internal" );
         repo.mkdirs();
         
-        String existingTestDefaultArchivaConfigFile = "<configuration>" +
-            FileUtils.readFileToString( getTestFile( "target/test-classes/org/apache/maven/archiva/configuration/test-default-archiva.xml" ) ) 
-            + "</configuration>";        
+        String existingTestDefaultArchivaConfigFile = 
+            FileUtils.readFileToString( getTestFile( "target/test-classes/org/apache/maven/archiva/configuration/test-default-archiva.xml" ) ) ;        
         existingTestDefaultArchivaConfigFile = StringUtils.replace( existingTestDefaultArchivaConfigFile, "${appserver.base}", getBasedir() );
         
         File generatedTestDefaultArchivaConfigFile =

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/test-default-archiva.xml b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/test-default-archiva.xml
index 30fdf38a04cd0cf5eab2774c319ac1ed802a3060..6f44eb4afccb5887f1feeadfdb4453a6dc2f4896 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/test-default-archiva.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/test-default-archiva.xml
@@ -1,3 +1,4 @@
+<configuration>
   <version>2</version>
   <managedRepositories>
     <managedRepository>
@@ -172,3 +173,4 @@
       <appletFindEnabled>true</appletFindEnabled>
     </ui>
   </webapp>
+</configuration>