Author: bentmann
Date: Sun Feb 20 17:30:26 2011
New Revision: 1072641
URL: http://svn.apache.org/viewvc?rev=1072641&view=rev
Log:
o Used Windows-friendly filename
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/settings-template.xml
(props changed)
- copied unchanged from r1072634,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/settings.xml.template
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/settings.xml.template
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java?rev=1072641&r1=1072640&r2=1072641&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
Sun Feb 20 17:30:26 2011
@@ -147,7 +147,7 @@ public class MavenITmng3599useHttpProxyF
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- String settings = FileUtils.fileRead( new File( testDir,
"settings.xml.template" ) );
+ String settings = FileUtils.fileRead( new File( testDir,
"settings-template.xml" ) );
settings = StringUtils.replace( settings, "@port@", Integer.toString(
port ) );
String newSettings = StringUtils.replace( settings, "@protocol@",
"http" );
@@ -191,7 +191,7 @@ public class MavenITmng3599useHttpProxyF
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- String settings = FileUtils.fileRead( new File( testDir,
"settings.xml.template" ) );
+ String settings = FileUtils.fileRead( new File( testDir,
"settings-template.xml" ) );
settings = StringUtils.replace( settings, "@port@", Integer.toString(
port ) );
String newSettings = StringUtils.replace( settings, "@protocol@",
"dav" );
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
