Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 840F818B0D for ; Wed, 27 Jan 2016 14:55:52 +0000 (UTC) Received: (qmail 61520 invoked by uid 500); 27 Jan 2016 14:55:52 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 61478 invoked by uid 500); 27 Jan 2016 14:55:52 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 61469 invoked by uid 99); 27 Jan 2016 14:55:52 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jan 2016 14:55:52 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 06584C2A1E for ; Wed, 27 Jan 2016 14:55:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id xatztDycrWNa for ; Wed, 27 Jan 2016 14:55:50 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id A4CB820D77 for ; Wed, 27 Jan 2016 14:55:50 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 09E43E0185 for ; Wed, 27 Jan 2016 14:55:50 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 0AA2F3A0873 for ; Wed, 27 Jan 2016 14:55:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1727072 - in /manifoldcf/branches/CONNECTORS-1270: ./ connectors/opennlp/connector/src/main/java/org/apache/manifoldcf/agents/transformation/opennlp/ connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/... Date: Wed, 27 Jan 2016 14:55:49 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160127145550.0AA2F3A0873@svn01-us-west.apache.org> Author: kwright Date: Wed Jan 27 14:55:49 2016 New Revision: 1727072 URL: http://svn.apache.org/viewvc?rev=1727072&view=rev Log: Add file-resources support generally. Added: manifoldcf/branches/CONNECTORS-1270/framework/example-file-resources/ manifoldcf/branches/CONNECTORS-1270/framework/example-file-resources/README.txt (with props) Modified: manifoldcf/branches/CONNECTORS-1270/build.xml manifoldcf/branches/CONNECTORS-1270/connectors/opennlp/connector/src/main/java/org/apache/manifoldcf/agents/transformation/opennlp/OpenNlpExtractor.java manifoldcf/branches/CONNECTORS-1270/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java manifoldcf/branches/CONNECTORS-1270/framework/build.xml manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-file-proprietary/properties.xml manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-file/properties.xml manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-zk-proprietary/properties.xml manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-zk/properties.xml manifoldcf/branches/CONNECTORS-1270/framework/example-singleprocess-proprietary/properties.xml manifoldcf/branches/CONNECTORS-1270/framework/example-singleprocess/properties.xml Modified: manifoldcf/branches/CONNECTORS-1270/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1270/build.xml?rev=1727072&r1=1727071&r2=1727072&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1270/build.xml (original) +++ manifoldcf/branches/CONNECTORS-1270/build.xml Wed Jan 27 14:55:49 2016 @@ -292,6 +292,10 @@ + + + + Modified: manifoldcf/branches/CONNECTORS-1270/connectors/opennlp/connector/src/main/java/org/apache/manifoldcf/agents/transformation/opennlp/OpenNlpExtractor.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1270/connectors/opennlp/connector/src/main/java/org/apache/manifoldcf/agents/transformation/opennlp/OpenNlpExtractor.java?rev=1727072&r1=1727071&r2=1727072&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1270/connectors/opennlp/connector/src/main/java/org/apache/manifoldcf/agents/transformation/opennlp/OpenNlpExtractor.java (original) +++ manifoldcf/branches/CONNECTORS-1270/connectors/opennlp/connector/src/main/java/org/apache/manifoldcf/agents/transformation/opennlp/OpenNlpExtractor.java Wed Jan 27 14:55:49 2016 @@ -53,6 +53,8 @@ public class OpenNlpExtractor extends Ba private static final String EDIT_SPECIFICATION_FIELDMAPPING_HTML = "editSpecification_FieldMapping.html"; private static final String VIEW_SPECIFICATION_HTML = "viewSpecification.html"; + protected static int maximumExtractionCharacters = 524288; + // Meta-data fields added by this connector private static final String PERSONS = "ner_people"; private static final String LOCATIONS = "ner_locations"; @@ -528,8 +530,6 @@ public class OpenNlpExtractor extends Ba throw new ManifoldCFException(e.getMessage(),e); } - protected static int maximumExtractionCharacters = 524288; - /** An instance of this class receives characters in 64K chunks, and needs to accumulate * extracted metadata that this transformer will pass down. */ Modified: manifoldcf/branches/CONNECTORS-1270/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1270/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java?rev=1727072&r1=1727071&r2=1727072&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1270/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java (original) +++ manifoldcf/branches/CONNECTORS-1270/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java Wed Jan 27 14:55:49 2016 @@ -93,6 +93,7 @@ public class TikaExtractor extends org.a *@param checkActivity is an object including the activities that can be performed by this method. *@return true if the mime type can be accepted by this connector. */ + @Override public boolean checkMimeTypeIndexable(VersionContext pipelineDescription, String mimeType, IOutputCheckActivity checkActivity) throws ManifoldCFException, ServiceInterruption { Modified: manifoldcf/branches/CONNECTORS-1270/framework/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1270/framework/build.xml?rev=1727072&r1=1727071&r2=1727072&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1270/framework/build.xml (original) +++ manifoldcf/branches/CONNECTORS-1270/framework/build.xml Wed Jan 27 14:55:49 2016 @@ -153,6 +153,15 @@ + + + + + + + + + @@ -1998,7 +2007,7 @@ - + Added: manifoldcf/branches/CONNECTORS-1270/framework/example-file-resources/README.txt URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1270/framework/example-file-resources/README.txt?rev=1727072&view=auto ============================================================================== --- manifoldcf/branches/CONNECTORS-1270/framework/example-file-resources/README.txt (added) +++ manifoldcf/branches/CONNECTORS-1270/framework/example-file-resources/README.txt Wed Jan 27 14:55:49 2016 @@ -0,0 +1,25 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +This directory is meant to contain file resources that your connectors may need. +It is referenced by the org.apache.manifoldcf.fileresources property in all of the +distributed examples. The kinds of resources that go here are common files, +such as OpenNLP model files. + +Read more about how to populate this directory on the "how-to-build-and-deploy.html" +documentation page. + + + Propchange: manifoldcf/branches/CONNECTORS-1270/framework/example-file-resources/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-file-proprietary/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-file-proprietary/properties.xml?rev=1727072&r1=1727071&r2=1727072&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-file-proprietary/properties.xml (original) +++ manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-file-proprietary/properties.xml Wed Jan 27 14:55:49 2016 @@ -38,6 +38,8 @@ + + Modified: manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-file/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-file/properties.xml?rev=1727072&r1=1727071&r2=1727072&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-file/properties.xml (original) +++ manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-file/properties.xml Wed Jan 27 14:55:49 2016 @@ -38,6 +38,8 @@ + + Modified: manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-zk-proprietary/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-zk-proprietary/properties.xml?rev=1727072&r1=1727071&r2=1727072&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-zk-proprietary/properties.xml (original) +++ manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-zk-proprietary/properties.xml Wed Jan 27 14:55:49 2016 @@ -33,6 +33,8 @@ + + Modified: manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-zk/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-zk/properties.xml?rev=1727072&r1=1727071&r2=1727072&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-zk/properties.xml (original) +++ manifoldcf/branches/CONNECTORS-1270/framework/example-multiprocess-zk/properties.xml Wed Jan 27 14:55:49 2016 @@ -33,6 +33,8 @@ + + Modified: manifoldcf/branches/CONNECTORS-1270/framework/example-singleprocess-proprietary/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1270/framework/example-singleprocess-proprietary/properties.xml?rev=1727072&r1=1727071&r2=1727072&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1270/framework/example-singleprocess-proprietary/properties.xml (original) +++ manifoldcf/branches/CONNECTORS-1270/framework/example-singleprocess-proprietary/properties.xml Wed Jan 27 14:55:49 2016 @@ -35,6 +35,8 @@ + + Modified: manifoldcf/branches/CONNECTORS-1270/framework/example-singleprocess/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1270/framework/example-singleprocess/properties.xml?rev=1727072&r1=1727071&r2=1727072&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1270/framework/example-singleprocess/properties.xml (original) +++ manifoldcf/branches/CONNECTORS-1270/framework/example-singleprocess/properties.xml Wed Jan 27 14:55:49 2016 @@ -35,6 +35,8 @@ + +