From b5b378703bd5781c1b4151b7058076692d15c32f Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Wed, 2 Jul 2008 04:58:03 +0000 Subject: [PATCH] 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 --- .../archiva/configuration/ArchivaConfigurationTest.java | 5 ++--- .../maven/archiva/configuration/test-default-archiva.xml | 2 ++ 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 = "" + - FileUtils.readFileToString( getTestFile( "target/test-classes/org/apache/maven/archiva/configuration/test-default-archiva.xml" ) ) - + ""; + 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 @@ + 2 @@ -172,3 +173,4 @@ true + -- 2.39.5