Author: jukka
Date: Sun Oct 7 12:21:08 2007
New Revision: 582668
URL: http://svn.apache.org/viewvc?rev=582668&view=rev
Log:
TIKA-47 - Remove TikaLogger
- Removed org.apache.tika.log
- Moved log4j/log4j.properties to src/test/resources
- Use a system property instead of code to configure Log4J
Added:
incubator/tika/trunk/src/test/resources/log4j/
- copied from r582120, incubator/tika/trunk/src/main/resources/log4j/
incubator/tika/trunk/src/test/resources/log4j/log4j.properties
- copied unchanged from r582666,
incubator/tika/trunk/src/main/resources/log4j/log4j.properties
Removed:
incubator/tika/trunk/src/main/java/org/apache/tika/log/
incubator/tika/trunk/src/main/resources/log4j/
Modified:
incubator/tika/trunk/CHANGES.txt
incubator/tika/trunk/pom.xml
incubator/tika/trunk/src/test/java/org/apache/tika/TestParsers.java
Modified: incubator/tika/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/CHANGES.txt?rev=582668&r1=582667&r2=582668&view=diff
==============================================================================
--- incubator/tika/trunk/CHANGES.txt (original)
+++ incubator/tika/trunk/CHANGES.txt Sun Oct 7 12:21:08 2007
@@ -67,3 +67,5 @@
30. TIKA-42 - Content class needs (String, String, String) constructor (K.
Bennett)
31. TIKA-43 - Parser interface (jukka)
+
+32. TIKA-47 - Remove TikaLogger (jukka)
Modified: incubator/tika/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/pom.xml?rev=582668&r1=582667&r2=582668&view=diff
==============================================================================
--- incubator/tika/trunk/pom.xml (original)
+++ incubator/tika/trunk/pom.xml Sun Oct 7 12:21:08 2007
@@ -214,6 +214,17 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>log4j.configuration</name>
+ <value>log4j/log4j.properties</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<!-- Include the project metadata files in META-INF -->
Modified: incubator/tika/trunk/src/test/java/org/apache/tika/TestParsers.java
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/src/test/java/org/apache/tika/TestParsers.java?rev=582668&r1=582667&r2=582668&view=diff
==============================================================================
--- incubator/tika/trunk/src/test/java/org/apache/tika/TestParsers.java
(original)
+++ incubator/tika/trunk/src/test/java/org/apache/tika/TestParsers.java Sun Oct
7 12:21:08 2007
@@ -25,11 +25,9 @@
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
import org.apache.tika.config.Content;
import org.apache.tika.config.ParserConfig;
import org.apache.tika.config.TikaConfig;
-import org.apache.tika.log.TikaLogger;
import org.apache.tika.parser.Parser;
import org.apache.tika.parser.ParserFactory;
import org.apache.tika.utils.ParseUtils;
@@ -68,13 +66,9 @@
// getDefaultConfig() to be legitimate.
final String tikaConfigFilename =
"target/classes/org/apache/tika/tika-config.xml";
- final String log4jPropertiesFilename =
"target/classes/log4j/log4j.properties";
-
testFilesBaseDir = new File("src/test/resources/test-documents");
tc = new TikaConfig(tikaConfigFilename);
-
- TikaLogger.setLoggerConfigFile(log4jPropertiesFilename);
}
public void testPDFExtraction() throws Exception {
