fixed remaining old output folder location
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/branches/log4j12-bz53299@1353069 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java b/core/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
index e4bd162..adeee82 100644
--- a/core/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
+++ b/core/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
@@ -434,7 +434,7 @@
/**
Test case for MDC conversion pattern. */
public void testMDC2() throws Exception {
- String OUTPUT_FILE = "output/patternLayout.mdc.2";
+ String OUTPUT_FILE = ResourceHelper.outputFullpath("/patternLayout.mdc.2");
String WITNESS_FILE = ResourceHelper.witnessFullpath("/pattern/enhancedPatternLayout.mdc.2");
String mdcMsgPattern1 = "%m : %X%n";
diff --git a/core/src/test/java/org/apache/log4j/xml/DOMTestCase.java b/core/src/test/java/org/apache/log4j/xml/DOMTestCase.java
index 387c2a1..101b144 100644
--- a/core/src/test/java/org/apache/log4j/xml/DOMTestCase.java
+++ b/core/src/test/java/org/apache/log4j/xml/DOMTestCase.java
@@ -395,11 +395,9 @@
*/
public void testJarURL() throws IOException {
File input = new File(ResourceHelper.inputFullpath("/xml/defaultInit.xml"));
- System.out.println(input.getAbsolutePath());
+
InputStream is = new FileInputStream(input);
- File dir = new File("output");
- dir.mkdirs();
- File file = new File("output/xml.jar");
+ File file = new File(ResourceHelper.outputFullpath("/xml.jar"));
ZipOutputStream zos =
new ZipOutputStream(new FileOutputStream(file));
zos.putNextEntry(new ZipEntry("log4j.xml"));
diff --git a/core/src/test/resources/input/defaultInit3.properties b/core/src/test/resources/input/defaultInit3.properties
index 3c2e433..a4c2f7b 100644
--- a/core/src/test/resources/input/defaultInit3.properties
+++ b/core/src/test/resources/input/defaultInit3.properties
@@ -15,7 +15,7 @@
log4j.rootCategory=DEBUG, D3
log4j.appender.D3=org.apache.log4j.FileAppender
-log4j.appender.D3.File=output/temp
+log4j.appender.D3.File=target/output/temp
log4j.appender.D3.Append=false
log4j.appender.D3.layout=org.apache.log4j.PatternLayout
log4j.appender.D3.layout.ConversionPattern=%d [%t] %-5p %.16c - %m%n
\ No newline at end of file
diff --git a/core/src/test/resources/input/fallback1.properties b/core/src/test/resources/input/fallback1.properties
index 4c7da01..7578a06 100644
--- a/core/src/test/resources/input/fallback1.properties
+++ b/core/src/test/resources/input/fallback1.properties
@@ -24,7 +24,7 @@
log4j.appender.PRIMARY.layout.conversionPattern=%-5p %c{2} - %m%n
log4j.appender.FALLBACK=org.apache.log4j.FileAppender
-log4j.appender.FALLBACK.File=output/ErrorHandlerTestCase-temp
+log4j.appender.FALLBACK.File=target/output/ErrorHandlerTestCase-temp
log4j.appender.FALLBACK.Append=false
log4j.appender.FALLBACK.layout=org.apache.log4j.PatternLayout
log4j.appender.FALLBACK.layout.ConversionPattern=FALLBACK - %c - %m%n
