aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules
diff options
context:
space:
mode:
authorBrett Porter <brett@apache.org>2008-07-02 04:58:03 +0000
committerBrett Porter <brett@apache.org>2008-07-02 04:58:03 +0000
commitb5b378703bd5781c1b4151b7058076692d15c32f (patch)
tree2dcb0ce414e88bcf3d89934f542d3e3d508d2e9c /archiva-modules
parent6723188061935b4f7e7f0b6c05b28c309c7954d1 (diff)
downloadarchiva-b5b378703bd5781c1b4151b7058076692d15c32f.tar.gz
archiva-b5b378703bd5781c1b4151b7058076692d15c32f.zip
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
Diffstat (limited to 'archiva-modules')
-rw-r--r--archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java5
-rw-r--r--archiva-modules/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/test-default-archiva.xml2
2 files changed, 4 insertions, 3 deletions
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 75ff15c3a..70c88d4d8 100644
--- 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 30fdf38a0..6f44eb4af 100644
--- 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>