You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gr...@apache.org on 2012/06/23 07:51:51 UTC
svn commit: r1353069 - in
/logging/log4j/branches/log4j12-bz53299/core/src/test:
java/org/apache/log4j/ java/org/apache/log4j/xml/ resources/input/
Author: grobmeier
Date: Sat Jun 23 05:51:50 2012
New Revision: 1353069
URL: http://svn.apache.org/viewvc?rev=1353069&view=rev
Log:
fixed remaining old output folder location
Modified:
logging/log4j/branches/log4j12-bz53299/core/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
logging/log4j/branches/log4j12-bz53299/core/src/test/java/org/apache/log4j/xml/DOMTestCase.java
logging/log4j/branches/log4j12-bz53299/core/src/test/resources/input/defaultInit3.properties
logging/log4j/branches/log4j12-bz53299/core/src/test/resources/input/fallback1.properties
Modified: logging/log4j/branches/log4j12-bz53299/core/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/log4j12-bz53299/core/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java?rev=1353069&r1=1353068&r2=1353069&view=diff
==============================================================================
--- logging/log4j/branches/log4j12-bz53299/core/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java (original)
+++ logging/log4j/branches/log4j12-bz53299/core/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java Sat Jun 23 05:51:50 2012
@@ -434,7 +434,7 @@ public class EnhancedPatternLayoutTestCa
/**
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";
Modified: logging/log4j/branches/log4j12-bz53299/core/src/test/java/org/apache/log4j/xml/DOMTestCase.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/log4j12-bz53299/core/src/test/java/org/apache/log4j/xml/DOMTestCase.java?rev=1353069&r1=1353068&r2=1353069&view=diff
==============================================================================
--- logging/log4j/branches/log4j12-bz53299/core/src/test/java/org/apache/log4j/xml/DOMTestCase.java (original)
+++ logging/log4j/branches/log4j12-bz53299/core/src/test/java/org/apache/log4j/xml/DOMTestCase.java Sat Jun 23 05:51:50 2012
@@ -395,11 +395,9 @@ public class DOMTestCase extends TestCas
*/
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"));
Modified: logging/log4j/branches/log4j12-bz53299/core/src/test/resources/input/defaultInit3.properties
URL: http://svn.apache.org/viewvc/logging/log4j/branches/log4j12-bz53299/core/src/test/resources/input/defaultInit3.properties?rev=1353069&r1=1353068&r2=1353069&view=diff
==============================================================================
--- logging/log4j/branches/log4j12-bz53299/core/src/test/resources/input/defaultInit3.properties (original)
+++ logging/log4j/branches/log4j12-bz53299/core/src/test/resources/input/defaultInit3.properties Sat Jun 23 05:51:50 2012
@@ -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
Modified: logging/log4j/branches/log4j12-bz53299/core/src/test/resources/input/fallback1.properties
URL: http://svn.apache.org/viewvc/logging/log4j/branches/log4j12-bz53299/core/src/test/resources/input/fallback1.properties?rev=1353069&r1=1353068&r2=1353069&view=diff
==============================================================================
--- logging/log4j/branches/log4j12-bz53299/core/src/test/resources/input/fallback1.properties (original)
+++ logging/log4j/branches/log4j12-bz53299/core/src/test/resources/input/fallback1.properties Sat Jun 23 05:51:50 2012
@@ -24,7 +24,7 @@ log4j.appender.PRIMARY.layout=org.apache
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