You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2020/02/12 14:14:23 UTC

[tika] branch branch_1x updated (6c62b22 -> 7de734e)

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a change to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git.


    from 6c62b22  TIKA-3010 Install and run Tika-Server as a Service (#305)
     new 5b88431  TIKA-3034 Mathematica files don't have a unique magic, but try to detect based on the file starting with a Mathematica-style comment as all we can do. Also add the newer Wolfram Language mimetype, which extends mathematica, with a unix  detection
     new 28aecab  TIKA-3023 Make the SGI Movie mime magic more specific to avoid false positives on text files starting with MOVI
     new 7de734e  introduce the Docker image, bump some versions (#310)

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/tika/mime/tika-mimetypes.xml        | 24 +++++++++++++++++++++-
 tika-server/README.md                              | 21 +++++++++++--------
 2 files changed, 35 insertions(+), 10 deletions(-)


[tika] 01/03: TIKA-3034 Mathematica files don't have a unique magic, but try to detect based on the file starting with a Mathematica-style comment as all we can do. Also add the newer Wolfram Language mimetype, which extends mathematica, with a unix detection

Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 5b88431a5135c9cf1ab00624a26d3f0fdec36a2b
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Tue Feb 4 10:31:31 2020 +0000

    TIKA-3034 Mathematica files don't have a unique magic, but try to detect based on the file starting with a Mathematica-style comment as all we can do. Also add the newer Wolfram Language mimetype, which extends mathematica, with a unix  detection
---
 .../resources/org/apache/tika/mime/tika-mimetypes.xml  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
index 36d01ec..503fbeb 100644
--- a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
+++ b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
@@ -381,11 +381,29 @@
   <mime-type type="application/marc">
     <glob pattern="*.mrc"/>
   </mime-type>
+
   <mime-type type="application/mathematica">
+    <_comment>Wolfram Mathematica</_comment>
     <glob pattern="*.ma"/>
     <glob pattern="*.nb"/>
     <glob pattern="*.mb"/>
+    <!-- Note - there is no Unique Magic for Mathematica files! -->
+    <!-- Check for a Mathematica-style opening comment as our best hope... -->
+    <magic priority="50">
+      <match value="(**" type="string" offset="0"/>
+      <match value="(* " type="string" offset="0"/>
+    </magic>
+    <sub-class-of type="text/plain"/>
   </mime-type>
+  <mime-type type="application/vnd.wolfram.wl">
+    <_comment>Wolfram Language</_comment>
+    <glob pattern="*.wl"/>
+    <magic priority="50">
+      <match value="#!/usr/bin/env wolframscript" type="string" offset="0"/>
+    </magic>
+    <sub-class-of type="application/mathematica"/>
+  </mime-type>
+
   <mime-type type="application/mathml+xml">
     <glob pattern="*.mathml"/>
   </mime-type>


[tika] 03/03: introduce the Docker image, bump some versions (#310)

Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 7de734e11a5197737ddc2c74043c11392a568ceb
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Tue Feb 11 09:45:25 2020 -0500

    introduce the Docker image, bump some versions (#310)
---
 tika-server/README.md | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/tika-server/README.md b/tika-server/README.md
index 75aef57..761eefc 100644
--- a/tika-server/README.md
+++ b/tika-server/README.md
@@ -1,6 +1,6 @@
-# Apache Tika JAX-RS Server
+# Apache Tika Server
 
-https://issues.apache.org/jira/browse/TIKA-593
+https://cwiki.apache.org/confluence/display/TIKA/TikaJAXRS
 
 Running
 -------
@@ -20,29 +20,32 @@ Assuming you have Docker installed, you can build you own local image using the:
 
 `mvn dockerfile:build`
 
-The image will be named apache/tika with the tag being the version being built.
-For example, building Apache Tika Server 1.17 will result in an image of `apache/tika-server:1.17`
+The image will be named `apache/tika` with the tag being the version being built.
+For example, building Apache Tika Server 1.24 will result in an image of `apache/tika-server:1.24`
 
-You can then run this image by executing the following, replacing `1.17` with your build version:
+You can then run this image by executing the following, replacing `1.24` with your build version:
 
-`docker run -d -p 9998:9998 apache/tika-server:1.17`
+`docker run -d -p 9998:9998 apache/tika-server:1.24`
 
 This will load Apache Tika Server and expose its interface on:
 
 `http://localhost:9998`
 
+You may also be interested in the https://github.com/apache/tika-docker project
+which provides prebuilt Docker images.
+
 Installing as a Service on Linux
 -----------------------
 To run as a service on Linux you need to run the `install_tika_service.sh` script.
 
-Assuming you have the binary distribution like `tika-server-2.0.0-SNAPSHOT-bin.tgz`,
+Assuming you have the binary distribution like `tika-server-1.24-bin.tgz`,
 then you can extract the install script via:
 
-`tar xzf tika-server-2.0.0-SNAPSHOT-bin.tgz tika-server-2.0.0-SNAPSHOT-bin/bin/install_tika_service.sh --strip-components=2`
+`tar xzf tika-server-1.24-bin.tgz tika-server-1.24-bin/bin/install_tika_service.sh --strip-components=2`
 
 and then run the installation process via:
 
-`./install_tika_service.sh  ./tika-server-2.0.0-SNAPSHOT-bin.tgz`
+`./install_tika_service.sh  ./tika-server-1.24-bin.tgz`
 
 
 Usage


[tika] 02/03: TIKA-3023 Make the SGI Movie mime magic more specific to avoid false positives on text files starting with MOVI

Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 28aecab3e8267747136bf6c4cf7377054330789b
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Thu Feb 6 11:42:30 2020 +0000

    TIKA-3023 Make the SGI Movie mime magic more specific to avoid false positives on text files starting with MOVI
---
 .../src/main/resources/org/apache/tika/mime/tika-mimetypes.xml      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
index 503fbeb..d37a66f 100644
--- a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
+++ b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
@@ -7217,7 +7217,11 @@
 
   <mime-type type="video/x-sgi-movie">
     <magic priority="50">
-      <match value="MOVI" type="string" offset="0"/>
+      <match value="MOVI\x00" type="string" offset="0"/>
+      <match value="MOVI\x01" type="string" offset="0"/>
+      <match value="MOVI\x02" type="string" offset="0"/>
+      <match value="MOVI\xfe" type="string" offset="0"/>
+      <match value="MOVI\xff" type="string" offset="0"/>
     </magic>
     <glob pattern="*.movie"/>
   </mime-type>