Menu
▾
▴
aperture-commit — A list for SVN commits for Aperture
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(22) |
Feb
(230) |
Mar
(109) |
Apr
(42) |
May
(34) |
Jun
(34) |
Jul
(26) |
Aug
(47) |
Sep
(21) |
Oct
(22) |
Nov
(23) |
Dec
(59) |
| 2010 |
Jan
(23) |
Feb
(12) |
Mar
(80) |
Apr
(28) |
May
(12) |
Jun
(26) |
Jul
(25) |
Aug
(19) |
Sep
(12) |
Oct
(5) |
Nov
(10) |
Dec
(12) |
| 2011 |
Jan
(1) |
Feb
(5) |
Mar
(14) |
Apr
(6) |
May
(11) |
Jun
(13) |
Jul
(22) |
Aug
(12) |
Sep
(25) |
Oct
(3) |
Nov
(26) |
Dec
(35) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
|
From: <my...@us...> - 2011-11-14 17:04:09
|
Revision: 2586
http://aperture.svn.sourceforge.net/aperture/?rev=2586&view=rev
Author: mylka
Date: 2011-11-14 17:04:03 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
yet another aperture osgi pom fix
Modified Paths:
--------------
aperture-osgi/trunk/integration/pom.xml
Modified: aperture-osgi/trunk/integration/pom.xml
===================================================================
--- aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:57:27 UTC (rev 2585)
+++ aperture-osgi/trunk/integration/pom.xml 2011-11-14 17:04:03 UTC (rev 2586)
@@ -159,7 +159,6 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>org.springframework.osgi.test</artifactId>
- <version>1.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-14 16:57:38
|
Revision: 2585
http://aperture.svn.sourceforge.net/aperture/?rev=2585&view=rev
Author: mylka
Date: 2011-11-14 16:57:27 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
yet another aperture osgi pom fix
Modified Paths:
--------------
aperture-osgi/trunk/integration/pom.xml
Modified: aperture-osgi/trunk/integration/pom.xml
===================================================================
--- aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:52:37 UTC (rev 2584)
+++ aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:57:27 UTC (rev 2585)
@@ -50,6 +50,11 @@
<artifactId>org.springframework.osgi.io</artifactId>
<version>1.1.3.RELEASE</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>org.springframework.osgi.test</artifactId>
+ <version>1.1.3.RELEASE</version>
+ </dependency>
</dependencies>
</dependencyManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-14 16:52:43
|
Revision: 2584
http://aperture.svn.sourceforge.net/aperture/?rev=2584&view=rev
Author: mylka
Date: 2011-11-14 16:52:37 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
yet another aperture osgi pom fix
Modified Paths:
--------------
aperture-osgi/trunk/integration/pom.xml
Modified: aperture-osgi/trunk/integration/pom.xml
===================================================================
--- aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:44:56 UTC (rev 2583)
+++ aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:52:37 UTC (rev 2584)
@@ -45,6 +45,11 @@
<artifactId>org.springframework.osgi.core</artifactId>
<version>1.1.3.RELEASE</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>org.springframework.osgi.io</artifactId>
+ <version>1.1.3.RELEASE</version>
+ </dependency>
</dependencies>
</dependencyManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-14 16:45:02
|
Revision: 2583
http://aperture.svn.sourceforge.net/aperture/?rev=2583&view=rev
Author: mylka
Date: 2011-11-14 16:44:56 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
yet another aperture osgi pom fix
Modified Paths:
--------------
aperture-osgi/trunk/integration/pom.xml
Modified: aperture-osgi/trunk/integration/pom.xml
===================================================================
--- aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:31:31 UTC (rev 2582)
+++ aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:44:56 UTC (rev 2583)
@@ -41,9 +41,9 @@
<version>2.5.6.A</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
+ <groupId>org.springframework.osgi</groupId>
<artifactId>org.springframework.osgi.core</artifactId>
- <version>1.1.3-RELEASE</version>
+ <version>1.1.3.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-14 16:31:37
|
Revision: 2582
http://aperture.svn.sourceforge.net/aperture/?rev=2582&view=rev
Author: mylka
Date: 2011-11-14 16:31:31 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
yet another aperture osgi pom fix
Modified Paths:
--------------
aperture-osgi/trunk/integration/pom.xml
Modified: aperture-osgi/trunk/integration/pom.xml
===================================================================
--- aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:14:32 UTC (rev 2581)
+++ aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:31:31 UTC (rev 2582)
@@ -40,6 +40,11 @@
<artifactId>org.springframework.test</artifactId>
<version>2.5.6.A</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.osgi.core</artifactId>
+ <version>1.1.3-RELEASE</version>
+ </dependency>
</dependencies>
</dependencyManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-14 16:14:41
|
Revision: 2581
http://aperture.svn.sourceforge.net/aperture/?rev=2581&view=rev
Author: mylka
Date: 2011-11-14 16:14:32 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
further fixes in osgi dependencies, in hope to fix the build on hudson
Modified Paths:
--------------
aperture-osgi/trunk/integration/pom.xml
Modified: aperture-osgi/trunk/integration/pom.xml
===================================================================
--- aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:07:22 UTC (rev 2580)
+++ aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:14:32 UTC (rev 2581)
@@ -17,6 +17,31 @@
<properties>
<slf4j.version>1.6.2</slf4j.version>
</properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.beans</artifactId>
+ <version>2.5.6.A</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context</artifactId>
+ <version>2.5.6.A</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.core</artifactId>
+ <version>2.5.6.A</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.test</artifactId>
+ <version>2.5.6.A</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-14 16:07:31
|
Revision: 2580
http://aperture.svn.sourceforge.net/aperture/?rev=2580&view=rev
Author: mylka
Date: 2011-11-14 16:07:22 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
updated aperture-osgi dependency on asm. I hope this should fix the hudson build
Modified Paths:
--------------
aperture-osgi/trunk/integration/pom.xml
Modified: aperture-osgi/trunk/integration/pom.xml
===================================================================
--- aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:02:19 UTC (rev 2579)
+++ aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:07:22 UTC (rev 2580)
@@ -131,7 +131,7 @@
<dependency>
<groupId>org.objectweb.asm</groupId>
<artifactId>com.springsource.org.objectweb.asm</artifactId>
- <version>2.2.3</version>
+ <version>2.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-14 16:02:28
|
Revision: 2579
http://aperture.svn.sourceforge.net/aperture/?rev=2579&view=rev
Author: mylka
Date: 2011-11-14 16:02:19 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
enabled logging for the osgi integration tests
Modified Paths:
--------------
aperture-osgi/trunk/integration/pom.xml
Added Paths:
-----------
aperture-osgi/trunk/integration/src/test/resources/log.properties
Modified: aperture-osgi/trunk/integration/pom.xml
===================================================================
--- aperture-osgi/trunk/integration/pom.xml 2011-11-10 10:54:38 UTC (rev 2578)
+++ aperture-osgi/trunk/integration/pom.xml 2011-11-14 16:02:19 UTC (rev 2579)
@@ -149,6 +149,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+ <argLine>-Djava.util.logging.config.file=${basedir}/src/test/resources/log.properties</argLine>
<systemProperties>
<property>
<name>aperture.version.number</name>
Added: aperture-osgi/trunk/integration/src/test/resources/log.properties
===================================================================
--- aperture-osgi/trunk/integration/src/test/resources/log.properties (rev 0)
+++ aperture-osgi/trunk/integration/src/test/resources/log.properties 2011-11-14 16:02:19 UTC (rev 2579)
@@ -0,0 +1,61 @@
+# Properties file which configures the operation of the JDK
+# logging facility.
+
+# The system will look for this config file, first using
+# a System property specified at startup:
+#
+# >java -Djava.util.logging.config.file=myLoggingConfigFilePath
+#
+# If this property is not specified, then the config file is
+# retrieved from its default location at:
+#
+# JDK_HOME/jre/lib/logging.properties
+
+# Global logging properties.
+# ------------------------------------------
+# The set of handlers to be loaded upon startup.
+# Comma-separated list of class names.
+# (? LogManager docs say no comma here, but JDK example has comma.)
+handlers=java.util.logging.ConsoleHandler
+
+# Default global logging level.
+# Loggers and Handlers may override this level
+.level=ALL
+org.openrdf.rdf2go.level=ALL
+
+# Loggers
+# ------------------------------------------
+# Loggers are usually attached to packages.
+# Here, the level for each package is specified.
+# The global level is used by default, so levels
+# specified here simply act as an override.
+#myapp.ui.level=ALL
+#myapp.business.level=CONFIG
+#myapp.data.level=SEVERE
+
+# Handlers
+# -----------------------------------------
+
+# --- ConsoleHandler ---
+# Override of global logging level
+java.util.logging.ConsoleHandler.level=ALL
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+
+# --- FileHandler ---
+# Override of global logging level
+#java.util.logging.FileHandler.level=ALL
+
+# Naming style for the output file:
+# (The output file is placed in the directory
+# defined by the "user.home" System property.)
+#java.util.logging.FileHandler.pattern=%h/java%u.log
+
+# Limiting size of output file in bytes:
+#java.util.logging.FileHandler.limit=50000
+
+# Number of output files to cycle through, by appending an
+# integer to the base file name:
+#java.util.logging.FileHandler.count=1
+
+# Style of output (Simple or XML):
+#java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
\ No newline at end of file
Property changes on: aperture-osgi/trunk/integration/src/test/resources/log.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-10 10:54:45
|
Revision: 2578
http://aperture.svn.sourceforge.net/aperture/?rev=2578&view=rev
Author: mylka
Date: 2011-11-10 10:54:38 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
[2850026] inside RtfExtractor, switched to using the Tika RtfParser
Modified Paths:
--------------
aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/extractor/rtf/RtfExtractor.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/rtf/RtfExtractorTest.java
Added Paths:
-----------
aperture/trunk/core/src/test/resources/org/semanticdesktop/aperture/docs/rtf-tika777.rtf
Modified: aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/extractor/rtf/RtfExtractor.java
===================================================================
--- aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/extractor/rtf/RtfExtractor.java 2011-11-09 14:53:48 UTC (rev 2577)
+++ aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/extractor/rtf/RtfExtractor.java 2011-11-10 10:54:38 UTC (rev 2578)
@@ -14,6 +14,12 @@
import javax.swing.text.Document;
import javax.swing.text.rtf.RTFEditorKit;
+import org.apache.tika.Tika;
+import org.apache.tika.exception.TikaException;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.parser.ParseContext;
+import org.apache.tika.parser.rtf.RTFParser;
+import org.apache.tika.sax.ToTextContentHandler;
import org.ontoware.rdf2go.model.node.URI;
import org.ontoware.rdf2go.vocabulary.RDF;
import org.semanticdesktop.aperture.extractor.Extractor;
@@ -23,6 +29,7 @@
import org.semanticdesktop.aperture.vocabulary.NIE;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.xml.sax.SAXException;
public class RtfExtractor implements Extractor {
@@ -37,21 +44,21 @@
public void extract(URI id, InputStream stream, Charset charset, String mimeType, RDFContainer result)
throws ExtractorException {
- RTFEditorKit rtfParser = new RTFEditorKit();
- Document document = rtfParser.createDefaultDocument();
try {
- rtfParser.read(stream, document, 0);
- String text = document.getText(0, document.getLength());
+ ToTextContentHandler handler = new ToTextContentHandler();
+ RTFParser p = new RTFParser();
+ Metadata m = new Metadata();
+ p.parse(stream, handler, m, null);
+ String text = handler.toString();
result.add(NIE.plainTextContent, text);
result.add(RDF.type,NFO.TextDocument);
}
- catch (BadLocationException e) {
- // problem relates to the file contents: just log and ignore
- Logger logger = LoggerFactory.getLogger(getClass());
- logger.warn("Bad RTF location", e);
- }
catch (IOException e) {
throw new ExtractorException(e);
+ } catch (SAXException e) {
+ throw new ExtractorException(e);
+ } catch (TikaException e) {
+ throw new ExtractorException(e);
}
}
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/rtf/RtfExtractorTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/rtf/RtfExtractorTest.java 2011-11-09 14:53:48 UTC (rev 2577)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/rtf/RtfExtractorTest.java 2011-11-10 10:54:38 UTC (rev 2578)
@@ -19,6 +19,7 @@
import org.semanticdesktop.aperture.extractor.ExtractorFactory;
import org.semanticdesktop.aperture.rdf.RDFContainer;
import org.semanticdesktop.aperture.rdf.ValueFactory;
+import org.semanticdesktop.aperture.test.ApertureTestBase;
import org.semanticdesktop.aperture.test.extractor.ExtractorTestBase;
import org.semanticdesktop.aperture.vocabulary.NIE;
@@ -53,6 +54,14 @@
container.dispose();
}
}
+
+ public void testTika777Extraction() throws Exception {
+ RDFContainer container = getStatements(DOCS_PATH + "rtf-tika777.rtf");
+ String text = container.getString(NIE.plainTextContent);
+ // this is supposed to be a proper Russian text
+ assertTrue(text.contains("\u0423\u0432\u0430\u0436\u0430\u0435\u043c\u044b\u0439\u0020\u043a\u043b\u0438\u0435\u043d\u0442\u0021"));
+ container.dispose();
+ }
private RDFContainer getStatements(String resourceName) throws ExtractorException, IOException {
// apply the extractor on a text file containing a null character
Added: aperture/trunk/core/src/test/resources/org/semanticdesktop/aperture/docs/rtf-tika777.rtf
===================================================================
--- aperture/trunk/core/src/test/resources/org/semanticdesktop/aperture/docs/rtf-tika777.rtf (rev 0)
+++ aperture/trunk/core/src/test/resources/org/semanticdesktop/aperture/docs/rtf-tika777.rtf 2011-11-10 10:54:38 UTC (rev 2578)
@@ -0,0 +1,7 @@
+{\rtf1\ansi\ansicpg1252\fromtext \fbidis \deff0
+{\fonttbl
+
+{\f0\fswiss\fcharset0 Arial;} {\f1\fswiss\fcharset204 Arial;}
+}
+\par{\f1\fs20 \'d3\'e2\'e0\'e6\'e0\'e5\'ec\'fb\'e9 \'ea\'eb\'e8\'e5\'ed\'f2!\f0}\par
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-09 14:53:57
|
Revision: 2577
http://aperture.svn.sourceforge.net/aperture/?rev=2577&view=rev
Author: mylka
Date: 2011-11-09 14:53:48 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
[3435420] after updating tika to the latest snapshot I could revert the test for identification of the MS Works 2000 wps file to the correct value
Modified Paths:
--------------
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java 2011-11-09 13:37:45 UTC (rev 2576)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java 2011-11-09 14:53:48 UTC (rev 2577)
@@ -169,7 +169,7 @@
t("microsoft-works-spreadsheet-4.0-2000.wks", "application/vnd.ms-works","application/vnd.ms-works");
t("microsoft-works-spreadsheet-7.0.xlr", "application/vnd.ms-excel","application/vnd.ms-excel"); // better
- t("microsoft-works-word-processor-2000.wps", "application/x-tika-msoffice", "application/vnd.ms-works"); // better
+ t("microsoft-works-word-processor-2000.wps", "application/vnd.ms-works", "application/vnd.ms-works"); // better
t("microsoft-works-word-processor-3.0.wps", "application/x-tika-msoffice", "application/vnd.ms-works");
t("microsoft-works-word-processor-4.0.wps", "application/x-tika-msoffice", "application/vnd.ms-works");
t("microsoft-works-word-processor-7.0.wps", "application/vnd.ms-works", "application/vnd.ms-works"); // better
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-09 13:37:52
|
Revision: 2576
http://aperture.svn.sourceforge.net/aperture/?rev=2576&view=rev
Author: mylka
Date: 2011-11-09 13:37:45 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
[3435420] updated tika version to the latest snapshot
Modified Paths:
--------------
aperture/trunk/core/pom.xml
Modified: aperture/trunk/core/pom.xml
===================================================================
--- aperture/trunk/core/pom.xml 2011-11-09 12:10:30 UTC (rev 2575)
+++ aperture/trunk/core/pom.xml 2011-11-09 13:37:45 UTC (rev 2576)
@@ -525,12 +525,12 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.0</version>
+ <version>1.1-r1199731-wpspatch</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
- <version>1.0</version>
+ <version>1.1-r1199731-wpspatch</version>
<exclusions>
<exclusion>
<artifactId>org.apache.poi</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-09 12:10:40
|
Revision: 2575
http://aperture.svn.sourceforge.net/aperture/?rev=2575&view=rev
Author: mylka
Date: 2011-11-09 12:10:30 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
[3435420] added some exclusions to the the tika-parsers depenency, to avoid dependencies we don't actually want
Modified Paths:
--------------
aperture/trunk/core/pom.xml
Modified: aperture/trunk/core/pom.xml
===================================================================
--- aperture/trunk/core/pom.xml 2011-11-09 11:56:54 UTC (rev 2574)
+++ aperture/trunk/core/pom.xml 2011-11-09 12:10:30 UTC (rev 2575)
@@ -164,13 +164,12 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3.0.v20080530-1600_orbit</version>
- <scope>compile</scope>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -532,6 +531,68 @@
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
<version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>org.apache.poi</artifactId>
+ <groupId>poi</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>org.apache.poi</artifactId>
+ <groupId>poi-scratchpad</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>org.apache.poi</artifactId>
+ <groupId>poi-ooxml</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>netcdf</artifactId>
+ <groupId>edu.ucar</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>apache-mime4j-core</artifactId>
+ <groupId>org.apache.james</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>apache-mime4j-dom</artifactId>
+ <groupId>org.apache.james</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>pdfbox</artifactId>
+ <groupId>org.apache.pdfbox</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bcmail-jdk15</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bcprov-jdk15</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>rome</artifactId>
+ <groupId>rome</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>boilerpipe</artifactId>
+ <groupId>de.l3s.boilerpipe</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>asm</artifactId>
+ <groupId>asm</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>tagsoup</artifactId>
+ <groupId>org.ccil.cowan.tagsoup</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.drewnoakes</groupId>
+ <artifactId>metadata-extractor</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-09 11:57:01
|
Revision: 2574
http://aperture.svn.sourceforge.net/aperture/?rev=2574&view=rev
Author: mylka
Date: 2011-11-09 11:56:54 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
[3435420] updated tika version to 1.0
Modified Paths:
--------------
aperture/trunk/core/pom.xml
aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/extractor/office/OfficeExtractor.java
aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/ApertureDetector.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java
Removed Paths:
-------------
aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/StreamingZipContainerDetector.java
Modified: aperture/trunk/core/pom.xml
===================================================================
--- aperture/trunk/core/pom.xml 2011-11-08 15:30:03 UTC (rev 2573)
+++ aperture/trunk/core/pom.xml 2011-11-09 11:56:54 UTC (rev 2574)
@@ -526,12 +526,12 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.0-r1134426-aperture</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
- <version>1.0-r1134426-aperture</version>
+ <version>1.0</version>
</dependency>
<dependency>
Modified: aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/extractor/office/OfficeExtractor.java
===================================================================
--- aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/extractor/office/OfficeExtractor.java 2011-11-08 15:30:03 UTC (rev 2573)
+++ aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/extractor/office/OfficeExtractor.java 2011-11-09 11:56:54 UTC (rev 2574)
@@ -11,10 +11,10 @@
import java.nio.charset.Charset;
import java.util.Set;
-import org.apache.tika.detect.POIFSContainerDetector;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.microsoft.POIFSContainerDetector;
import org.ontoware.rdf2go.model.node.URI;
import org.ontoware.rdf2go.vocabulary.RDF;
import org.semanticdesktop.aperture.extractor.Extractor;
Modified: aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/ApertureDetector.java
===================================================================
--- aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/ApertureDetector.java 2011-11-08 15:30:03 UTC (rev 2573)
+++ aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/ApertureDetector.java 2011-11-09 11:56:54 UTC (rev 2574)
@@ -10,10 +10,10 @@
import java.io.InputStream;
import org.apache.tika.detect.Detector;
-import org.apache.tika.detect.ZipContainerDetector;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.mime.MimeTypes;
+import org.apache.tika.parser.pkg.ZipContainerDetector;
public class ApertureDetector implements Detector {
Deleted: aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/StreamingZipContainerDetector.java
===================================================================
--- aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/StreamingZipContainerDetector.java 2011-11-08 15:30:03 UTC (rev 2573)
+++ aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/StreamingZipContainerDetector.java 2011-11-09 11:56:54 UTC (rev 2574)
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2010 Aduna.
- * All rights reserved.
- *
- * Licensed under the Aperture BSD-style license.
- */
-package org.semanticdesktop.aperture.tika;
-
-import org.apache.tika.detect.ZipContainerDetector;
-
-/*
- * A failed idea, left in hope that it may be useful someday
- */
-class StreamingZipContainerDetector extends ZipContainerDetector{
-
-// private static final long serialVersionUID = -309421956260248519L;
-//
-// private ZipInputStream zipInputStream;
-//
-// @Override
-// protected Iterator<? extends ZipEntry> getEntriesIterator(
-// final TikaInputStream input) throws ZipException, IOException {
-// zipInputStream = new ZipInputStream(input);
-// return new Iterator<ZipEntry>() {
-//
-// public boolean hasNext() {
-// // TODO Auto-generated method stub
-// return false;
-// }
-//
-// public ZipEntry next() {
-// if (zipInputStream == null) {
-// return null;
-// } else {
-//
-// }
-// zipInputStream.closeEntry();
-// }
-//
-// public void remove() {
-// throw new UnsupportedOperationException();
-// }
-// };
-// }
-//
-// /* (non-Javadoc)
-// * @see org.apache.tika.detect.ZipContainerDetector#getInputStream(java.util.zip.ZipEntry)
-// */
-// @Override
-// protected InputStream getInputStream(ZipEntry entry) throws IOException {
-// // TODO Auto-generated method stub
-// return super.getInputStream(entry);
-// }
-//
-//
-//
-}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java 2011-11-08 15:30:03 UTC (rev 2573)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java 2011-11-09 11:56:54 UTC (rev 2574)
@@ -169,7 +169,7 @@
t("microsoft-works-spreadsheet-4.0-2000.wks", "application/vnd.ms-works","application/vnd.ms-works");
t("microsoft-works-spreadsheet-7.0.xlr", "application/vnd.ms-excel","application/vnd.ms-excel"); // better
- t("microsoft-works-word-processor-2000.wps", "application/vnd.ms-works", "application/vnd.ms-works"); // better
+ t("microsoft-works-word-processor-2000.wps", "application/x-tika-msoffice", "application/vnd.ms-works"); // better
t("microsoft-works-word-processor-3.0.wps", "application/x-tika-msoffice", "application/vnd.ms-works");
t("microsoft-works-word-processor-4.0.wps", "application/x-tika-msoffice", "application/vnd.ms-works");
t("microsoft-works-word-processor-7.0.wps", "application/vnd.ms-works", "application/vnd.ms-works"); // better
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-08 15:30:11
|
Revision: 2573
http://aperture.svn.sourceforge.net/aperture/?rev=2573&view=rev
Author: mylka
Date: 2011-11-08 15:30:03 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
on my previous commit I commented out most of the tika mime type identifier test, reverted this
Modified Paths:
--------------
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java 2011-11-08 15:26:52 UTC (rev 2572)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java 2011-11-08 15:30:03 UTC (rev 2573)
@@ -39,249 +39,249 @@
@Test
public void testIdentification() throws Exception {
-// t("bzip2-txt-bziptest.txt.bz2", "application/x-bzip", "application/x-bzip2");
-// t("compress-txt-compresstest.txt.Z", "application/x-compress", "application/x-compress");
-// t("corel-presentations-3.0.shw", "application/vnd.wordperfect","application/vnd.wordperfect"); // better
-// t("corel-presentations-x3.shw", "application/x-corelpresentations","application/x-corelpresentations"); // better
-// t("corel-quattro-pro-6.wb2", "application/x-123", "application/x-123"); // UP, 2nd should be x-quatro-pro
-// t("corel-quattro-pro-7.wb3", "application/x-quattro-pro", "application/x-quattro-pro"); // better
-// t("corel-quattro-pro-x3.qpw", "application/x-quattro-pro", "application/x-quattro-pro"); // better
-// t("corel-wordperfect-4.2.wp", "application/octet-stream", "application/vnd.wordperfect");
-// t("corel-wordperfect-5.0.wp", "application/vnd.wordperfect","application/vnd.wordperfect");
-// t("corel-wordperfect-5.1-far-east.wp", "application/vnd.wordperfect","application/vnd.wordperfect");
-// t("corel-wordperfect-5.1.wp", "application/vnd.wordperfect","application/vnd.wordperfect");
-// t("corel-wordperfect-x3.wpd", "application/vnd.wordperfect","application/vnd.wordperfect");
-// t("cpio-testfile.txt.cpio", "application/x-cpio", "application/x-cpio");
-// t("counting-input-stream-test-file.dat", "application/vnd.openxmlformats-officedocument.presentationml.slideshow", "application/vnd.openxmlformats-officedocument.presentationml.slideshow"); // better
-// t("emlx-74719.emlx", "message/x-emlx", "message/x-emlx"); // better
-// t("faulty-fileaccessdata-is-ignored.xml","application/x-gzip", "application/x-gzip");
-// t("foxmail-in.BOX", "application/x-foxmail", "application/x-foxmail"); // better
-// t("html-condenast.html", "text/html", "text/html");
-// t("html-handwritten-with-wrong-file-extension.txt","text/html", "text/html");
-// t("html-handwritten.html", "text/html", "text/html");
-// t("html-mixed-case-header-and-wrong-extension.txt","text/html", "text/html");
-// t("html-quelle.de.html", "text/html", "text/html");
-// t("html-teampb.html", "application/xhtml+xml", "application/xhtml+xml"); // better
-// t("html-utf16-leading-whitespace-wrong-extension.doc","text/plain", "text/plain"); // worse
-// t("html-youtube-contenttypeinhttpheaders.html","text/html", "text/html");
-// t("jingle1.mp3", "audio/mpeg", "audio/mpeg"); // better
-// t("jingle2.mp3", "audio/mpeg", "audio/mpeg"); // better
-// t("jingle3.mp3", "audio/mpeg", "audio/mpeg");
-// t("jpg-exif-img_9367.JPG", "image/jpeg", "image/jpeg");
-// t("jpg-exif-zerolength.jpg", "application/octet-stream", "image/jpeg");
-// t("jpg-geotagged-ipanema.jpg", "image/jpeg", "image/jpeg");
-// t("jpg-geotagged.jpg", "image/jpeg", "image/jpeg");
-// t("xml-kowiki.xml", "application/x-mediawiki-xml-export","application/x-mediawiki-xml-export");
-// t("mail-attachment.eml", "message/rfc822", "message/rfc822");
-// t("mail-conflict-desktop1.eml", "text/plain", "message/rfc822"); // wrong
-// t("mail-conflict-desktop2.eml", "text/plain", "message/rfc822"); // wrong
-// t("mail-forwarded-references.eml", "text/plain", "message/rfc822"); // wrong
-// t("mail-mapi125messageid.eml", "message/rfc822", "message/rfc822");
-// t("mail-mbox-aperture-inc1-mail1.eml", "text/plain", "message/rfc822"); // wrong
-// t("mail-mbox-aperture-inc1-mail2.eml", "text/plain", "message/rfc822"); // wrong
-// t("mail-mbox-aperture-inc1-mail3.eml", "text/plain", "message/rfc822"); // wrong
-// t("mail-mbox-aperture-inc1-mail4.eml", "text/plain", "message/rfc822"); // wrong
-// t("mail-multipart-plain-html.eml", "text/plain", "message/rfc822"); // wrong
-// t("mail-multipart-related-bug.eml", "message/rfc822", "message/rfc822");
-// t("mail-multipart-test.eml", "text/plain", "message/rfc822"); // wrong
-// t("mail-multipart-test.eml.tar.gz", "application/x-gzip", "application/x-gzip");
-// t("mail-plaintext-attachment.eml", "message/rfc822", "message/rfc822");
-// t("mail-threaded.eml", "application/mbox", "application/mbox");
-// t("mail-threaded-blackberryheader.eml", "message/rfc822", "message/rfc822");
-// t("mail-thunderbird-1.5-unspecifiedcharset.eml","message/rfc822", "message/rfc822");
-// t("mail-thunderbird-1.5.eml", "message/rfc822", "message/rfc822");
-// t("mail-UnsupportedOperationException.eml","message/rfc822", "message/rfc822");
-// t("mail-xml-attachment.eml", "message/rfc822", "message/rfc822");
-// t("mail.msg", "application/vnd.ms-outlook","application/vnd.ms-outlook"); // better
-// t("mbox-aperture-dev", "application/mbox", "application/mbox");
-// t("mbox-aperture-inc1", "application/mbox", "application/mbox");
-// t("mbox-aperture-inc2", "application/mbox", "application/mbox");
-// t("mbox-aperture-inc3", "application/mbox", "application/mbox");
-// t("mbox-aperture-inc4", "application/mbox", "application/mbox");
-// t("mbox-noblanklinebetweenmails.mbox", "application/mbox", "application/mbox");
-// t("mbox-testfolder", "application/mbox", "application/mbox");
-// t("mhtml-firefox.mht", "message/rfc822", "message/rfc822");
-// t("mhtml-internet-explorer.mht", "message/rfc822", "message/rfc822");
-//
-// t("microsoft-excel-2000.xls", "application/vnd.ms-excel",
-// "application/vnd.ms-excel"); // better
-// t("microsoft-excel-2007beta2.xlam", "application/vnd.ms-excel.addin.macroenabled.12",
-// "application/vnd.ms-excel.addin.macroenabled.12"); // better
-// t("microsoft-excel-2007beta2.xlsb", "application/vnd.ms-excel.sheet.binary.macroenabled.12",
-// "application/vnd.ms-excel.sheet.binary.macroenabled.12"); // better
-// t("microsoft-excel-2007beta2.xlsm", "application/vnd.ms-excel.sheet.macroenabled.12",
-// "application/vnd.ms-excel.sheet.macroenabled.12"); // better
-// t("microsoft-excel-2007beta2.xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-// "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); // better
-// t("microsoft-excel-2007beta2.xltm", "application/vnd.ms-excel.template.macroenabled.12",
-// "application/vnd.ms-excel.template.macroenabled.12"); // better
-// t("microsoft-excel-2007beta2.xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template",
-// "application/vnd.openxmlformats-officedocument.spreadsheetml.template"); // better
-// t("microsoft-excel-2010beta.xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-// "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); // better
-//
-// t("microsoft-powerpoint-2000.ppt", "application/vnd.ms-powerpoint",
-// "application/vnd.ms-powerpoint"); // better
-// t("microsoft-powerpoint-2007beta2.potm", "application/vnd.ms-powerpoint.template.macroenabled.12",
-// "application/vnd.ms-powerpoint.template.macroenabled.12"); // better
-// t("microsoft-powerpoint-2007beta2.potx", "application/vnd.openxmlformats-officedocument.presentationml.template",
-// "application/vnd.openxmlformats-officedocument.presentationml.template"); // better
-// t("microsoft-powerpoint-2007beta2.ppsm", "application/vnd.ms-powerpoint.slideshow.macroenabled.12",
-// "application/vnd.ms-powerpoint.slideshow.macroenabled.12"); // better
-// t("microsoft-powerpoint-2007beta2.ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
-// "application/vnd.openxmlformats-officedocument.presentationml.slideshow"); // better
-// t("microsoft-powerpoint-2007beta2.pptm", "application/vnd.ms-powerpoint.presentation.macroenabled.12",
-// "application/vnd.ms-powerpoint.presentation.macroenabled.12"); // better
-// t("microsoft-powerpoint-2007beta2.pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-// "application/vnd.openxmlformats-officedocument.presentationml.presentation"); // better
-// t("microsoft-powerpoint-2010beta.pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-// "application/vnd.openxmlformats-officedocument.presentationml.presentation"); // better
-// t("microsoft-powerpoint-invalidunicode.ppt","application/vnd.ms-powerpoint",
-// "application/vnd.ms-powerpoint"); // better
-//
-// t("microsoft-publisher-2003.pub","application/x-mspublisher","application/x-mspublisher"); // wrong
-// t("microsoft-visio.vsd","application/vnd.visio","application/vnd.visio"); // better
-//
-// t("microsoft-word-2000-with-wrong-file-extension.pdf","application/msword",
-// "application/msword"); // better
-// t("microsoft-word-2000.doc", "application/msword",
-// "application/msword"); // better
-// t("microsoft-word-2007beta2.docm", "application/vnd.ms-word.document.macroenabled.12",
-// "application/vnd.ms-word.document.macroenabled.12"); // better
-// t("microsoft-word-2007beta2.docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-// "application/vnd.openxmlformats-officedocument.wordprocessingml.document"); // better
-// t("microsoft-word-2007beta2.dotm", "application/x-tika-ooxml",
-// "application/vnd.ms-word.template.macroenabled.12"); // better
-// t("microsoft-word-2007beta2.dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template",
-// "application/vnd.openxmlformats-officedocument.wordprocessingml.template"); // better
-// t("microsoft-word-2010beta.docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-// "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
-// t("microsoft-word-history-blair.doc", "application/msword",
-// "application/msword");
-// t("microsoft-word-illegal-unicode-characters.doc", "application/msword",
-// "application/msword");
-// t("microsoft-word-testdoc-comments.doc", "application/msword",
-// "application/msword");
-// t("microsoft-word-testdoc-nocomments.doc","application/msword",
-// "application/msword");
-//
-// t("microsoft-works-spreadsheet-3.0.wks", "application/x-123", "application/x-123"); // wrong
-// t("microsoft-works-spreadsheet-4.0-2000.wks", "application/vnd.ms-works","application/vnd.ms-works");
-// t("microsoft-works-spreadsheet-7.0.xlr", "application/vnd.ms-excel","application/vnd.ms-excel"); // better
+ t("bzip2-txt-bziptest.txt.bz2", "application/x-bzip", "application/x-bzip2");
+ t("compress-txt-compresstest.txt.Z", "application/x-compress", "application/x-compress");
+ t("corel-presentations-3.0.shw", "application/vnd.wordperfect","application/vnd.wordperfect"); // better
+ t("corel-presentations-x3.shw", "application/x-corelpresentations","application/x-corelpresentations"); // better
+ t("corel-quattro-pro-6.wb2", "application/x-123", "application/x-123"); // UP, 2nd should be x-quatro-pro
+ t("corel-quattro-pro-7.wb3", "application/x-quattro-pro", "application/x-quattro-pro"); // better
+ t("corel-quattro-pro-x3.qpw", "application/x-quattro-pro", "application/x-quattro-pro"); // better
+ t("corel-wordperfect-4.2.wp", "application/octet-stream", "application/vnd.wordperfect");
+ t("corel-wordperfect-5.0.wp", "application/vnd.wordperfect","application/vnd.wordperfect");
+ t("corel-wordperfect-5.1-far-east.wp", "application/vnd.wordperfect","application/vnd.wordperfect");
+ t("corel-wordperfect-5.1.wp", "application/vnd.wordperfect","application/vnd.wordperfect");
+ t("corel-wordperfect-x3.wpd", "application/vnd.wordperfect","application/vnd.wordperfect");
+ t("cpio-testfile.txt.cpio", "application/x-cpio", "application/x-cpio");
+ t("counting-input-stream-test-file.dat", "application/vnd.openxmlformats-officedocument.presentationml.slideshow", "application/vnd.openxmlformats-officedocument.presentationml.slideshow"); // better
+ t("emlx-74719.emlx", "message/x-emlx", "message/x-emlx"); // better
+ t("faulty-fileaccessdata-is-ignored.xml","application/x-gzip", "application/x-gzip");
+ t("foxmail-in.BOX", "application/x-foxmail", "application/x-foxmail"); // better
+ t("html-condenast.html", "text/html", "text/html");
+ t("html-handwritten-with-wrong-file-extension.txt","text/html", "text/html");
+ t("html-handwritten.html", "text/html", "text/html");
+ t("html-mixed-case-header-and-wrong-extension.txt","text/html", "text/html");
+ t("html-quelle.de.html", "text/html", "text/html");
+ t("html-teampb.html", "application/xhtml+xml", "application/xhtml+xml"); // better
+ t("html-utf16-leading-whitespace-wrong-extension.doc","text/plain", "text/plain"); // worse
+ t("html-youtube-contenttypeinhttpheaders.html","text/html", "text/html");
+ t("jingle1.mp3", "audio/mpeg", "audio/mpeg"); // better
+ t("jingle2.mp3", "audio/mpeg", "audio/mpeg"); // better
+ t("jingle3.mp3", "audio/mpeg", "audio/mpeg");
+ t("jpg-exif-img_9367.JPG", "image/jpeg", "image/jpeg");
+ t("jpg-exif-zerolength.jpg", "application/octet-stream", "image/jpeg");
+ t("jpg-geotagged-ipanema.jpg", "image/jpeg", "image/jpeg");
+ t("jpg-geotagged.jpg", "image/jpeg", "image/jpeg");
+ t("xml-kowiki.xml", "application/x-mediawiki-xml-export","application/x-mediawiki-xml-export");
+ t("mail-attachment.eml", "message/rfc822", "message/rfc822");
+ t("mail-conflict-desktop1.eml", "text/plain", "message/rfc822"); // wrong
+ t("mail-conflict-desktop2.eml", "text/plain", "message/rfc822"); // wrong
+ t("mail-forwarded-references.eml", "text/plain", "message/rfc822"); // wrong
+ t("mail-mapi125messageid.eml", "message/rfc822", "message/rfc822");
+ t("mail-mbox-aperture-inc1-mail1.eml", "text/plain", "message/rfc822"); // wrong
+ t("mail-mbox-aperture-inc1-mail2.eml", "text/plain", "message/rfc822"); // wrong
+ t("mail-mbox-aperture-inc1-mail3.eml", "text/plain", "message/rfc822"); // wrong
+ t("mail-mbox-aperture-inc1-mail4.eml", "text/plain", "message/rfc822"); // wrong
+ t("mail-multipart-plain-html.eml", "text/plain", "message/rfc822"); // wrong
+ t("mail-multipart-related-bug.eml", "message/rfc822", "message/rfc822");
+ t("mail-multipart-test.eml", "text/plain", "message/rfc822"); // wrong
+ t("mail-multipart-test.eml.tar.gz", "application/x-gzip", "application/x-gzip");
+ t("mail-plaintext-attachment.eml", "message/rfc822", "message/rfc822");
+ t("mail-threaded.eml", "application/mbox", "application/mbox");
+ t("mail-threaded-blackberryheader.eml", "message/rfc822", "message/rfc822");
+ t("mail-thunderbird-1.5-unspecifiedcharset.eml","message/rfc822", "message/rfc822");
+ t("mail-thunderbird-1.5.eml", "message/rfc822", "message/rfc822");
+ t("mail-UnsupportedOperationException.eml","message/rfc822", "message/rfc822");
+ t("mail-xml-attachment.eml", "message/rfc822", "message/rfc822");
+ t("mail.msg", "application/vnd.ms-outlook","application/vnd.ms-outlook"); // better
+ t("mbox-aperture-dev", "application/mbox", "application/mbox");
+ t("mbox-aperture-inc1", "application/mbox", "application/mbox");
+ t("mbox-aperture-inc2", "application/mbox", "application/mbox");
+ t("mbox-aperture-inc3", "application/mbox", "application/mbox");
+ t("mbox-aperture-inc4", "application/mbox", "application/mbox");
+ t("mbox-noblanklinebetweenmails.mbox", "application/mbox", "application/mbox");
+ t("mbox-testfolder", "application/mbox", "application/mbox");
+ t("mhtml-firefox.mht", "message/rfc822", "message/rfc822");
+ t("mhtml-internet-explorer.mht", "message/rfc822", "message/rfc822");
+ t("microsoft-excel-2000.xls", "application/vnd.ms-excel",
+ "application/vnd.ms-excel"); // better
+ t("microsoft-excel-2007beta2.xlam", "application/vnd.ms-excel.addin.macroenabled.12",
+ "application/vnd.ms-excel.addin.macroenabled.12"); // better
+ t("microsoft-excel-2007beta2.xlsb", "application/vnd.ms-excel.sheet.binary.macroenabled.12",
+ "application/vnd.ms-excel.sheet.binary.macroenabled.12"); // better
+ t("microsoft-excel-2007beta2.xlsm", "application/vnd.ms-excel.sheet.macroenabled.12",
+ "application/vnd.ms-excel.sheet.macroenabled.12"); // better
+ t("microsoft-excel-2007beta2.xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); // better
+ t("microsoft-excel-2007beta2.xltm", "application/vnd.ms-excel.template.macroenabled.12",
+ "application/vnd.ms-excel.template.macroenabled.12"); // better
+ t("microsoft-excel-2007beta2.xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.template"); // better
+ t("microsoft-excel-2010beta.xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); // better
+
+ t("microsoft-powerpoint-2000.ppt", "application/vnd.ms-powerpoint",
+ "application/vnd.ms-powerpoint"); // better
+ t("microsoft-powerpoint-2007beta2.potm", "application/vnd.ms-powerpoint.template.macroenabled.12",
+ "application/vnd.ms-powerpoint.template.macroenabled.12"); // better
+ t("microsoft-powerpoint-2007beta2.potx", "application/vnd.openxmlformats-officedocument.presentationml.template",
+ "application/vnd.openxmlformats-officedocument.presentationml.template"); // better
+ t("microsoft-powerpoint-2007beta2.ppsm", "application/vnd.ms-powerpoint.slideshow.macroenabled.12",
+ "application/vnd.ms-powerpoint.slideshow.macroenabled.12"); // better
+ t("microsoft-powerpoint-2007beta2.ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
+ "application/vnd.openxmlformats-officedocument.presentationml.slideshow"); // better
+ t("microsoft-powerpoint-2007beta2.pptm", "application/vnd.ms-powerpoint.presentation.macroenabled.12",
+ "application/vnd.ms-powerpoint.presentation.macroenabled.12"); // better
+ t("microsoft-powerpoint-2007beta2.pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+ "application/vnd.openxmlformats-officedocument.presentationml.presentation"); // better
+ t("microsoft-powerpoint-2010beta.pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+ "application/vnd.openxmlformats-officedocument.presentationml.presentation"); // better
+ t("microsoft-powerpoint-invalidunicode.ppt","application/vnd.ms-powerpoint",
+ "application/vnd.ms-powerpoint"); // better
+
+ t("microsoft-publisher-2003.pub","application/x-mspublisher","application/x-mspublisher"); // wrong
+ t("microsoft-visio.vsd","application/vnd.visio","application/vnd.visio"); // better
+
+ t("microsoft-word-2000-with-wrong-file-extension.pdf","application/msword",
+ "application/msword"); // better
+ t("microsoft-word-2000.doc", "application/msword",
+ "application/msword"); // better
+ t("microsoft-word-2007beta2.docm", "application/vnd.ms-word.document.macroenabled.12",
+ "application/vnd.ms-word.document.macroenabled.12"); // better
+ t("microsoft-word-2007beta2.docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+ "application/vnd.openxmlformats-officedocument.wordprocessingml.document"); // better
+ t("microsoft-word-2007beta2.dotm", "application/x-tika-ooxml",
+ "application/vnd.ms-word.template.macroenabled.12"); // better
+ t("microsoft-word-2007beta2.dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template",
+ "application/vnd.openxmlformats-officedocument.wordprocessingml.template"); // better
+ t("microsoft-word-2010beta.docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+ "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ t("microsoft-word-history-blair.doc", "application/msword",
+ "application/msword");
+ t("microsoft-word-illegal-unicode-characters.doc", "application/msword",
+ "application/msword");
+ t("microsoft-word-testdoc-comments.doc", "application/msword",
+ "application/msword");
+ t("microsoft-word-testdoc-nocomments.doc","application/msword",
+ "application/msword");
+
+ t("microsoft-works-spreadsheet-3.0.wks", "application/x-123", "application/x-123"); // wrong
+ t("microsoft-works-spreadsheet-4.0-2000.wks", "application/vnd.ms-works","application/vnd.ms-works");
+ t("microsoft-works-spreadsheet-7.0.xlr", "application/vnd.ms-excel","application/vnd.ms-excel"); // better
+
t("microsoft-works-word-processor-2000.wps", "application/vnd.ms-works", "application/vnd.ms-works"); // better
-// t("microsoft-works-word-processor-3.0.wps", "application/x-tika-msoffice", "application/vnd.ms-works");
-// t("microsoft-works-word-processor-4.0.wps", "application/x-tika-msoffice", "application/vnd.ms-works");
-// t("microsoft-works-word-processor-7.0.wps", "application/vnd.ms-works", "application/vnd.ms-works"); // better
-//
-// t("openoffice-1.1.5-calc-template.stc", "application/vnd.sun.xml.calc", "application/vnd.sun.xml.calc.template"); // better
-// t("openoffice-1.1.5-calc.sxc", "application/vnd.sun.xml.calc", "application/vnd.sun.xml.calc"); // better
-// t("openoffice-1.1.5-draw-template.std", "application/vnd.sun.xml.draw", "application/vnd.sun.xml.draw.template"); // better
-// t("openoffice-1.1.5-draw.sxd", "application/vnd.sun.xml.draw", "application/vnd.sun.xml.draw"); // better
-// t("openoffice-1.1.5-impress-template.sti", "application/vnd.sun.xml.impress", "application/vnd.sun.xml.impress.template"); // better
-// t("openoffice-1.1.5-impress.sxi", "application/vnd.sun.xml.impress", "application/vnd.sun.xml.impress"); // better
-// t("openoffice-1.1.5-writer-template.stw", "application/vnd.sun.xml.writer", "application/vnd.sun.xml.writer"); // better
-// t("openoffice-1.1.5-writer.sxw", "application/vnd.sun.xml.writer", "application/vnd.sun.xml.writer"); // better
-//
-// t("openoffice-2.0-calc-template.ots", "application/vnd.oasis.opendocument.spreadsheet-template", // better
-// "application/vnd.oasis.opendocument.spreadsheet-template");
-// t("openoffice-2.0-calc.ods", "application/vnd.oasis.opendocument.spreadsheet", // better
-// "application/vnd.oasis.opendocument.spreadsheet");
-// t("openoffice-2.0-draw-template.otg", "application/vnd.oasis.opendocument.graphics-template", // better
-// "application/vnd.oasis.opendocument.graphics-template");
-// t("openoffice-2.0-draw.odg", "application/vnd.oasis.opendocument.graphics", // better
-// "application/vnd.oasis.opendocument.graphics");
-// t("openoffice-2.0-formula.odf", "application/vnd.oasis.opendocument.formula", // better
-// "application/vnd.oasis.opendocument.formula");
-// t("openoffice-2.0-impress-template.otp","application/vnd.oasis.opendocument.presentation-template", // better
-// "application/vnd.oasis.opendocument.presentation-template");
-// t("openoffice-2.0-impress.odp", "application/vnd.oasis.opendocument.presentation", // better
-// "application/vnd.oasis.opendocument.presentation");
-// t("openoffice-2.0-writer-template.ott", "application/vnd.oasis.opendocument.text-template", // better
-// "application/vnd.oasis.opendocument.text-template");
-// t("openoffice-2.0-writer.odt", "application/vnd.oasis.opendocument.text", // better
-// "application/vnd.oasis.opendocument.text");
-//
-// t("pdf-distiller-6-weirdchars.pdf", "application/pdf", "application/pdf");
-// t("pdf-manyauthors.pdf", "application/pdf", "application/pdf");
-// t("pdf-no-author.pdf", "application/pdf", "application/pdf");
-// t("pdf-openoffice-1.1.5-writer.pdf", "application/pdf", "application/pdf");
-// t("pdf-openoffice-2.0-writer.pdf", "application/pdf", "application/pdf");
-// t("pdf-openoffice-2.0-writer.pdf.tar", "application/x-tar", "application/x-tar");
-// t("pdf-word-2000-pdfcreator-0.8.0.pdf", "application/pdf", "application/pdf");
-// t("pdf-word-2000-pdfmaker-7.0.pdf", "application/pdf", "application/pdf");
-// t("pdf-word-2000-pdfwriter-7.0.pdf", "application/pdf", "application/pdf");
-//
-// t("plain-text-ansi.txt", "text/plain", "text/plain");
-// t("plain-text-china-wikipedia-utf16be.txt", "application/octet-stream", "text/plain");
-// t("plain-text-china-wikipedia-utf8.txt", "text/plain", "text/plain"); // better
-// t("plain-text-chinese-garbled-name-gb18030.txt", "text/plain", "text/plain"); // better
-// t("plain-text-chinese-gb18030.txt", "text/plain", "text/plain"); // better
-// t("plain-text-chinese-utf16.txt", "text/plain", "text/plain");
-// t("plain-text-empty.txt", "application/octet-stream", "text/plain"); // better octet-stream is better than text/plain for an empty file
-// t("plain-text-japan-wikipedia-eucjp.txt", "text/plain", "text/plain"); // better
-// t("plain-text-japanese-juniversalchardettest-bomremoved-utf16le.txt", "application/octet-stream", "text/plain"); // better
-// t("plain-text-japanese-juniversalchardettest-eucjp.txt", "text/plain", "text/plain"); // better
-// t("plain-text-japanese-juniversalchardettest-iso2022jp.txt", "text/plain", "text/plain"); // better
-// t("plain-text-japanese-juniversalchardettest-shiftjis.txt", "text/plain", "text/plain"); // better
-// t("plain-text-japanese-juniversalchardettest-utf8nobom.txt", "text/plain", "text/plain"); // better
-// t("plain-text-pt-ksiega1-latin2.txt", "text/plain", "text/plain"); // better
-// t("plain-text-pt-ksiega1-utf16be.txt", "application/octet-stream", "text/plain"); // better
-// t("plain-text-pt-ksiega1-utf16le.txt", "application/octet-stream", "text/plain");
-// t("plain-text-pt-ksiega1-utf8.txt", "text/plain", "text/plain"); // better
-// t("plain-text-utf16be.txt", "text/plain", "text/plain");
-// t("plain-text-utf16le.txt", "text/plain", "text/plain");
-// t("plain-text-utf8.txt", "text/plain", "text/plain");
-// t("plain-text-with-null-character.txt", "application/octet-stream", "text/plain");
-// t("plain-text-without-extension", "text/plain", "text/plain");
-// t("plain-text.txt", "text/plain", "text/plain");
-//
-// t("rtf-openoffice-1.1.5.rtf", "application/rtf", "application/rtf");
-// t("rtf-openoffice-2.0.rtf", "application/rtf", "application/rtf");
-// t("rtf-staroffice-5.2.rtf", "application/rtf", "application/rtf");
-// t("rtf-word-2000.rtf", "application/rtf", "application/rtf");
-//
-// t("staroffice-5.2-calc-template.vor", "application/x-tika-msoffice", "application/x-staroffice-template");
-// t("staroffice-5.2-calc.sdc", "application/x-tika-msoffice", "application/vnd.stardivision.calc");
-// t("staroffice-5.2-draw-template.vor", "application/x-tika-msoffice", "application/x-staroffice-template");
-// t("staroffice-5.2-draw.sda", "application/x-tika-msoffice", "application/vnd.stardivision.draw");
-// t("staroffice-5.2-impress-template.vor", "application/x-tika-msoffice", "application/x-staroffice-template");
-// t("staroffice-5.2-impress.sdd", "application/x-tika-msoffice", "application/vnd.stardivision.impress");
-// t("staroffice-5.2-writer-template.vor", "application/x-tika-msoffice", "application/x-staroffice-template");
-// t("staroffice-5.2-writer.sdw", "application/x-tika-msoffice", "application/vnd.stardivision.writer");
-//
-// t("tar-test.tar","application/x-tar","application/x-tar");
-//
-// t("thunderbird-addressbook.mab","text/plain","application/x-mozilla-addressbook");
-//
-// t("vcard-antoni-cardpicture.vcf","text/x-vcard","text/x-vcard");
-// t("vcard-antoni-kontact.vcf","text/x-vcard","text/x-vcard");
-// t("vcard-antoni-outlook2003-urlphoto.vcf","text/x-vcard","text/x-vcard");
-// t("vcard-antoni-outlook2003.vcf","text/x-vcard","text/x-vcard");
-// t("vcard-dirk-corrupted.vcf","text/plain","text/x-vcard"); // wrong, but this one is corrupted
-// t("vcard-dirk.vcf","text/x-vcard","text/x-vcard");
-// t("vcard-illegalurl.vcf","text/x-vcard","text/x-vcard");
-// t("vcard-incompletenproperty.vcf","text/x-vcard","text/x-vcard");
-// t("vcard-rfc2426.vcf","text/x-vcard","text/x-vcard");
-// t("vcard-vCards-SAP-onemodified.vcf","text/x-vcard","text/x-vcard");
-// t("vcard-vCards-SAP.vcf","text/x-vcard","text/x-vcard");
-//
-// t("xml-handwritten-doctype.wrongextension","application/xml","application/xml");
-// t("xml-handwritten.xml","application/xml","application/xml");
-// t("xml-nonexistent-dtd.xml","application/xml","application/xml");
-// t("xml-nonexistent-remote-dtd.xml","application/xml","application/xml");
-// t("xml-nonexistent-remote-xsd.xml","application/xml","application/xml");
-// t("xml-nonexistent-xsd.xml","application/xml","application/xml");
-// t("xml-utf8-bom","text/plain","text/plain"); // UP
-//
-// t("zip_7zr_on_linux_password_hello.zip","application/x-7z-compressed","application/x-7z-compressed");
-// t("zip-infiniteloop.zip","application/zip","application/zip");
-// t("zip-mail-attachment.zip","application/zip","application/zip");
-// t("zip-mail-forwarded-message.zip","application/zip","application/zip");
-// t("zip-multivolume-firstvolume.zip","application/zip","application/zip");
-// t("zip-problem.zip","application/zip","application/zip");
-// t("zip-somedocs.zip","application/zip","application/zip");
-// t("zip-test.zip","application/zip","application/zip");
+ t("microsoft-works-word-processor-3.0.wps", "application/x-tika-msoffice", "application/vnd.ms-works");
+ t("microsoft-works-word-processor-4.0.wps", "application/x-tika-msoffice", "application/vnd.ms-works");
+ t("microsoft-works-word-processor-7.0.wps", "application/vnd.ms-works", "application/vnd.ms-works"); // better
+
+ t("openoffice-1.1.5-calc-template.stc", "application/vnd.sun.xml.calc", "application/vnd.sun.xml.calc.template"); // better
+ t("openoffice-1.1.5-calc.sxc", "application/vnd.sun.xml.calc", "application/vnd.sun.xml.calc"); // better
+ t("openoffice-1.1.5-draw-template.std", "application/vnd.sun.xml.draw", "application/vnd.sun.xml.draw.template"); // better
+ t("openoffice-1.1.5-draw.sxd", "application/vnd.sun.xml.draw", "application/vnd.sun.xml.draw"); // better
+ t("openoffice-1.1.5-impress-template.sti", "application/vnd.sun.xml.impress", "application/vnd.sun.xml.impress.template"); // better
+ t("openoffice-1.1.5-impress.sxi", "application/vnd.sun.xml.impress", "application/vnd.sun.xml.impress"); // better
+ t("openoffice-1.1.5-writer-template.stw", "application/vnd.sun.xml.writer", "application/vnd.sun.xml.writer"); // better
+ t("openoffice-1.1.5-writer.sxw", "application/vnd.sun.xml.writer", "application/vnd.sun.xml.writer"); // better
+
+ t("openoffice-2.0-calc-template.ots", "application/vnd.oasis.opendocument.spreadsheet-template", // better
+ "application/vnd.oasis.opendocument.spreadsheet-template");
+ t("openoffice-2.0-calc.ods", "application/vnd.oasis.opendocument.spreadsheet", // better
+ "application/vnd.oasis.opendocument.spreadsheet");
+ t("openoffice-2.0-draw-template.otg", "application/vnd.oasis.opendocument.graphics-template", // better
+ "application/vnd.oasis.opendocument.graphics-template");
+ t("openoffice-2.0-draw.odg", "application/vnd.oasis.opendocument.graphics", // better
+ "application/vnd.oasis.opendocument.graphics");
+ t("openoffice-2.0-formula.odf", "application/vnd.oasis.opendocument.formula", // better
+ "application/vnd.oasis.opendocument.formula");
+ t("openoffice-2.0-impress-template.otp","application/vnd.oasis.opendocument.presentation-template", // better
+ "application/vnd.oasis.opendocument.presentation-template");
+ t("openoffice-2.0-impress.odp", "application/vnd.oasis.opendocument.presentation", // better
+ "application/vnd.oasis.opendocument.presentation");
+ t("openoffice-2.0-writer-template.ott", "application/vnd.oasis.opendocument.text-template", // better
+ "application/vnd.oasis.opendocument.text-template");
+ t("openoffice-2.0-writer.odt", "application/vnd.oasis.opendocument.text", // better
+ "application/vnd.oasis.opendocument.text");
+
+ t("pdf-distiller-6-weirdchars.pdf", "application/pdf", "application/pdf");
+ t("pdf-manyauthors.pdf", "application/pdf", "application/pdf");
+ t("pdf-no-author.pdf", "application/pdf", "application/pdf");
+ t("pdf-openoffice-1.1.5-writer.pdf", "application/pdf", "application/pdf");
+ t("pdf-openoffice-2.0-writer.pdf", "application/pdf", "application/pdf");
+ t("pdf-openoffice-2.0-writer.pdf.tar", "application/x-tar", "application/x-tar");
+ t("pdf-word-2000-pdfcreator-0.8.0.pdf", "application/pdf", "application/pdf");
+ t("pdf-word-2000-pdfmaker-7.0.pdf", "application/pdf", "application/pdf");
+ t("pdf-word-2000-pdfwriter-7.0.pdf", "application/pdf", "application/pdf");
+
+ t("plain-text-ansi.txt", "text/plain", "text/plain");
+ t("plain-text-china-wikipedia-utf16be.txt", "application/octet-stream", "text/plain");
+ t("plain-text-china-wikipedia-utf8.txt", "text/plain", "text/plain"); // better
+ t("plain-text-chinese-garbled-name-gb18030.txt", "text/plain", "text/plain"); // better
+ t("plain-text-chinese-gb18030.txt", "text/plain", "text/plain"); // better
+ t("plain-text-chinese-utf16.txt", "text/plain", "text/plain");
+ t("plain-text-empty.txt", "application/octet-stream", "text/plain"); // better octet-stream is better than text/plain for an empty file
+ t("plain-text-japan-wikipedia-eucjp.txt", "text/plain", "text/plain"); // better
+ t("plain-text-japanese-juniversalchardettest-bomremoved-utf16le.txt", "application/octet-stream", "text/plain"); // better
+ t("plain-text-japanese-juniversalchardettest-eucjp.txt", "text/plain", "text/plain"); // better
+ t("plain-text-japanese-juniversalchardettest-iso2022jp.txt", "text/plain", "text/plain"); // better
+ t("plain-text-japanese-juniversalchardettest-shiftjis.txt", "text/plain", "text/plain"); // better
+ t("plain-text-japanese-juniversalchardettest-utf8nobom.txt", "text/plain", "text/plain"); // better
+ t("plain-text-pt-ksiega1-latin2.txt", "text/plain", "text/plain"); // better
+ t("plain-text-pt-ksiega1-utf16be.txt", "application/octet-stream", "text/plain"); // better
+ t("plain-text-pt-ksiega1-utf16le.txt", "application/octet-stream", "text/plain");
+ t("plain-text-pt-ksiega1-utf8.txt", "text/plain", "text/plain"); // better
+ t("plain-text-utf16be.txt", "text/plain", "text/plain");
+ t("plain-text-utf16le.txt", "text/plain", "text/plain");
+ t("plain-text-utf8.txt", "text/plain", "text/plain");
+ t("plain-text-with-null-character.txt", "application/octet-stream", "text/plain");
+ t("plain-text-without-extension", "text/plain", "text/plain");
+ t("plain-text.txt", "text/plain", "text/plain");
+
+ t("rtf-openoffice-1.1.5.rtf", "application/rtf", "application/rtf");
+ t("rtf-openoffice-2.0.rtf", "application/rtf", "application/rtf");
+ t("rtf-staroffice-5.2.rtf", "application/rtf", "application/rtf");
+ t("rtf-word-2000.rtf", "application/rtf", "application/rtf");
+
+ t("staroffice-5.2-calc-template.vor", "application/x-tika-msoffice", "application/x-staroffice-template");
+ t("staroffice-5.2-calc.sdc", "application/x-tika-msoffice", "application/vnd.stardivision.calc");
+ t("staroffice-5.2-draw-template.vor", "application/x-tika-msoffice", "application/x-staroffice-template");
+ t("staroffice-5.2-draw.sda", "application/x-tika-msoffice", "application/vnd.stardivision.draw");
+ t("staroffice-5.2-impress-template.vor", "application/x-tika-msoffice", "application/x-staroffice-template");
+ t("staroffice-5.2-impress.sdd", "application/x-tika-msoffice", "application/vnd.stardivision.impress");
+ t("staroffice-5.2-writer-template.vor", "application/x-tika-msoffice", "application/x-staroffice-template");
+ t("staroffice-5.2-writer.sdw", "application/x-tika-msoffice", "application/vnd.stardivision.writer");
+
+ t("tar-test.tar","application/x-tar","application/x-tar");
+
+ t("thunderbird-addressbook.mab","text/plain","application/x-mozilla-addressbook");
+
+ t("vcard-antoni-cardpicture.vcf","text/x-vcard","text/x-vcard");
+ t("vcard-antoni-kontact.vcf","text/x-vcard","text/x-vcard");
+ t("vcard-antoni-outlook2003-urlphoto.vcf","text/x-vcard","text/x-vcard");
+ t("vcard-antoni-outlook2003.vcf","text/x-vcard","text/x-vcard");
+ t("vcard-dirk-corrupted.vcf","text/plain","text/x-vcard"); // wrong, but this one is corrupted
+ t("vcard-dirk.vcf","text/x-vcard","text/x-vcard");
+ t("vcard-illegalurl.vcf","text/x-vcard","text/x-vcard");
+ t("vcard-incompletenproperty.vcf","text/x-vcard","text/x-vcard");
+ t("vcard-rfc2426.vcf","text/x-vcard","text/x-vcard");
+ t("vcard-vCards-SAP-onemodified.vcf","text/x-vcard","text/x-vcard");
+ t("vcard-vCards-SAP.vcf","text/x-vcard","text/x-vcard");
+
+ t("xml-handwritten-doctype.wrongextension","application/xml","application/xml");
+ t("xml-handwritten.xml","application/xml","application/xml");
+ t("xml-nonexistent-dtd.xml","application/xml","application/xml");
+ t("xml-nonexistent-remote-dtd.xml","application/xml","application/xml");
+ t("xml-nonexistent-remote-xsd.xml","application/xml","application/xml");
+ t("xml-nonexistent-xsd.xml","application/xml","application/xml");
+ t("xml-utf8-bom","text/plain","text/plain"); // UP
+
+ t("zip_7zr_on_linux_password_hello.zip","application/x-7z-compressed","application/x-7z-compressed");
+ t("zip-infiniteloop.zip","application/zip","application/zip");
+ t("zip-mail-attachment.zip","application/zip","application/zip");
+ t("zip-mail-forwarded-message.zip","application/zip","application/zip");
+ t("zip-multivolume-firstvolume.zip","application/zip","application/zip");
+ t("zip-problem.zip","application/zip","application/zip");
+ t("zip-somedocs.zip","application/zip","application/zip");
+ t("zip-test.zip","application/zip","application/zip");
}
private void t(String name, String mimeTypeWithoutName, String mimeTypeWithName) throws Exception {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-08 15:27:05
|
Revision: 2572
http://aperture.svn.sourceforge.net/aperture/?rev=2572&view=rev
Author: mylka
Date: 2011-11-08 15:26:52 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
plugged some model and data object leaks in tests
Modified Paths:
--------------
aperture/trunk/core/pom.xml
aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/addressbook/AddressbookCrawler.java
aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/subcrawler/vcard/VcardSubCrawler.java
aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtil.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/addressbook/thunderbird/ThunderbirdCrawlerTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/filesystem/TestMovingFoldersFileSystemCrawler.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mail/DataObjectFactoryTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mail/MailUtilTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mbox/TestMboxCrawler.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mbox/TestMboxCrawlerMovingFolder.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mbox/TestMboxCrawlerMultiFolder.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/datasource/filesystem/TestFileSystemDataSource.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/excel/ExcelExtractorTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/mp3/ID3V2_3_0Test.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/openxml/OpenXmlExtractorTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/pdf/PdfExtractorTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/powerpoint/PowerPointExtractorTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/word/WordExtractorTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/ArchiveSubCrawlerTestBase.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/TestSubcrawlerIntegration.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/bzip2/BZip2SubCrawlerTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/gzip/GZipSubCrawlerTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/mbox/MboxSubCrawlerTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/vcard/VcardSubCrawlerTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/zip/ZipSubCrawlerTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/x2r/WikipediaIncrementalCrawlTest.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtilTest.java
Added Paths:
-----------
aperture/trunk/core/src/test/resources/log.properties
Modified: aperture/trunk/core/pom.xml
===================================================================
--- aperture/trunk/core/pom.xml 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/pom.xml 2011-11-08 15:26:52 UTC (rev 2572)
@@ -670,6 +670,7 @@
<exclude>**/TestIncrementalCrawlerHandler*</exclude>
<exclude>**/TestBasicSubCrawlerHandler*</exclude>
</excludes>
+ <argLine>-Djava.util.logging.config.file=${basedir}/src/test/resources/log.properties</argLine>
<!-- <systemPropertyVariables>-->
<!-- <aperture.validation.skip>false</aperture.validation.skip>-->
<!-- </systemPropertyVariables>-->
Modified: aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/addressbook/AddressbookCrawler.java
===================================================================
--- aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/addressbook/AddressbookCrawler.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/addressbook/AddressbookCrawler.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -78,6 +78,7 @@
String sum = computeChecksum(o);
if (accessData != null && accessData.isKnownId(o.getID().toString())) {
if (accessData.get(o.getID().toString(), ADDRESSBOOK_CHECKSUM_KEY).equals(sum)) {
+ o.dispose();
reportUnmodifiedDataObject(o.getID().toString());
}
else {
Modified: aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/subcrawler/vcard/VcardSubCrawler.java
===================================================================
--- aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/subcrawler/vcard/VcardSubCrawler.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/subcrawler/vcard/VcardSubCrawler.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -325,6 +325,7 @@
accessData.put(uri.toString(), OBJECT_HASH_KEY, objectHash);
handler.objectChanged(object);
} else {
+ object.dispose();
handler.objectNotModified(uri.toString());
}
}
@@ -345,6 +346,7 @@
accessData.put(uri.toString(), OBJECT_HASH_KEY, objectHash);
handler.objectChanged(object);
} else {
+ object.dispose();
handler.objectNotModified(uri.toString());
}
}
Modified: aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtil.java
===================================================================
--- aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtil.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtil.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -169,49 +169,53 @@
static String getSingleMappingString(Model model,
Resource mappingResource) {
Model newModel = RDF2Go.getModelFactory().createModel().open();
- LinkedList<Resource> queue = new LinkedList<Resource>();
- queue.add(mappingResource);
- Set<Resource> visitedResources = new HashSet<Resource>();
- visitedResources.add(mappingResource);
- while (!queue.isEmpty()) {
- Resource r =queue.remove(0);
- ClosableIterator<Statement> i1 =
- model.findStatements(r, Variable.ANY, Variable.ANY);
- while (i1.hasNext()) {
- Statement s = i1.next();
- if (!newModel.contains(s)) {
- newModel.addStatement(s);
- Node object = s.getObject();
- if (object instanceof Resource &&
- !visitedResources.contains(object) &&
- !s.getPredicate().equals(RDF.type)) {
- queue.add((Resource)object);
- visitedResources.add((Resource)object);
+ try {
+ LinkedList<Resource> queue = new LinkedList<Resource>();
+ queue.add(mappingResource);
+ Set<Resource> visitedResources = new HashSet<Resource>();
+ visitedResources.add(mappingResource);
+ while (!queue.isEmpty()) {
+ Resource r =queue.remove(0);
+ ClosableIterator<Statement> i1 =
+ model.findStatements(r, Variable.ANY, Variable.ANY);
+ while (i1.hasNext()) {
+ Statement s = i1.next();
+ if (!newModel.contains(s)) {
+ newModel.addStatement(s);
+ Node object = s.getObject();
+ if (object instanceof Resource &&
+ !visitedResources.contains(object) &&
+ !s.getPredicate().equals(RDF.type)) {
+ queue.add((Resource)object);
+ visitedResources.add((Resource)object);
+ }
}
}
- }
- i1.close();
- i1 = model.findStatements(Variable.ANY, Variable.ANY, r);
- while (i1.hasNext()) {
- Statement s = i1.next();
- if (!newModel.contains(s)) {
- newModel.addStatement(s);
- Resource subject = s.getSubject();
- if (!visitedResources.contains(subject)) {
- queue.add(subject);
- visitedResources.add(subject);
+ i1.close();
+ i1 = model.findStatements(Variable.ANY, Variable.ANY, r);
+ while (i1.hasNext()) {
+ Statement s = i1.next();
+ if (!newModel.contains(s)) {
+ newModel.addStatement(s);
+ Resource subject = s.getSubject();
+ if (!visitedResources.contains(subject)) {
+ queue.add(subject);
+ visitedResources.add(subject);
+ }
}
}
}
+
+ StringWriter sw = new StringWriter();
+ try {
+ newModel.writeTo(sw, Syntax.Turtle);
+ } catch (Exception e) {
+ throw new RuntimeException(e); // will not happen
+ }
+ return sw.toString();
+ } finally {
+ newModel.close();
}
-
- StringWriter sw = new StringWriter();
- try {
- newModel.writeTo(sw, Syntax.Turtle);
- } catch (Exception e) {
- throw new RuntimeException(e); // will not happen
- }
- return sw.toString();
}
/**
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/addressbook/thunderbird/ThunderbirdCrawlerTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/addressbook/thunderbird/ThunderbirdCrawlerTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/addressbook/thunderbird/ThunderbirdCrawlerTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -73,7 +73,7 @@
model = createModel();
c.crawl();
-
+
// Originally there were 179 objects, but after adding a ContactList object
// that contains all contacts, the number rose to 180
assertEquals(objects,180);
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/filesystem/TestMovingFoldersFileSystemCrawler.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/filesystem/TestMovingFoldersFileSystemCrawler.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/filesystem/TestMovingFoldersFileSystemCrawler.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -12,6 +12,7 @@
import org.ontoware.rdf2go.RDF2Go;
import org.ontoware.rdf2go.exception.ModelException;
+import org.ontoware.rdf2go.model.Model;
import org.semanticdesktop.aperture.accessor.AccessData;
import org.semanticdesktop.aperture.accessor.DataAccessor;
import org.semanticdesktop.aperture.accessor.DataObject;
@@ -102,7 +103,8 @@
FileSystemDataSource dataSource = new FileSystemDataSource();
dataSource.setConfiguration(configuration);
dataSource.setMovableIdentifier("movable-identifier");
- AccessData ad = new ModelAccessData(RDF2Go.getModelFactory().createModel().open());
+ Model model = RDF2Go.getModelFactory().createModel().open();
+ AccessData ad = new ModelAccessData(model);
File tmpDir = null;
try {
@@ -133,6 +135,7 @@
dataSource, ad, null, new RDFContainerFactoryImpl());
ad.store(); // remember to store the state of the AccessData
String content = IOUtil.readString(((FileDataObject)obj).getContent());
+ obj.dispose();
assertEquals("test file 4",content);
// one unmodified, the rest is modified
@@ -142,6 +145,7 @@
e.printStackTrace();
fail();
} finally {
+ model.close();
FileUtil.deltree(tmpDir);
}
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mail/DataObjectFactoryTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mail/DataObjectFactoryTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mail/DataObjectFactoryTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -949,6 +949,10 @@
assertEquals(mail.getID(), mailingListSignature.getMetadata().getURI(NIE.isPartOf));
assertEquals("uri:dummymailuri:mail-wireshark.eml#1", mailingListSignature.getID().toString());
+ mail.dispose();
+ pcapAttachment.dispose();
+ signature.dispose();
+ mailingListSignature.dispose();
}
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mail/MailUtilTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mail/MailUtilTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mail/MailUtilTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -154,6 +154,7 @@
"?e1 " + NCO.emailAddress.toSPARQL() + " \"ant...@do...\" . " +
"?c " + NCO.hasEmailAddress.toSPARQL() + " ?e2 . " +
"?e2 " + NCO.emailAddress.toSPARQL() + " \"oth...@ot...\" }");
+ container.dispose();
}
public void testParseNormalDate() {
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mbox/TestMboxCrawler.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mbox/TestMboxCrawler.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mbox/TestMboxCrawler.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -120,6 +120,7 @@
public void testNoBlankLineBetweenMails() throws Exception {
TestIncrementalCrawlerHandler handler1 = crawl("mbox-noblanklinebetweenmails.mbox",null, null);
assertNewModUnmodDel(handler1, 5, 0, 0, 0);
+ handler1.close();
}
/**
@@ -360,6 +361,7 @@
crawler.retrieveConfigurationData(src);
String path = crawler.getFolderName(objectURI);
assertEquals(expectedPath, path);
+ src.dispose();
}
/**
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mbox/TestMboxCrawlerMovingFolder.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mbox/TestMboxCrawlerMovingFolder.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mbox/TestMboxCrawlerMovingFolder.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -88,6 +88,9 @@
TestIncrementalCrawlerHandler handler3 = crawl(source, ad);
// all objects unmodified
assertNewModUnmodDel(handler3, 0, 0, 203, 0);
+
+ source.dispose();
+ source2.dispose();
handler.close();
handler2.close();
handler3.close();
@@ -112,6 +115,8 @@
handler.close();
handler2.close();
handler3.close();
+ source.dispose();
+ source2.dispose();
}
public void testMailRemovedAfterMove() throws Exception {
@@ -133,6 +138,8 @@
handler.close();
handler2.close();
handler3.close();
+ source.dispose();
+ source2.dispose();
}
public void testMailModifiedAfterMove() throws Exception {
@@ -152,7 +159,10 @@
// one email modified, this means one delete, one new, the folder modified,
// the rest unmodified
assertNewModUnmodDel(handler3, 1, 1, 206, 1);
+ source.dispose();
+ source2.dispose();
handler.close();
+
handler2.close();
handler3.close();
}
@@ -175,6 +185,8 @@
obj.dispose();
}
handler.close();
+ source.dispose();
+ source2.dispose();
}
public void testIncrementalDataAccessor() throws Exception {
@@ -193,6 +205,8 @@
assertNull(obj);
}
handler.close();
+ source.dispose();
+ source2.dispose();
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mbox/TestMboxCrawlerMultiFolder.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mbox/TestMboxCrawlerMultiFolder.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/crawler/mbox/TestMboxCrawlerMultiFolder.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -171,7 +171,6 @@
validate(model);
handler.close();
- handler.close();
}
public void testBasicDataAccessor() throws Exception {
@@ -233,6 +232,7 @@
}
}
assertEquals(14,counter); // 4*(emails with 2 objects) + 2*(emails with 3 objects);
+ crawlerHandler.close();
}
private TestIncrementalCrawlerHandler crawl(AccessData data) throws Exception {
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/datasource/filesystem/TestFileSystemDataSource.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/datasource/filesystem/TestFileSystemDataSource.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/datasource/filesystem/TestFileSystemDataSource.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -31,7 +31,8 @@
assertEquals("aperture://testidentifier/subdir/subsubdir/file-skipme-7418630367620975776.txt",
fsds.getMovableURI("file:/C:/Documents%20and%20Settings/Antoni/Ustawienia%20lokalne/Temp/TestFileSystemCrawler.tmpDir/subdir/subsubdir/file-skipme-7418630367620975776.txt"));
assertEquals("file:/C:/Documents%20and%20Settings/Antoni/Ustawienia%20lokalne/Temp/TestFileSystemCrawler.tmpDir/subdir/subsubdir/file-skipme-7418630367620975776.txt",
- fsds.getAbsoluteURI("aperture://testidentifier/subdir/subsubdir/file-skipme-7418630367620975776.txt"));
+ fsds.getAbsoluteURI("aperture://testidentifier/subdir/subsubdir/file-skipme-7418630367620975776.txt"));
+ cont.dispose();
}
public void testFileSystemDataSourceWithRealFolder() throws IOException {
@@ -59,6 +60,7 @@
assertEquals("aperture://testidentifier/subdir/subsubdir/file-skipme-7418630367620975776.txt",
fsds.getMovableURI(expectedUriPrefix + "/subdir/subsubdir/file-skipme-7418630367620975776.txt"));
assertEquals(expectedUriPrefix + "/subdir/subsubdir/file-skipme-7418630367620975776.txt",
- fsds.getAbsoluteURI("aperture://testidentifier/subdir/subsubdir/file-skipme-7418630367620975776.txt"));
+ fsds.getAbsoluteURI("aperture://testidentifier/subdir/subsubdir/file-skipme-7418630367620975776.txt"));
+ cont.dispose();
}
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/excel/ExcelExtractorTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/excel/ExcelExtractorTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/excel/ExcelExtractorTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -79,6 +79,7 @@
checkStatement(NIE.plainTextContent, "Christian Spurk", container);
checkStatement(NIE.plainTextContent, "Microsoft Excel", container);
checkStatement(NIE.plainTextContent, "Arbeitsbl", container);
+ container.dispose();
}
public void testEncryptedExcelGeneratedByOOCalc() throws Exception {
@@ -89,13 +90,15 @@
// some metadata should still be correctly extracted
checkStatement(APERTURE_NIE_EXTENSIONS.contentLastPrinted, "1601-01-01", container);
DateUtil.dateTimeStringEqualToUTCString(container.getString(NIE.contentCreated), "2009-11-04T14:48:39Z");
+ container.dispose();
}
public void testExcelWithTextFieldsAndShapes() throws Exception {
ExtractorFactory factory = new ExcelExtractorFactory();
Extractor extractor = factory.get();
RDFContainer container = extract(DOCS_PATH + "microsoft-excel-textfields-shapes.xls", extractor);
- System.out.println(container.getString(NIE.plainTextContent));
+// System.out.println(container.getString(NIE.plainTextContent));
+ container.dispose();
}
/**
@@ -108,5 +111,6 @@
Extractor extractor = factory.get();
RDFContainer container = extract(DOCS_PATH + "encrypted/excel-3088113-encrypted.xls", extractor);
checkStatement(NFO.encryptionStatus, NFO.encryptedStatus, container);
+ container.dispose();
}
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/mp3/ID3V2_3_0Test.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/mp3/ID3V2_3_0Test.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/mp3/ID3V2_3_0Test.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -55,5 +55,6 @@
checkStatement(NID3.subtitle, "The subtitle test, description refinement", metadata);
checkStatement(NID3.officialArtistWebpage, new URIImpl("http://www.antoni.com/performer/webpage.html"), metadata);
validate(metadata);
+ metadata.dispose();
}
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/openxml/OpenXmlExtractorTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/openxml/OpenXmlExtractorTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/openxml/OpenXmlExtractorTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -120,5 +120,6 @@
private void testEncrypted(String resourceName) throws ExtractorException, IOException, ModelException {
RDFContainer container = getStatements(DOCS_PATH + "encrypted/" + resourceName);
checkStatement(NFO.encryptionStatus, NFO.encryptedStatus, container);
+ container.dispose();
}
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/pdf/PdfExtractorTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/pdf/PdfExtractorTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/pdf/PdfExtractorTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -193,7 +193,6 @@
String fulltext = container.getString(NIE.plainTextContent);
// at one point this document yielded no fulltext at all
assertNotNull(fulltext);
- System.out.println(fulltext);
// WhyCompetition and LawMatters are glued together, this isn't good
// but at least that's the same as in previous pdfbox versions
assertTrue(fulltext.contains("WhyCompetition LawMatters"));
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/powerpoint/PowerPointExtractorTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/powerpoint/PowerPointExtractorTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/powerpoint/PowerPointExtractorTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -92,5 +92,6 @@
Extractor extractor = factory.get();
RDFContainer container = extract(DOCS_PATH + "encrypted/powerpoint2003.ppt", extractor);
checkStatement(NFO.encryptionStatus, NFO.encryptedStatus, container);
+ container.dispose();
}
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/word/WordExtractorTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/word/WordExtractorTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/extractor/word/WordExtractorTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -77,6 +77,7 @@
checkStatement(NFO.encryptionStatus, NFO.encryptedStatus, container);
checkSimpleContact(NCO.creator, "", container);
checkSimpleContact(NCO.contributor, "Christian Spurk", container);
+ container.dispose();
}
public void testSavedByHistory() throws Exception {
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/ArchiveSubCrawlerTestBase.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/ArchiveSubCrawlerTestBase.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/ArchiveSubCrawlerTestBase.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -142,6 +142,7 @@
ad.store();
stream.close();
+ handler.close();
assertNewModUnmod(handler, numberOfEntries, 0, 0);
@@ -155,6 +156,7 @@
ad.store();
stream.close();
assertNewModUnmod(handler, 0, 0, numberOfEntries);
+ handler.close();
}
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/TestSubcrawlerIntegration.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/TestSubcrawlerIntegration.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/TestSubcrawlerIntegration.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -36,7 +36,7 @@
RDFContainer parentMetadata = new RDFContainerImpl(RDF2Go.getModelFactory().createModel().open(), "uri:1");
parentMetadata.add(NFO.fileName,"mail-multipart-test.eml.tar.gz");
topLevelSubcrawler.subCrawl(parentMetadata.getDescribedUri(), stream, hndlr, null, null, null, null, parentMetadata);
-
+ parentMetadata.dispose();
assertEquals(4,hndlr.getNewObjects().size());
assertTrue(hndlr.getNewObjects().contains("gzip:uri:1!/mail-multipart-test.eml.tar"));
assertTrue(hndlr.getNewObjects().contains("tar:gzip:uri:1!/mail-multipart-test.eml.tar!/mail-multipart-test.eml"));
@@ -53,7 +53,7 @@
SubCrawler topLevelSubcrawler = new GZipSubCrawler();
RDFContainer parentMetadata = new RDFContainerImpl(RDF2Go.getModelFactory().createModel().open(), "uri:1");
topLevelSubcrawler.subCrawl(parentMetadata.getDescribedUri(), stream, hndlr, null, null, null, null, parentMetadata);
-
+ parentMetadata.dispose();
assertEquals(4,hndlr.getNewObjects().size());
assertTrue(hndlr.getNewObjects().contains("gzip:uri:1!/uri%3A1.content"));
assertTrue(hndlr.getNewObjects().contains("tar:gzip:uri:1!/uri%3A1.content!/mail-multipart-test.eml"));
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/bzip2/BZip2SubCrawlerTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/bzip2/BZip2SubCrawlerTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/bzip2/BZip2SubCrawlerTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -56,6 +56,7 @@
String contentObject = handler.getNewObjects().iterator().next();
assertEquals("bzip2:uri:dummyuri!/uri%3Adummyuri.content", contentObject);
+ parentMetadata.dispose();
handler.close();
}
@@ -69,6 +70,7 @@
String contentObject = handler.getNewObjects().iterator().next();
assertEquals("bzip2:file:/C:/folder/bzipped.WRONG!/bzipped.WRONG.content", contentObject);
+ parentMetadata.dispose();
handler.close();
}
@@ -82,6 +84,7 @@
String contentObject = handler.getNewObjects().iterator().next();
assertEquals("bzip2:uri:dummyuri!/bzip2-txt-bziptest.txt", contentObject);
+ parentMetadata.dispose();
handler.close();
}
@@ -93,6 +96,7 @@
sc.subCrawl(parentMetadata.getDescribedUri(), is, handler, null, null, null, null, parentMetadata);
String contentObject = handler.getNewObjects().iterator().next();
assertEquals("bzip2:file:/C:/bzip2file.bzipped!/bzip2file", contentObject);
+ parentMetadata.dispose();
handler.close();
}
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -58,6 +58,8 @@
String contentObject = handler.getNewObjects().iterator().next();
assertEquals("compress:uri:dummyuri!/uri%3Adummyuri.content",contentObject);
+ parentMetadata.dispose();
+ handler.close();
}
public void testLegacyGenerationWrongExtension() throws Exception {
@@ -70,6 +72,8 @@
String contentObject = handler.getNewObjects().iterator().next();
assertEquals("compress:file:/C:/folder/compressed.WRONG!/compressed.WRONG.content",contentObject);
+ parentMetadata.dispose();
+ handler.close();
}
public void testNewGeneration() throws Exception {
@@ -82,6 +86,8 @@
String contentObject = handler.getNewObjects().iterator().next();
assertEquals("compress:uri:dummyuri!/compress-txt-compresstest.txt",contentObject);
+ parentMetadata.dispose();
+ handler.close();
}
public void testNewGenerationNoFilenameInMetadataWrongExtension() throws Exception {
@@ -93,6 +99,8 @@
String contentObject = handler.getNewObjects().iterator().next();
assertEquals("compress:file:/C:/compressfile.WRONG!/compressfile",contentObject);
+ parentMetadata.dispose();
+ handler.close();
}
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/gzip/GZipSubCrawlerTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/gzip/GZipSubCrawlerTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/gzip/GZipSubCrawlerTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -56,6 +56,8 @@
String contentObject = handler.getNewObjects().iterator().next();
assertEquals("gzip:uri:dummyuri!/uri%3Adummyuri.content",contentObject);
+ handler.close();
+ parentMetadata.dispose();
}
public void testLegacyGenerationWrongExtension() throws Exception {
@@ -68,6 +70,8 @@
String contentObject = handler.getNewObjects().iterator().next();
assertEquals("gzip:file:/C:/folder/gzipped.WRONG!/gzipped.WRONG.content",contentObject);
+ parentMetadata.dispose();
+ handler.close();
}
public void testNewGeneration() throws Exception {
@@ -80,6 +84,8 @@
String contentObject = handler.getNewObjects().iterator().next();
assertEquals("gzip:uri:dummyuri!/gzip-txt-gziptest.txt",contentObject);
+ handler.close();
+ parentMetadata.dispose();
}
public void testNewGenerationNoFilenameinMetadataWrongExtension() throws Exception {
@@ -91,6 +97,8 @@
String contentObject = handler.getNewObjects().iterator().next();
assertEquals("gzip:file:/C:/gzippedfile.WRONG!/gzippedfile",contentObject);
+ parentMetadata.dispose();
+ handler.close();
}
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/mbox/MboxSubCrawlerTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/mbox/MboxSubCrawlerTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/mbox/MboxSubCrawlerTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -101,6 +101,7 @@
public void testNoBlankLineBetweenMails() throws Exception {
TestBasicSubCrawlerHandler handler1 = crawl("mbox-noblanklinebetweenmails.mbox",null, null);
assertNewModUnmod(handler1, 4, 0, 0);
+ handler1.close();
}
/**
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/vcard/VcardSubCrawlerTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/vcard/VcardSubCrawlerTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/vcard/VcardSubCrawlerTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -340,7 +340,6 @@
Iterator<String> id = handler.getNewObjects().iterator();
for (int i = 0; i < 30; i++) {
String st = id.next();
- System.out.println(st);
assertTrue(st.startsWith("vcard:uri:dummyuri!/"));
assertEquals(metadata.getDescribedUri(),findSingleObjectResource(metadata.getModel(), new URIImpl(st), NIE.isPartOf));
}
@@ -358,6 +357,7 @@
byte [] expectedbytes = IOUtil.readBytes(ResourceUtil.getInputStream(DOCS_PATH + "vcard-vCards-SAP-markussprung.vcf", getClass()));
assertTrue(Arrays.equals(expectedbytes, vcardbytes));
+ ob.dispose();
}
/**
@@ -406,6 +406,7 @@
Resource frankDawsonContact = findContact(model, "Frank Dawson");
assertSingleValueProperty(model, frankDawsonContact, NCO.nameFamily, "Dawson");
assertSingleValueProperty(model, frankDawsonContact, NCO.nameGiven, "Frank");
+ metadata.dispose();
}
public void testAntoniNames() throws Exception {
@@ -418,6 +419,7 @@
assertSingleValueProperty(model, antoniContact, NCO.nameAdditional, "Jozef");
assertSingleValueProperty(model, antoniContact, NCO.nameHonorificPrefix, "Herr");
assertSingleValueProperty(model, antoniContact, NCO.nameHonorificSuffix, "jun.");
+ metadata.dispose();
}
public void testUrl() throws Exception {
@@ -427,6 +429,7 @@
Resource frankDawsonContact = findContact(model, "Frank Dawson");
Resource url = findSingleObjectResource(model, frankDawsonContact, NCO.url);
assertTrue(url.toString().equals("http://home.earthlink.net/~fdawson"));
+ metadata.dispose();
}
public void testTelephoneNumbers() throws Exception {
@@ -458,6 +461,7 @@
" ?phoneNumber nco:phoneNumber ?number ." +
" FILTER (regex(?number,\"\\\\+1-919-676-9564\"))" +
" }");
+ metadata.dispose();
}
public void testEmailAddresses() throws Exception {
@@ -485,6 +489,7 @@
" ?email nco:emailAddress ?address ." +
" FILTER (regex(?address,\"fd...@ea...\"))" +
" }");
+ metadata.dispose();
}
public void testWorkPostalAddress() throws Exception {
@@ -501,6 +506,7 @@
assertSingleValueProperty(model, address, NCO.streetAddress, "6544 Battleford Drive");
assertSingleValueProperty(model, address, NCO.locality, "Raleigh");
assertSingleValueProperty(model, address, NCO.region, "NC");
+ metadata.dispose();
}
public void testHomePostalAddress() throws Exception {
@@ -516,6 +522,7 @@
assertSingleValueProperty(model, address, NCO.region, "malopolskie");
assertSingleValueProperty(model, address, NCO.postalcode, "30-072");
assertSingleValueProperty(model, address, NCO.country, "Polen");
+ metadata.dispose();
}
public void testRole() throws Exception {
@@ -525,6 +532,7 @@
Resource antoniContact = findContact(model, "Antoni Jozef Mylka jun.");
Resource affiliation = findSingleObjectResource(model, antoniContact, NCO.hasAffiliation);
assertSingleValueProperty(model, affiliation, NCO.role, "Software-Developer");
+ metadata.dispose();
}
public void testTitle() throws Exception {
@@ -534,6 +542,7 @@
Resource antoniContact = findContact(model, "Antoni Jozef Mylka jun.");
Resource affiliation = findSingleObjectResource(model, antoniContact, NCO.hasAffiliation);
assertSingleValueProperty(model, affiliation, NCO.title, "Intern");
+ metadata.dispose();
}
public void testNickname() throws Exception {
@@ -542,6 +551,7 @@
Model model = metadata.getModel();
Resource antoniContact = findContact(model, "Antoni Jozef Mylka jun.");
assertSingleValueProperty(model, antoniContact, NCO.nickname, "Ant");
+ metadata.dispose();
}
public void testBday() throws Exception {
@@ -551,6 +561,7 @@
Resource antoniContact = findContact(model, "Antoni Jozef Mylka jun.");
String dateString = findSingleObjectNode(model, antoniContact, NCO.birthDate).asLiteral().getValue();
assertEquals("1980-01-18", dateString);
+ metadata.dispose();
}
public void testOrganization() throws Exception {
@@ -564,6 +575,7 @@
Resource organization = findSingleObjectResource(model, affiliation, NCO.org);
assertSingleValueProperty(model, organization, RDF.type, NCO.OrganizationContact);
assertSingleValueProperty(model, organization, NCO.fullname, "DFKI");
+ metadata.dispose();
}
public void testNote() throws Exception {
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/zip/ZipSubCrawlerTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/zip/ZipSubCrawlerTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/subcrawler/zip/ZipSubCrawlerTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -101,7 +101,9 @@
URI ds = new URIImpl("uri:ds");
metadata.add(NIE.rootElementOf, ds);
- getValidator().validateWithDataObjectTreeTest(metadata.getModel(), ds);
+ getValidator().validateWithDataObjectTreeTest(metadata.getModel(), ds);
+ metadata.dispose();
+ handler.close();
}
/**
@@ -126,6 +128,8 @@
ZipSubCrawler subCrawler = new ZipSubCrawler();
metadata = subCrawl("zip-infiniteloop.zip", subCrawler, handler);
assertNewModUnmod(handler, 22, 0, 0);
+ metadata.dispose();
+ handler.close();
}
public void testFirstPartOfMultivolumeZip() throws Exception {
@@ -138,6 +142,7 @@
// this is to be expected
}
assertNewModUnmod(handler, 16, 0, 0);
+ handler.close();
}
public void testEncryptedZip() throws Exception {
@@ -146,6 +151,8 @@
metadata = subCrawl("encrypted/zip-infozip-osx-passhello.zip", subCrawler, handler);
assertNewModUnmod(handler, 1, 0, 0);
checkStatement(NFO.encryptionStatus, NFO.encryptedStatus, metadata);
+ metadata.dispose();
+ handler.close();
}
public void testEncryptedZip2() throws Exception {
@@ -154,6 +161,8 @@
metadata = subCrawl("encrypted/zip-7zip-linux-passhello.zip", subCrawler, handler);
assertNewModUnmod(handler, 1, 0, 0);
checkStatement(NFO.encryptionStatus, NFO.encryptedStatus, metadata);
+ metadata.dispose();
+ handler.close();
}
/**
@@ -167,6 +176,8 @@
metadata = subCrawl("encrypted/zip-winzip-encrypted.zip", subCrawler, handler);
assertNewModUnmod(handler, 1, 0, 0);
checkStatement(NFO.encryptionStatus, NFO.encryptedStatus, metadata);
+ metadata.dispose();
+ handler.close();
}
public void testMultifolderZip() {
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java 2011-11-07 16:37:14 UTC (rev 2571)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java 2011-11-08 15:26:52 UTC (rev 2572)
@@ -39,249 +39,249 @@
@Test
public void testIdentification() throws Exception {
- t("bzip2-txt-bziptest.txt.bz2", "application/x-bzip", "application/x-bzip2");
- t("compress-txt-compresstest.txt.Z", "application/x-compress", "application/x-compress");
- t("corel-presentations-3.0.shw", "application/vnd.wordperfect","application/vnd.wordperfect"); // better
- t("corel-presentations-x3.shw", "application/x-corelpresentations","application/x-corelpresentations"); // better
- t("corel-quattro-pro-6.wb2", "application/x-123", "application/x-123"); // UP, 2nd should be x-quatro-pro
- t("corel-quattro-pro-7.wb3", "application/x-quattro-pro", "application/x-quattro-pro"); // better
- t("corel-quattro-pro-x3.qpw", "application/x-quattro-pro", "application/x-quattro-pro"); // better
- t("corel-wordperfect-4.2.wp", "application/octet-stream", "application/vnd.wordperfect");
- t("corel-wordperfect-5.0.wp", "application/vnd.wordperfect","application/vnd.wordperfect");
- t("corel-wordperfect-5.1-far-east.wp", "application/vnd.wordperfect","application/vnd.wordperfect");
- t("corel-wordperfect-5.1.wp", "application/vnd.wordperfect","application/vnd.wordperfect");
- t("corel-wordperfect-x3.wpd", "application/vnd.wordperfect","application/vnd.wordperfect");
- t("cpio-testfile.txt.cpio", "application/x-cpio", "application/x-cpio");
- t("counting-input-stream-test-file.dat", "application/vnd.openxmlformats-officedocument.presentationml.slideshow", "application/vnd.openxmlformats-officedocument.presentationml.slideshow"); // better
- t("emlx-74719.emlx", "message/x-emlx", "message/x-emlx"); // better
- t("faulty-fileaccessdata-is-ignored.xml","application/x-gzip", "application/x-gzip");
- t("foxmail-in.BOX", "application/x-foxmail", "application/x-foxmail"); // better
- t("html-condenast.html", "text/html", "text/html");
- t("html-handwritten-with-wrong-file-extension.txt","text/html", "text/html");
- t("html-handwritten.html", "text/html", "text/html");
- t("html-mixed-case-header-and-wrong-extension.txt","text/html", "text/html");
- t("html-quelle.de.html", "text/html", "text/html");
- t("html-teampb.html", "application/xhtml+xml", "application/xhtml+xml"); // better
- t("html-utf16-leading-whitespace-wrong-extension.doc","text/plain", "text/plain"); // worse
- t("html-youtube-contenttypeinhttpheaders.html","text/html", "text/html");
- t("jingle1.mp3", "audio/mpeg", "audio/mpeg"); // better
- t("jingle2.mp3", "audio/mpeg", "audio/mpeg"); // better
- t("jingle3.mp3", "audio/mpeg", "audio/mpeg");
- t("jpg-exif-img_9367.JPG", "image/jpeg", "image/jpeg");
- t("jpg-exif-zerolength.jpg", "application/octet-stream", "image/jpeg");
- t("jpg-geotagged-ipanema.jpg", "image/jpeg", "image/jpeg");
- t("jpg-geotagged.jpg", "image/jpeg", "image/jpeg");
- t("xml-kowiki.xml", "application/x-mediawiki-xml-export","application/x-mediawiki-xml-export");
- t("mail-attachment.eml", "message/rfc822", "message/rfc822");
- t("mail-conflict-desktop1.eml", "text/plain", "message/rfc822"); // wrong
- t("mail-conflict-desktop2.eml", "text/plain", "message/rfc822"); // wrong
- t("mail-forwarded-references.eml", "text/plain", "message/rfc822"); // wrong
- t("mail-mapi125messageid.eml", "message/rfc822", "message/rfc822");
- t("mail-mbox-aperture-inc1-mail1.eml", "text/plain", "message/rfc822"); // wrong
- t("mail-mbox-aperture-inc1-mail2.eml", "text/plain", "message/rfc822"); // wrong
- t("mail-mbox-aperture-inc1-mail3.eml", "text/plain", "message/rfc822"); // wrong
- t("mail-mbox-aperture-inc1-mail4.eml", "text/plain", "message/rfc822"); // wrong
- t("mail-multipart-plain-html.eml", "text/plain", "message/rfc822"); // wrong
- t("mail-multipart-related-bug.eml", "message/rfc822", "message/rfc822");
- t("mail-multipart-test.eml", "text/plain", "message/rfc822"); // wrong
- t("mail-multipart-test.eml.tar.gz", "application/x-gzip", "application/x-gzip");
- t("mail-plaintext-attachment.eml", "message/rfc822", "message/rfc822");
- t("mail-threaded.eml", "application/mbox", "application/mbox");
- t("mail-threaded-blackberryheader.eml", "message/rfc822", "message/rfc822");
- t("mail-thunderbird-1.5-unspecifiedcharset.eml","message/rfc822", "message/rfc822");
- t("mail-thunderbird-1.5.eml", "message/rfc822", "message/rfc822");
- t("mail-UnsupportedOperationException.eml","message/rfc822", "message/rfc822");
- t("mail-xml-attachment.eml", "message/rfc822", "message/rfc822");
- t("mail.msg", "application/vnd.ms-outlook","application/vnd.ms-outlook"); // better
- t("mbox-aperture-dev", "application/mbox", "application/mbox");
- t("mbox-aperture-inc1", "application/mbox", "application/mbox");
- t("mbox-aperture-inc2", "application/mbox", "application/mbox");
- t("mbox-aperture-inc3", "application/mbox", "application/mbox");
- t("mbox-aperture-inc4", "application/mbox", "application/mbox");
- t("mbox-noblanklinebetweenmails.mbox", "application/mbox", "application/mbox");
- t("mbox-testfolder", "application/mbox", "application/mbox");
- t("mhtml-firefox.mht", "message/rfc822", "message/rfc822");
- t("mhtml-internet-explorer.mht", "message/rfc822", "message/rfc822");
+// t("bzip2-txt-bziptest.txt.bz2", "application/x-bzip", "application/x-bzip2");
+// t("compress-txt-compresstest.txt.Z", "application/x-compress", "application/x-compress");
+// t("corel-presentations-3.0.shw", "application/vnd.wordperfect","application/vnd.wordperfect"); // better
+// t("corel-presentations-x3.shw", "application/x-corelpresentations","application/x-corelpresentations"); // better
+// t("corel-quattro-pro-6.wb2", "application/x-123", "application/x-123"); // UP, 2nd should be x-quatro-pro
+// t("corel-quattro-pro-7.wb3", "application/x-quattro-pro", "application/x-quattro-pro"); // better
+// t("corel-quattro-pro-x3.qpw", "application/x-quattro-pro", "application/x-quattro-pro"); // better
+// t("corel-wordperfect-4.2.wp", "application/octet-stream", "application/vnd.wordperfect");
+// t("corel-wordperfect-5.0.wp", "application/vnd.wordperfect","application/vnd.wordperfect");
+// t("corel-wordperfect-5.1-far-east.wp", "application/vnd.wordperfect","application/vnd.wordperfect");
+// t("corel-wordperfect-5.1.wp", "application/vnd.wordperfect","application/vnd.wordperfect");
+// t("corel-wordperfect-x3.wpd", "application/vnd.wordperfect","application/vnd.wordperfect");
+// t("cpio-testfile.txt.cpio", "application/x-cpio", "application/x-cpio");
+// t("counting-input-stream-test-file.dat", "application/vnd.openxmlformats-officedocument.presentationml.slideshow", "application/vnd.openxmlformats-officedocument.presentationml.slideshow"); // better
+// t("emlx-74719.emlx", "message/x-emlx", "message/x-emlx"); // better
+// t("faulty-fileaccessdata-is-ignored.xml","application/x-gzip", "application/x-gzip");
+// t("foxmail-in.BOX", "application/x-foxmail", "application/x-foxmail"); // better
+// t("html-condenast.html", "text/html", "text/html");
+// t("html-handwritten-with-wrong-file-extension.txt","text/html", "text/html");
+// t("html-handwritten.html", "text/html", "text/html");
+// t("html-mixed-case-header-and-wrong-extension.txt","text/html", "text/html");
+// t("html-quelle.de.html", "text/html", "text/html");
+// t("html-teampb.html", "application/xhtml+xml", "application/xhtml+xml"); // better
+// t("html-utf16-leading-whitespace-wrong-extension.doc","text/plain", "text/plain"); // worse
+// t("html-youtube-contenttypeinhttpheaders.html","text/html", "text/html");
+// t("jingle1.mp3", "audio/mpeg", "audio/mpeg"); // better
+// t("jingle2.mp3", "audio/mpeg", "audio/mpeg"); // better
+// t("jingle3.mp3", "audio/mpeg", "audio/mpeg");
+// t("jpg-exif-img_9367.JPG", "image/jpeg", "image/jpeg");
+// t("jpg-exif-zerolength.jpg", "application/octet-stream", "image/jpeg");
+// t("jpg-geotagged-ipanema.jpg", "image/jpeg", "image/jpeg");
+// t("jpg-geotagged.jpg", "image/jpeg", "image/jpeg");
+// t("xml-kowiki.xml", "application/x-mediawiki-xml-export","application/x-mediawiki-xml-export");
+// t("mail-attachment.eml", "message/rfc822", "message/rfc822");
+// t("mail-conflict-desktop1.eml", "text/plain", "message/rfc822"); // wrong
+// t("mail-conflict-desktop2.eml", "text/plain", "message/rfc822"); // wrong
+// t("mail-forwarded-references.eml", "text/plain", "message/rfc822"); // wrong
+// t("mail-mapi125messageid.eml", "message/rfc822", "message/rfc822");
+// t("mail-mbox-aperture-inc1-mail1.eml", "text/plain", "message/rfc822"); // wrong
+// t("mail-mbox-aperture-inc1-mail2.eml", "text/plain", "message/rfc822"); // wrong
+// t("mail-mbox-aperture-inc1-mail3.eml", "text/plain", "message/rfc822"); // wrong
+// t("mail-mbox-aperture-inc1-mail4.eml", "text/plain", "message/rfc822"); // wrong
+// t("mail-multipart-plain-html.eml", "text/plain", "message/rfc822"); // wrong
+// t("mail-multipart-related-bug.eml", "message/rfc822", "message/rfc822");
+// t("mail-multipart-test.eml", "text/plain", "message/rfc822"); // wrong
+// t("mail-multipart-test.eml.tar.gz", "application/x-gzip", "application/x-gzip");
+// t("mail-plaintext-attachment.eml", "message/rfc822", "message/rfc822");
+// t("mail-threaded.eml", "application/mbox", "application/mbox");
+// t("mail-threaded-blackberryheader.eml", "message/rfc822", "message/rfc822");
+// t("mail-thunderbird-1.5-unspecifiedcharset.eml","message/rfc822", "message/rfc822");
+// t("mail-thunderbird-1.5.eml", "message/rfc822", "message/rfc822");
+// t("mail-UnsupportedOperationException.eml","message/rfc822", "message/rfc822");
+// t("mail-xml-attachment.eml", "message/rfc822", "message/rfc822");
+// t("mail.msg", "application/vnd.ms-outlook","application/vnd.ms-outlook"); // better
+// t("mbox-aperture-dev", "application/mbox", "application/mbox");
+// t("mbox-aperture-inc1", "application/mbox", "application/mbox");
+// t("mbox-aperture-inc2", "application/mbox", "application/mbox");
+// t("mbox-aperture-inc3", "application/mbox", "application/mbox");
+// t("mbox-aperture-inc4", "application/mbox", "application/mbox");
+// t("mbox-noblanklinebetweenmails.mbox", "application/mbox", "application/mbox");
+// t("mbox-testfolder", "application/mbox", "application/mbox");
+// t("mhtml-firefox.mht", "message/rfc822", "message/rfc822");
+// t("mhtml-internet-explorer.mht", "message/rfc822", "message/rfc822");
+//
+// t("microsoft-excel-2000.xls", "application/vnd.ms-excel",
+// "application/vnd.ms-excel"); // better
+// t("microsoft-excel-2007beta2.xlam", "application/vnd.ms-excel.addin.macroenabled.12",
+// "application/vnd.ms-excel.addin.macroenabled.12"); // better
+// t("microsoft-excel-2007beta2.xlsb", "application/vnd.ms-excel.sheet.binary.macroenabled.12",
+// "application/vnd.ms-excel.sheet.binary.macroenabled.12"); // better
+// t("microsoft-excel-2007beta2.xlsm", "application/vnd.ms-excel.sheet.macroenabled.12",
+// "application/vnd.ms-excel.sheet.macroenabled.12"); // better
+// t("microsoft-excel-2007beta2.xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+// "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); // better
+// t("microsoft-excel-2007beta2.xltm", "application/vnd.ms-excel.template.macroenabled.12",
+// "application/vnd.ms-excel.template.macroenabled.12"); // better
+// t("microsoft-excel-2007beta2.xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template",
+// "application/vnd.openxmlformats-officedocument.spreadsheetml.template"); // better
+// t("microsoft-excel-2010beta.xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+// "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); // better
+//
+// t("microsoft-powerpoint-2000.ppt", "application/vnd.ms-powerpoint",
+// "application/vnd.ms-powerpoint"); // better
+// t("microsoft-powerpoint-2007beta2.potm", "application/vnd.ms-powerpoint.template.macroenabled.12",
+// "application/vnd.ms-powerpoint.template.macroenabled.12"); // better
+// t("microsoft-powerpoint-2007beta2.potx", "application/vnd.openxmlformats-officedocument.presentationml.template",
+// "application/vnd.openxmlformats-officedocument.presentationml.template"); // better
+// t("microsoft-powerpoint-2007beta2.ppsm", "application/vnd.ms-powerpoint.slideshow.macroenabled.12",
+// "application/vnd.ms-powerpoint.slideshow.macroenabled.12"); // better
+// t("microsoft-powerpoint-2007beta2.ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
+// "application/vnd.openxmlformats-officedocument.presentationml.slideshow"); // better
+// t("microsoft-powerpoint-2007beta2.pptm", "application/vnd.ms-powerpoint.presentation.macroenabled.12",
+// "application/vnd.ms-powerpoint.presentation.macroenabled.12"); // better
+// t("microsoft-powerpoint-2007beta2.pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+// "application/vnd.openxmlformats-officedocument.presentationml.presentation"); // better
+// t("microsoft-powerpoint-2010beta.pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+// "application/vnd.openxmlformats-officedocument.presentationml.presentation"); // better
+// t("microsoft-powerpoint-invalidunicode.ppt","application/vnd.ms-powerpoint",
+// "application/vnd.ms-powerpoint"); // better
+//
+// t("microsoft-publisher-2003.pub","application/x-mspublisher","application/x-mspublisher"); // wrong
+// t("microsoft-visio.vsd","application/vnd.visio","application/vnd.visio"); // better
+//
+// t("microsoft-word-2000-with-wrong-file-extension.pdf","application/msword",
+// "application/msword"); // better
+// t("microsoft-word-2000.doc", "application/msword",
+// "application/msword"); // better
+// t("microsoft-word-2007beta2.docm", "application/vnd.ms-word.document.macroenabled.12",
+// "application/vnd.ms-word.document.macroenabled.12"); // better
+// t("microsoft-word-2007beta2.docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+// "application/vnd.openxmlformats-officedocument.wordprocessingml.document"); // better
+// t("microsoft-word-2007beta2.dotm", "application/x-tika-ooxml",
+// "application/vnd.ms-word.template.macroenabled.12"); // better
+// t("microsoft-word-2007beta2.dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template",
+// "application/vnd.openxmlformats-officedocument.wordprocessingml.template"); // better
+// t("microsoft-word-2010beta.docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+// "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+// t("microsoft-word-history-blair.doc", "application/msword",
+// "application/msword");
+// t("microsoft-word-illegal-unicode-characters.doc", "application/msword",
+// ...
[truncated message content] |
|
From: <my...@us...> - 2011-11-07 16:37:21
|
Revision: 2571
http://aperture.svn.sourceforge.net/aperture/?rev=2571&view=rev
Author: mylka
Date: 2011-11-07 16:37:14 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
added a blackberry-specific Magic number to the list of magics for the message/rfc822 media type
Modified Paths:
--------------
aperture/trunk/core/src/main/resources/org/semanticdesktop/aperture/tika/diff-mimetypes.xml
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java
Added Paths:
-----------
aperture/trunk/core/src/test/resources/org/semanticdesktop/aperture/docs/mail-threaded-blackberryheader.eml
Modified: aperture/trunk/core/src/main/resources/org/semanticdesktop/aperture/tika/diff-mimetypes.xml
===================================================================
--- aperture/trunk/core/src/main/resources/org/semanticdesktop/aperture/tika/diff-mimetypes.xml 2011-11-03 15:37:28 UTC (rev 2570)
+++ aperture/trunk/core/src/main/resources/org/semanticdesktop/aperture/tika/diff-mimetypes.xml 2011-11-07 16:37:14 UTC (rev 2571)
@@ -536,6 +536,9 @@
<!-- the magic-based identification will detect text/plain, the name-based will detect message/rfc822, but -->
<!-- the identifier only choses name-based over magic-based type if the former is a specialization of the latter -->
<sub-class-of type="text/plain" />
+ <magic priority="50">
+ <match value="X-rim-org-msg-ref-id:" type="string" offset="0"/>
+ </magic>
</mime-type>
<mime-type type="message/x-emlx">
<magic priority="50">
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java 2011-11-03 15:37:28 UTC (rev 2570)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifierTest.java 2011-11-07 16:37:14 UTC (rev 2571)
@@ -87,6 +87,7 @@
t("mail-multipart-test.eml.tar.gz", "application/x-gzip", "application/x-gzip");
t("mail-plaintext-attachment.eml", "message/rfc822", "message/rfc822");
t("mail-threaded.eml", "application/mbox", "application/mbox");
+ t("mail-threaded-blackberryheader.eml", "message/rfc822", "message/rfc822");
t("mail-thunderbird-1.5-unspecifiedcharset.eml","message/rfc822", "message/rfc822");
t("mail-thunderbird-1.5.eml", "message/rfc822", "message/rfc822");
t("mail-UnsupportedOperationException.eml","message/rfc822", "message/rfc822");
Added: aperture/trunk/core/src/test/resources/org/semanticdesktop/aperture/docs/mail-threaded-blackberryheader.eml
===================================================================
--- aperture/trunk/core/src/test/resources/org/semanticdesktop/aperture/docs/mail-threaded-blackberryheader.eml (rev 0)
+++ aperture/trunk/core/src/test/resources/org/semanticdesktop/aperture/docs/mail-threaded-blackberryheader.eml 2011-11-07 16:37:14 UTC (rev 2571)
@@ -0,0 +1,342 @@
+X-rim-org-msg-ref-id: 3451234198761923
+X-Account-Key: account3
+X-UIDL: 0000ed56034ba735
+X-Mozilla-Status: 0011
+X-Mozilla-Status2: 10000000
+Received: from lists-outbound.sourceforge.net ([66.35.250.225]:54678 "EHLO
+ lists-outbound.sourceforge.net") by ps10.test.onet.pl with ESMTP
+ id <S100827472AbWJIPKv>; Mon, 9 Oct 2006 17:10:51 +0200
+Received: from sc8-sf-list2-new.sourceforge.net (unknown [10.3.1.94])
+ by sc8-sf-spam2.sourceforge.net (Postfix) with ESMTP
+ id 67CA616074; Mon, 9 Oct 2006 08:10:49 -0700 (PDT)
+Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92]
+ helo=mail.sourceforge.net)
+ by sc8-sf-list2-new.sourceforge.net with esmtp (Exim 4.43)
+ id 1GWwmE-000847-Fb for ape...@li...;
+ Mon, 09 Oct 2006 08:10:46 -0700
+Received: from mailgate1.uni-kl.de ([131.246.120.5])
+ by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256)
+ (Exim 4.44) id 1GWwmE-0003Jz-6p
+ for ape...@li...;
+ Mon, 09 Oct 2006 08:10:47 -0700
+Received: from dfki-2203.dfki.uni-kl.de (pc-210.dfki.uni-kl.de
+ [131.246.241.70])
+ by mailgate1.uni-kl.de (8.13.4/8.13.4/Debian-3sarge3) with ESMTP id
+ k99FARWR012281; Mon, 9 Oct 2006 17:10:27 +0200
+Received: from serv-3100.kl.dfki.de (serv-3100.kl.dfki.de [192.168.31.180])
+ by dfki-2203.dfki.uni-kl.de (8.11.7p1+Sun/8.11.4) with ESMTP id
+ k99FARv21299; Mon, 9 Oct 2006 17:10:27 +0200 (MEST)
+Received: from [192.168.31.36] (port-3126.kl.dfki.de [192.168.31.36])
+ by serv-3100.kl.dfki.de (8.13.7+Sun/8.13.7) with ESMTP id
+ k99FAQwf021725; Mon, 9 Oct 2006 17:10:26 +0200 (CEST)
+Message-ID: <452...@df...>
+Date: Mon, 09 Oct 2006 17:09:58 +0200
+From: Leo Sauermann <leo...@df...>
+Organization: DFKI GmbH
+User-Agent: Thunderbird 1.5.0.7 (Windows/20060909)
+MIME-Version: 1.0
+To: Christiaan Fluit <chr...@ad...>
+References: <452...@df...>
+ <452...@ad...> <452...@df...>
+ <452...@ad...>
+In-Reply-To: <452...@ad...>
+X-Spam-Score: 0.1 (/)
+X-Spam-Report: Spam Filtering performed by sourceforge.net.
+ See http://spamassassin.org/tag/ for more details.
+ Report problems to
+ http://sf.net/tracker/?func=add&group_id=1&atid=200001
+ 0.1 HTML_30_40 BODY: Message is 30% to 40% HTML
+ 0.0 HTML_MESSAGE BODY: HTML included in message
+Cc: Aperture Developers <ape...@li...>
+Subject: Re: [Aperture-devel] New Aperture Developer
+X-BeenThere: ape...@li...
+X-Mailman-Version: 2.1.8
+Precedence: list
+List-Id: <aperture-devel.lists.sourceforge.net>
+List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/aperture-devel>,
+ <mailto:ape...@li...?subject=unsubscribe>
+List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum=aperture-devel>
+List-Post: <mailto:ape...@li...>
+List-Help: <mailto:ape...@li...?subject=help>
+List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/aperture-devel>,
+ <mailto:ape...@li...?subject=subscribe>
+Content-Type: multipart/mixed; boundary="===============2120612111=="
+Sender: ape...@li...
+Errors-To: ape...@li...
+X-OnetAntySpam: NIE, to nie jest SPAM
+X-OrigFrom: ape...@li...
+X-ZA0: unknown (-1,0)
+Status:
+
+This is a multi-part message in MIME format.
+--===============2120612111==
+Content-Type: multipart/alternative;
+ boundary="------------040000070900080702060605"
+
+This is a multi-part message in MIME format.
+--------------040000070900080702060605
+Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+Content-Transfer-Encoding: 7bit
+
+Es begab sich aber da Christiaan Fluit zur rechten Zeit 09.10.2006 17:05
+folgendes schrieb:
+> Leo Sauermann wrote:
+>
+>> I would go for DC and other popular vocabs as well.
+>>
+>> note we have a wikipage to discuss these things here:
+>> https://gnowsis.opendfki.de/wiki/ApertureDiscussion
+>>
+>> if you have any ideas about DC, add them here:
+>> https://gnowsis.opendfki.de/wiki/ApertureDiscussion#Vocabulary:useDCinsteadofdata
+>>
+>
+> I have made some notes during the last weeks, I'll add them here soon.
+>
+>
+>> I would keep the RDFContainer. Its a good thing. I would only build it
+>> on top of RDF2GO, so that it can be used on both jena and sesame.
+>> https://gnowsis.opendfki.de/wiki/ApertureDiscussion#RDFContainerbasedonRDF2GO
+>>
+>
+> I see. I'm still considering this, not sure whether it's a good approach:
+>
+> pros:
+>
+> - bindings for various RDF stores that we get for free
+>
+> cons:
+>
+> - is RDF2GO still using java.net.URIs? That would mean a lot of
+> conversions that are potentially not necessary, e.g. when using a Sesame
+> Repository: org.openrdf.model.URIs get translated to java.net.URIs and
+> back to org.openrdf.model.URIs.
+>
+we are contiously ranting about this to Max and finally he has changed
+his mind... I think its ok in the latest version
+
+
+> - RDFContainer lacks full RDF graph access. A simple getStatements
+> method with a subject parameter would solve this though. I've also read
+> comments by Gunnar about having to cast RDFContainer to
+> SesameRDFContainer in code he wrote, I guess he had the same problem?
+>
+>
+and exactly that would be solved by RDF2GO, where you would have a
+proper model with all methods you need. (including querying, whatever)
+
+
+>>> Once we have completed this move, we might also look at the AccessData
+>>> API.
+>>> [snip]
+>>>
+>> hm, I would think that using an rdfgraph here is overkill.
+>> I always thought we can implement the AccessData interface on top of the
+>> store you are actually crawling to.
+>>
+>
+> That's what I did with RepositoryAccessData. It wraps a Repository,
+> which *can* be the same as used by the CrawlerHandler.
+>
+> I'm already using this code in AutoFocus, which has dramatically
+> improved the memory requirements of WebCrawler. This crawler used to
+> keep the entire hypertext graph in main memory. Both the AccessData and
+> the CrawlerHandler use the same Repository, using contexts to keep
+> information separate (you really want to enforce that AccessData only
+> reads and writes its own data).
+>
+> However, the AccessData API limits the data that it can hold to simple
+> key-value pairs, with the exception of the notion of "referred IDs",
+> which are used for indicating links, nested objects, etc. Whenever you
+> have some other graph-like data, you cannot store it properly in the
+> AccessData, unless you're willing to encode multiple values in a single
+> string. Also, the value is often a primitive value but can also be
+> another URI (e.g. a redirectsTo property between two URLs). Right now
+> these URIs are stored as literals by RepositoryAccessData.
+>
+>
+> Regards,
+>
+> Chris
+> --
+>
+> -------------------------------------------------------------------------
+> Take Surveys. Earn Cash. Influence the Future of IT
+> Join SourceForge.net's Techsay panel and you'll get the chance to share your
+> opinions on IT & business topics through brief surveys -- and earn cash
+> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
+> _______________________________________________
+> Aperture-devel mailing list
+> Ape...@li...
+> https://lists.sourceforge.net/lists/listinfo/aperture-devel
+>
+
+
+--
+____________________________________________________
+DI Leo Sauermann http://www.dfki.de/~sauermann
+DFKI GmbH
+P.O. Box 2080 Fon: +49 631 205-3503
+67608 Kaiserslautern Fax: +49 631 205-3472
+Germany Mail: leo...@df...
+____________________________________________________
+
+
+--------------040000070900080702060605
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
+</head>
+<body bgcolor="#ffffff" text="#000000">
+Es begab sich aber da Christiaan Fluit zur rechten Zeit 09.10.2006
+17:05 folgendes schrieb:
+<blockquote cite="mid...@ad..." type="cite">
+ <pre wrap="">Leo Sauermann wrote:
+ </pre>
+ <blockquote type="cite">
+ <pre wrap="">I would go for DC and other popular vocabs as well.
+
+note we have a wikipage to discuss these things here:
+<a class="moz-txt-link-freetext" href="https://gnowsis.opendfki.de/wiki/ApertureDiscussion">https://gnowsis.opendfki.de/wiki/ApertureDiscussion</a>
+
+if you have any ideas about DC, add them here:
+<a class="moz-txt-link-freetext" href="https://gnowsis.opendfki.de/wiki/ApertureDiscussion#Vocabulary:useDCinsteadofdata">https://gnowsis.opendfki.de/wiki/ApertureDiscussion#Vocabulary:useDCinsteadofdata</a>
+ </pre>
+ </blockquote>
+ <pre wrap=""><!---->
+I have made some notes during the last weeks, I'll add them here soon.
+
+ </pre>
+ <blockquote type="cite">
+ <pre wrap="">I would keep the RDFContainer. Its a good thing. I would only build it
+on top of RDF2GO, so that it can be used on both jena and sesame.
+<a class="moz-txt-link-freetext" href="https://gnowsis.opendfki.de/wiki/ApertureDiscussion#RDFContainerbasedonRDF2GO">https://gnowsis.opendfki.de/wiki/ApertureDiscussion#RDFContainerbasedonRDF2GO</a>
+ </pre>
+ </blockquote>
+ <pre wrap=""><!---->
+I see. I'm still considering this, not sure whether it's a good approach:
+
+pros:
+
+- bindings for various RDF stores that we get for free
+
+cons:
+
+- is RDF2GO still using java.net.URIs? That would mean a lot of
+conversions that are potentially not necessary, e.g. when using a Sesame
+Repository: org.openrdf.model.URIs get translated to java.net.URIs and
+back to org.openrdf.model.URIs.
+ </pre>
+</blockquote>
+we are contiously ranting about this to Max and finally he has changed
+his mind... I think its ok in the latest version<br>
+<br>
+<br>
+<blockquote cite="mid...@ad..." type="cite">
+ <pre wrap="">
+- RDFContainer lacks full RDF graph access. A simple getStatements
+method with a subject parameter would solve this though. I've also read
+comments by Gunnar about having to cast RDFContainer to
+SesameRDFContainer in code he wrote, I guess he had the same problem?
+
+ </pre>
+</blockquote>
+and exactly that would be solved by RDF2GO, where you would have a
+proper model with all methods you need. (including querying, whatever)<br>
+<br>
+<br>
+<blockquote cite="mid...@ad..." type="cite">
+ <pre wrap=""></pre>
+ <blockquote type="cite">
+ <blockquote type="cite">
+ <pre wrap="">Once we have completed this move, we might also look at the AccessData
+API.
+[snip]
+ </pre>
+ </blockquote>
+ <pre wrap="">hm, I would think that using an rdfgraph here is overkill.
+I always thought we can implement the AccessData interface on top of the
+store you are actually crawling to.
+ </pre>
+ </blockquote>
+ <pre wrap=""><!---->
+That's what I did with RepositoryAccessData. It wraps a Repository,
+which *can* be the same as used by the CrawlerHandler.
+
+I'm already using this code in AutoFocus, which has dramatically
+improved the memory requirements of WebCrawler. This crawler used to
+keep the entire hypertext graph in main memory. Both the AccessData and
+the CrawlerHandler use the same Repository, using contexts to keep
+information separate (you really want to enforce that AccessData only
+reads and writes its own data).
+
+However, the AccessData API limits the data that it can hold to simple
+key-value pairs, with the exception of the notion of "referred IDs",
+which are used for indicating links, nested objects, etc. Whenever you
+have some other graph-like data, you cannot store it properly in the
+AccessData, unless you're willing to encode multiple values in a single
+string. Also, the value is often a primitive value but can also be
+another URI (e.g. a redirectsTo property between two URLs). Right now
+these URIs are stored as literals by RepositoryAccessData.
+
+
+Regards,
+
+Chris
+--
+
+-------------------------------------------------------------------------
+Take Surveys. Earn Cash. Influence the Future of IT
+Join SourceForge.net's Techsay panel and you'll get the chance to share your
+opinions on IT & business topics through brief surveys -- and earn cash
+<a class="moz-txt-link-freetext" href="http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV">http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV</a>
+_______________________________________________
+Aperture-devel mailing list
+<a class="moz-txt-link-abbreviated" href="mailto:Ape...@li...">Ape...@li...</a>
+<a class="moz-txt-link-freetext" href="https://lists.sourceforge.net/lists/listinfo/aperture-devel">https://lists.sourceforge.net/lists/listinfo/aperture-devel</a>
+ </pre>
+</blockquote>
+<br>
+<br>
+<pre class="moz-signature" cols="72">--
+____________________________________________________
+DI Leo Sauermann <a class="moz-txt-link-freetext" href="http://www.dfki.de/~sauermann">http://www.dfki.de/~sauermann</a>
+DFKI GmbH
+P.O. Box 2080 Fon: +49 631 205-3503
+67608 Kaiserslautern Fax: +49 631 205-3472
+Germany Mail: <a class="moz-txt-link-abbreviated" href="mailto:leo...@df...">leo...@df...</a>
+____________________________________________________
+</pre>
+</body>
+</html>
+
+--------------040000070900080702060605--
+
+
+--===============2120612111==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+
+-------------------------------------------------------------------------
+Take Surveys. Earn Cash. Influence the Future of IT
+Join SourceForge.net's Techsay panel and you'll get the chance to share your
+opinions on IT & business topics through brief surveys -- and earn cash
+http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
+--===============2120612111==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+
+_______________________________________________
+Aperture-devel mailing list
+Ap...@li...
+https://lists.sourceforge.net/lists/listinfo/aperture-devel
+
+--===============2120612111==--
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-11-03 15:37:34
|
Revision: 2570
http://aperture.svn.sourceforge.net/aperture/?rev=2570&view=rev
Author: mylka
Date: 2011-11-03 15:37:28 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
updated the x2r dependency to 0.0.3 and the saxon dependency to 9.1.0.8, thus the aperture build becomes independent from the fivo maven repository (for the time being)
Modified Paths:
--------------
aperture/trunk/core/pom.xml
Modified: aperture/trunk/core/pom.xml
===================================================================
--- aperture/trunk/core/pom.xml 2011-10-21 13:56:09 UTC (rev 2569)
+++ aperture/trunk/core/pom.xml 2011-11-03 15:37:28 UTC (rev 2570)
@@ -537,7 +537,7 @@
<dependency>
<groupId>pl.edu.agh.x2r</groupId>
<artifactId>x2r-core</artifactId>
- <version>0.0.3-SNAPSHOT</version>
+ <version>0.0.3</version>
<exclusions>
<exclusion>
<artifactId>jldap</artifactId>
@@ -567,8 +567,37 @@
<groupId>sedna</groupId>
<artifactId>sxqj</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-xqj</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-dom</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>net.sourceforge.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>9.1.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <classifier>xqj</classifier>
+ <version>9.1.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <classifier>dom</classifier>
+ <version>9.1.0.8</version>
+ </dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-10-21 13:56:18
|
Revision: 2569
http://aperture.svn.sourceforge.net/aperture/?rev=2569&view=rev
Author: mylka
Date: 2011-10-21 13:56:09 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
made the tika mime type identifier close its temp files
Modified Paths:
--------------
aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifier.java
Modified: aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifier.java
===================================================================
--- aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifier.java 2011-10-12 13:09:52 UTC (rev 2568)
+++ aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifier.java 2011-10-21 13:56:09 UTC (rev 2569)
@@ -108,16 +108,26 @@
Metadata metadata = new Metadata();
String name = getFileName(fileName, uri);
metadata.add(Metadata.RESOURCE_NAME_KEY, name);
+ InputStream stream = (firstBytes == null ? null : TikaInputStream.get(firstBytes));
try {
+
MediaType type = detector.detect(
- (firstBytes == null ? null : TikaInputStream.get(firstBytes)),
+ stream,
metadata);
if (type != null) {
return type.toString();
}
} catch (IOException e) {
logger.warn("Couldn't determine the mime type",e);
- }
+ } finally {
+ if (stream != null) {
+ try {
+ stream.close();
+ } catch (IOException ioe) {
+ logger.warn("Can't close the stream",ioe);
+ }
+ }
+ }
return null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-10-12 13:10:03
|
Revision: 2568
http://aperture.svn.sourceforge.net/aperture/?rev=2568&view=rev
Author: mylka
Date: 2011-10-12 13:09:52 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
added some safeguards against missing X2R on the classpath
Modified Paths:
--------------
aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifier.java
Modified: aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifier.java
===================================================================
--- aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifier.java 2011-10-11 09:55:16 UTC (rev 2567)
+++ aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/tika/TikaMimeTypeIdentifier.java 2011-10-12 13:09:52 UTC (rev 2568)
@@ -88,12 +88,16 @@
*/
this.minLength = 512 * 1024;
this.detector = new ApertureDetector(mimeTypes);
-
- addXmlSubCrawlerDefinitions();
} catch (Exception e) {
logger.error("Couldn't initialize tika MimeTypes",e);
throw new RuntimeException(e); // this will not happen
}
+
+ try {
+ addXmlSubCrawlerDefinitions();
+ } catch (Exception e) {
+ logger.debug("Couldn't initialize tika XML subcrawler definitions",e);
+ }
}
public int getMinArrayLength() {
@@ -251,13 +255,21 @@
}
private void addXmlSubCrawlerDefinitions() {
+
+ try {
+ Class.forName("pl.edu.agh.x2r.xml.XML2R");
+ } catch (ClassNotFoundException cnfr) {
+ logger.debug("X2R not found on the classpath, not registering XML types");
+ return;
+ }
+
try {
InputStream stream = ResourceUtil.getInputStream(DEFAULT_SUBCRAWLER_FILE, DefaultSubCrawlerRegistry.class);
BufferedInputStream buffer = new BufferedInputStream(stream);
parse(buffer);
buffer.close();
}
- catch (IOException e) {
+ catch (Exception e) {
throw new RuntimeException("unable to parse " + DEFAULT_SUBCRAWLER_FILE, e);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-10-11 09:55:29
|
Revision: 2567
http://aperture.svn.sourceforge.net/aperture/?rev=2567&view=rev
Author: mylka
Date: 2011-10-11 09:55:16 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
When you register an XML media type, which had already been present in the subcrawler registry, the "old" subcrawler factory is removed.
Modified Paths:
--------------
aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtil.java
aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtilTest.java
Modified: aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtil.java
===================================================================
--- aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtil.java 2011-09-30 12:47:07 UTC (rev 2566)
+++ aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtil.java 2011-10-11 09:55:16 UTC (rev 2567)
@@ -96,6 +96,10 @@
throw new X2RSubCrawlerUtilException("mapping cannot be null");
}
+ // remove any previously registered factories
+ for (Object o : registry.get(mimeTypeString)) {
+ registry.remove((SubCrawlerFactory)o);
+ }
registry.add(new X2RSubCrawlerFactory(mimeTypeString, mapping));
try {
@@ -137,6 +141,10 @@
String rootElementNameSpace = findPropertyValue(model, mappingResource, AX.ROOTELEMENTNS);
if (mimeTypeString != null && registry != null) {
+ // remove any previously registered factories
+ for (Object o : registry.get(mimeTypeString)) {
+ registry.remove((SubCrawlerFactory)o);
+ }
registry.add(new X2RSubCrawlerFactory(mimeTypeString, singleMappingString));
}
Modified: aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtilTest.java
===================================================================
--- aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtilTest.java 2011-09-30 12:47:07 UTC (rev 2566)
+++ aperture/trunk/core/src/test/java/org/semanticdesktop/aperture/x2r/X2RSubCrawlerUtilTest.java 2011-10-11 09:55:16 UTC (rev 2567)
@@ -12,6 +12,7 @@
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
+import java.util.Set;
import org.ontoware.aifbcommons.collection.ClosableIterator;
import org.ontoware.rdf2go.RDF2Go;
@@ -62,6 +63,13 @@
"mediawiki",
null);
+ // a little problem, right now there should be only
+ // ONE SubCrawlerFactory registered for the
+ // application/x-mediawiki-xml-export Media Type
+ Set set = reg.get("application/x-mediawiki-xml-export");
+ assertEquals(1,set.size());
+
+
performWikipediaTest(id, reg, exReg);
}
@@ -76,6 +84,9 @@
IOUtil.readString(getClass().getResourceAsStream(
"two-mappings.ttl")));
+ Set set = reg.get("application/x-mediawiki-xml-export");
+ assertEquals(1,set.size());
+
performWikipediaTest(id, reg, exReg);
assertFalse(reg.get("application/x-somethingelse").isEmpty());
@@ -99,6 +110,9 @@
"mediawiki",
null);
+ Set set = reg.get("application/x-mediawiki-xml-export");
+ assertEquals(1,set.size());
+
performWikipediaTest(id, reg, exReg);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-09-30 12:47:14
|
Revision: 2566
http://aperture.svn.sourceforge.net/aperture/?rev=2566&view=rev
Author: mylka
Date: 2011-09-30 12:47:07 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
a working version of the integration test with a published patched version of sesame
Modified Paths:
--------------
aperture-osgi/trunk/integration/pom.xml
aperture-osgi/trunk/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java
Modified: aperture-osgi/trunk/integration/pom.xml
===================================================================
--- aperture-osgi/trunk/integration/pom.xml 2011-09-30 12:20:34 UTC (rev 2565)
+++ aperture-osgi/trunk/integration/pom.xml 2011-09-30 12:47:07 UTC (rev 2566)
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-runtime-osgi</artifactId>
- <version>2.5.2-SNAPSHOT</version>
+ <version>2.5.2-r11285-osgipatch</version>
<exclusions>
<exclusion>
<groupId>org.openrdf.sesame</groupId>
Modified: aperture-osgi/trunk/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java
===================================================================
--- aperture-osgi/trunk/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java 2011-09-30 12:20:34 UTC (rev 2565)
+++ aperture-osgi/trunk/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java 2011-09-30 12:47:07 UTC (rev 2566)
@@ -52,7 +52,7 @@
public static String [] getOptionalBundles() {
return new String[] {
"org.slf4j, slf4j-jdk14, 1.6.2",
- "org.openrdf.sesame, sesame-runtime-osgi, 2.5.2-SNAPSHOT",
+ "org.openrdf.sesame, sesame-runtime-osgi, 2.5.2-r11285-osgipatch",
"org.semweb4j, rdf2go.impl.sesame23, 4.7.5-SNAPSHOT-RTGO-77"};
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-09-30 12:20:40
|
Revision: 2565
http://aperture.svn.sourceforge.net/aperture/?rev=2565&view=rev
Author: mylka
Date: 2011-09-30 12:20:34 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
updated the sesame version
Modified Paths:
--------------
aperture/trunk/core/pom.xml
aperture/trunk/optional/pom.xml
Modified: aperture/trunk/core/pom.xml
===================================================================
--- aperture/trunk/core/pom.xml 2011-09-30 12:02:49 UTC (rev 2564)
+++ aperture/trunk/core/pom.xml 2011-09-30 12:20:34 UTC (rev 2565)
@@ -19,7 +19,6 @@
<aperture.tools.rdf.version>1.0.0</aperture.tools.rdf.version>
<aperture.maven.plugins.version>1.1</aperture.maven.plugins.version>
<rdf2go.version>4.7.3</rdf2go.version>
- <openrdf.sesame.version>2.5.2-SNAPSHOT</openrdf.sesame.version>
<slf4j.version>1.6.2</slf4j.version>
<poi.version>3.8-1170185</poi.version>
<pdfbox.version>1.7.0-1170213-PATCH-1075</pdfbox.version>
@@ -574,7 +573,7 @@
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-runtime-osgi</artifactId>
- <version>${openrdf.sesame.version}</version>
+ <version>2.5.2-r11285-osgipatch</version>
<exclusions>
<exclusion>
<groupId>org.openrdf.sesame</groupId>
Modified: aperture/trunk/optional/pom.xml
===================================================================
--- aperture/trunk/optional/pom.xml 2011-09-30 12:02:49 UTC (rev 2564)
+++ aperture/trunk/optional/pom.xml 2011-09-30 12:20:34 UTC (rev 2565)
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-runtime-osgi</artifactId>
- <version>2.5.2-SNAPSHOT</version>
+ <version>2.5.2-r11285-osgipatch</version>
<exclusions>
<exclusion>
<groupId>org.openrdf.sesame</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-09-30 12:02:56
|
Revision: 2564
http://aperture.svn.sourceforge.net/aperture/?rev=2564&view=rev
Author: mylka
Date: 2011-09-30 12:02:49 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
made aperture-osgi work with the latest sesame snapshot (with an unpublished patch, will push the sesame-runtime-osgi to aperture repo)
Modified Paths:
--------------
aperture-osgi/trunk/integration/pom.xml
aperture-osgi/trunk/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java
Modified: aperture-osgi/trunk/integration/pom.xml
===================================================================
--- aperture-osgi/trunk/integration/pom.xml 2011-09-30 12:00:39 UTC (rev 2563)
+++ aperture-osgi/trunk/integration/pom.xml 2011-09-30 12:02:49 UTC (rev 2564)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -13,44 +14,127 @@
<name>Aperture integration test</name>
<description>A suite of in-container unit tests</description>
+ <properties>
+ <slf4j.version>1.6.2</slf4j.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.semanticdesktop.aperture</groupId>
<artifactId>aperture-runtime-onejar</artifactId>
- <scope>test</scope>
<version>${aperture.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.semanticdesktop.aperture</groupId>
+ <artifactId>aperture-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.semanticdesktop.aperture</groupId> -->
+<!-- <artifactId>aperture-runtime-optional</artifactId> -->
+<!-- <type>pom</type> -->
+<!-- <scope>import</scope> -->
+<!-- <version>${aperture.version}</version> -->
+<!-- </dependency> -->
+
+
<dependency>
+ <groupId>org.semweb4j</groupId>
+ <artifactId>rdf2go.api</artifactId>
+ <version>4.7.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-runtime-osgi</artifactId>
+ <version>2.5.2-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-http-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-http-server-spring</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.semweb4j</groupId>
+ <artifactId>rdf2go.impl.sesame23</artifactId>
+ <version>4.7.5-SNAPSHOT-RTGO-77</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-runtime-osgi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.semweb4j</groupId>
+ <artifactId>rdf2go.api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.semanticdesktop.aperture</groupId>
<artifactId>aperture-osgidocs</artifactId>
- <scope>test</scope>
<version>${aperture.version}</version>
- </dependency>
- <dependency>
- <groupId>org.semanticdesktop.aperture</groupId>
- <artifactId>aperture-runtime-optional</artifactId>
- <type>pom</type>
<scope>test</scope>
- <version>${aperture.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>org.springframework.osgi.test</artifactId>
- <version>1.1.3.RELEASE</version>
+ <version>1.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.aopalliance</groupId>
- <artifactId>com.springsource.org.aopalliance</artifactId>
- <version>1.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.objectweb.asm</groupId>
- <artifactId>com.springsource.org.objectweb.asm</artifactId>
- <version>2.2.0</version>
- </dependency>
+ <groupId>org.aopalliance</groupId>
+ <artifactId>com.springsource.org.aopalliance</artifactId>
+ <version>1.0.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
+ <groupId>org.objectweb.asm</groupId>
+ <artifactId>com.springsource.org.objectweb.asm</artifactId>
+ <version>2.2.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
<version>3.3.0-v20070530</version>
@@ -75,27 +159,31 @@
</plugin>
</plugins>
</build>
-
+
<repositories>
<repository>
- <releases><enabled>true</enabled></releases>
- <snapshots>
- <enabled>true</enabled>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
<updatePolicy>never</updatePolicy>
- </snapshots>
+ </snapshots>
<id>spring-external-artifacts</id>
<name>Springframework External Artifacts Repository</name>
<url>http://repository.springsource.com/maven/bundles/external/</url>
</repository>
- <repository>
- <releases><enabled>true</enabled></releases>
- <snapshots>
- <enabled>true</enabled>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
<updatePolicy>never</updatePolicy>
- </snapshots>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/release/</url>
+ </snapshots>
+ <id>com.springsource.repository.bundles.release</id>
+ <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+ <url>http://repository.springsource.com/maven/bundles/release/</url>
</repository>
</repositories>
</project>
Modified: aperture-osgi/trunk/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java
===================================================================
--- aperture-osgi/trunk/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java 2011-09-30 12:00:39 UTC (rev 2563)
+++ aperture-osgi/trunk/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java 2011-09-30 12:02:49 UTC (rev 2564)
@@ -1,7 +1,4 @@
package org.semanticdesktop.aperture.runtime;
-import java.util.jar.Manifest;
-
-import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.springframework.core.io.InputStreamResource;
@@ -48,14 +45,14 @@
private String[] getRequiredLibBundles() {
return new String[] {
"org.semweb4j, rdf2go.api, 4.7.3",
- "org.slf4j, jcl-over-slf4j, 1.5.10",
+ "org.slf4j, jcl-over-slf4j, 1.6.2",
"org.slf4j, slf4j-api, 1.6.2"};
}
public static String [] getOptionalBundles() {
return new String[] {
"org.slf4j, slf4j-jdk14, 1.6.2",
- "org.openrdf.sesame, sesame-runtime-osgi, 2.5.0",
+ "org.openrdf.sesame, sesame-runtime-osgi, 2.5.2-SNAPSHOT",
"org.semweb4j, rdf2go.impl.sesame23, 4.7.5-SNAPSHOT-RTGO-77"};
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-09-30 12:00:45
|
Revision: 2563
http://aperture.svn.sourceforge.net/aperture/?rev=2563&view=rev
Author: mylka
Date: 2011-09-30 12:00:39 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
bumped the slf4j version to 1.6.2
Modified Paths:
--------------
aperture/trunk/core/pom.xml
aperture/trunk/optional/pom.xml
Modified: aperture/trunk/core/pom.xml
===================================================================
--- aperture/trunk/core/pom.xml 2011-09-30 10:44:35 UTC (rev 2562)
+++ aperture/trunk/core/pom.xml 2011-09-30 12:00:39 UTC (rev 2563)
@@ -20,7 +20,7 @@
<aperture.maven.plugins.version>1.1</aperture.maven.plugins.version>
<rdf2go.version>4.7.3</rdf2go.version>
<openrdf.sesame.version>2.5.2-SNAPSHOT</openrdf.sesame.version>
- <slf4j.version>1.5.2</slf4j.version>
+ <slf4j.version>1.6.2</slf4j.version>
<poi.version>3.8-1170185</poi.version>
<pdfbox.version>1.7.0-1170213-PATCH-1075</pdfbox.version>
<vocabulary.input.dir>src/main/resources/org/semanticdesktop/aperture/vocabulary</vocabulary.input.dir>
Modified: aperture/trunk/optional/pom.xml
===================================================================
--- aperture/trunk/optional/pom.xml 2011-09-30 10:44:35 UTC (rev 2562)
+++ aperture/trunk/optional/pom.xml 2011-09-30 12:00:39 UTC (rev 2563)
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.5.2</version>
+ <version>1.6.2</version>
</dependency>
</dependencies>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <my...@us...> - 2011-09-30 10:44:41
|
Revision: 2562
http://aperture.svn.sourceforge.net/aperture/?rev=2562&view=rev
Author: mylka
Date: 2011-09-30 10:44:35 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
settled on slf4j 1.5.2 and sesame 2.5.2-SNAPSHOT
Modified Paths:
--------------
aperture/trunk/core/pom.xml
aperture/trunk/optional/pom.xml
Modified: aperture/trunk/core/pom.xml
===================================================================
--- aperture/trunk/core/pom.xml 2011-09-30 10:08:33 UTC (rev 2561)
+++ aperture/trunk/core/pom.xml 2011-09-30 10:44:35 UTC (rev 2562)
@@ -19,8 +19,8 @@
<aperture.tools.rdf.version>1.0.0</aperture.tools.rdf.version>
<aperture.maven.plugins.version>1.1</aperture.maven.plugins.version>
<rdf2go.version>4.7.3</rdf2go.version>
- <openrdf.sesame.version>2.5.0</openrdf.sesame.version>
- <slf4j.version>1.6.2</slf4j.version>
+ <openrdf.sesame.version>2.5.2-SNAPSHOT</openrdf.sesame.version>
+ <slf4j.version>1.5.2</slf4j.version>
<poi.version>3.8-1170185</poi.version>
<pdfbox.version>1.7.0-1170213-PATCH-1075</pdfbox.version>
<vocabulary.input.dir>src/main/resources/org/semanticdesktop/aperture/vocabulary</vocabulary.input.dir>
Modified: aperture/trunk/optional/pom.xml
===================================================================
--- aperture/trunk/optional/pom.xml 2011-09-30 10:08:33 UTC (rev 2561)
+++ aperture/trunk/optional/pom.xml 2011-09-30 10:44:35 UTC (rev 2562)
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-runtime-osgi</artifactId>
- <version>2.5.0</version>
+ <version>2.5.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.openrdf.sesame</groupId>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.6.2</version>
+ <version>1.5.2</version>
</dependency>
</dependencies>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|