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 2016/09/23 18:19:37 UTC
[1/2] tika git commit: * Re-enable fileUrl for tika-server
(TIKA-2081). Fix commandline options not to include '-'
Repository: tika
Updated Branches:
refs/heads/2.x ce1fc3720 -> 94789a963
* Re-enable fileUrl for tika-server (TIKA-2081). Fix commandline options not to include '-'
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/bd720892
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/bd720892
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/bd720892
Branch: refs/heads/2.x
Commit: bd72089292357fac90c62b96c9a6d9a64adf9140
Parents: ce1fc37
Author: tballison <ta...@mitre.org>
Authored: Fri Sep 23 14:18:41 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Fri Sep 23 14:18:41 2016 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/tika/server/TikaServerCli.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/bd720892/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java
----------------------------------------------------------------------
diff --git a/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java b/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java
index 6e8fce3..ef1bc6c 100644
--- a/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java
+++ b/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java
@@ -86,8 +86,8 @@ public class TikaServerCli {
options.addOption("l", "log", true, "request URI log level ('debug' or 'info')");
options.addOption("s", "includeStack", false, "whether or not to return a stack trace\nif there is an exception during 'parse'");
options.addOption("?", "help", false, "this help message");
- options.addOption("enable-unsecure-features", false, "this is required to enable fileUrl.");
- options.addOption("enable-fileUrl", false, "allows user to pass in fileUrl instead of InputStream.");
+ options.addOption("enableUnsecureFeatures", false, "this is required to enable fileUrl.");
+ options.addOption("enableFileUrl", false, "allows user to pass in fileUrl instead of InputStream.");
return options;
}
[2/2] tika git commit: Tika-2095 include Tika version in
tika-server's GREETING
Posted by ta...@apache.org.
Tika-2095 include Tika version in tika-server's GREETING
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/94789a96
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/94789a96
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/94789a96
Branch: refs/heads/2.x
Commit: 94789a9632ff80eae4d306f831209ade56461e38
Parents: bd72089
Author: tballison <ta...@mitre.org>
Authored: Fri Sep 23 14:19:30 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Fri Sep 23 14:19:30 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/tika/server/resource/TikaResource.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/94789a96/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
----------------------------------------------------------------------
diff --git a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
index bbff5bf..026e0de 100644
--- a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
+++ b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
@@ -54,6 +54,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.poi.extractor.ExtractorFactory;
+import org.apache.tika.Tika;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.detect.Detector;
import org.apache.tika.exception.EncryptedDocumentException;
@@ -80,7 +81,7 @@ import org.xml.sax.SAXException;
@Path("/tika")
public class TikaResource {
- public static final String GREETING = "This is Tika Server. Please PUT\n";
+ public static final String GREETING = "This is Tika Server ("+new Tika().toString()+"). Please PUT\n";
public static final String X_TIKA_OCR_HEADER_PREFIX = "X-Tika-OCR";
public static final String X_TIKA_PDF_HEADER_PREFIX = "X-Tika-PDF";