Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_es_ES.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_es_ES.properties?rev=1794806&r1=1794805&r2=1794806&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_es_ES.properties (original) +++ manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_es_ES.properties Thu May 11 10:36:57 2017 @@ -36,11 +36,4 @@ TikaExtractor.AddFieldMapping=Añadir TikaExtractor.Delete=Borrar TikaExtractor.DeleteFieldMapping=Eliminar asignación de campos TikaExtractor.NoFieldNameSpecified=Por favor, especifique un nombre de campo -TikaExtractor.IgnoreTikaExceptions=No haga caso de excepciones Tika: -TikaExtractor.TikaHostname=Tika hostname: -TikaExtractor.TikaPort=Tika port: -TikaExtractor.TikaRetry=Intervalo de reintento (ms): -TikaExtractor.TikaParsersSelected=Tika Parsers -TikaExtractor.TikaServerSelected=Tika Server -TikaExtractor.TikaTypeTabName=Tika type -TikaExtractor.TikaType=Tika type: +TikaExtractor.IgnoreTikaExceptions=No haga caso de excepciones Tika: \ No newline at end of file
Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties?rev=1794806&r1=1794805&r2=1794806&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties (original) +++ manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties Thu May 11 10:36:57 2017 @@ -13,13 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -TikaExtractor.TikaHostname=Tika hostname: -TikaExtractor.TikaPort=Tika port: -TikaExtractor.TikaRetry=Retry interval (ms): -TikaExtractor.TikaParsersSelected=Tika Parsers -TikaExtractor.TikaServerSelected=Tika Server -TikaExtractor.TikaTypeTabName=Tika type -TikaExtractor.TikaType=Tika type: TikaExtractor.FieldMappingTabName=ãã£ã¼ã«ããããã³ã° TikaExtractor.ExceptionsTabName=ä¾å¤ TikaExtractor.BoilerplateTabName=Boilerplate Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties?rev=1794806&r1=1794805&r2=1794806&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties (original) +++ manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties Thu May 11 10:36:57 2017 @@ -13,13 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -TikaExtractor.TikaHostname=Tika hostname: -TikaExtractor.TikaPort=Tika port: -TikaExtractor.TikaRetry=Retry interval (ms): -TikaExtractor.TikaParsersSelected=Tika Parsers -TikaExtractor.TikaServerSelected=Tika Server -TikaExtractor.TikaTypeTabName=Tika type -TikaExtractor.TikaType=Tika type: TikaExtractor.FieldMappingTabName=å段æ å° TikaExtractor.ExceptionsTabName=å¼å¸¸ TikaExtractor.BoilerplateTabName=Boilerplate Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/editSpecification.js URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/editSpecification.js?rev=1794806&r1=1794805&r2=1794806&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/editSpecification.js (original) +++ manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/editSpecification.js Thu May 11 10:36:57 2017 @@ -42,17 +42,5 @@ function s${SEQNUM}_deleteFieldMapping(i eval("editjob.s${SEQNUM}_fieldmapping_op_"+i+".value=\"Continue\""); } -function s${SEQNUM}_tikaTypeChanged(tikaServer) -{ - var elements = document.getElementsByClassName("hiddenParam"); - for(var i=0; i < elements.length; i++) { - if(tikaServer.value == 'false') { - elements[i].style.visibility = 'hidden'; - } else { - elements[i].style.visibility = 'visible'; - } - } -} - //--> </script> Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/viewSpecification.html URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/viewSpecification.html?rev=1794806&r1=1794805&r2=1794806&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/viewSpecification.html (original) +++ manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tika/viewSpecification.html Thu May 11 10:36:57 2017 @@ -16,102 +16,66 @@ --> <table class="displaytable"> - <tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaType'))</nobr></td> - #if($TIKASERVER == 'true') - <td class="value"><nobr>$ResourceBundle.getString('TikaExtractor.TikaServerSelected')</nobr></td> - #else - <td class="value"><nobr>$ResourceBundle.getString('TikaExtractor.TikaParsersSelected')</nobr></td> - #end - </tr> - #if($TIKASERVER == 'true') - <tr> - <td class="separator" colspan="2"><hr /></td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaHostname'))</nobr></td> - <td class="value"><nobr>$Encoder.bodyEscape($TIKAHOSTNAME)</nobr></td> - </tr> - <tr> - <td class="separator" colspan="2"><hr /></td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaPort'))</nobr></td> - <td class="value"><nobr>$Encoder.bodyEscape($TIKAPORT)</nobr></td> - </tr> - <tr> - <td class="separator" colspan="2"><hr /></td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaRetry'))</nobr></td> - <td class="value"><nobr>$Encoder.bodyEscape($TIKARETRY)</nobr></td> - </tr> - #end - <tr> - <td class="separator" colspan="2"><hr /></td> - </tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.FieldMappings'))</nobr></td> - <td class="boxcell"> - <table class="formtable"> - <tr class="formheaderrow"> - <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.MetadataFieldName'))</nobr></td> - <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.FinalFieldName'))</nobr></td> - </tr> - #set($fieldcounter = 0) #foreach($fieldmapping in $FIELDMAPPINGS) - #if(($fieldcounter % 2) == 0) - <tr class="evenformrow">#else - <tr class="oddformrow"> - #end - <td class="formcolumncell"><nobr>$Encoder.bodyEscape($fieldmapping.get('SOURCE'))</nobr> - </td> - <td class="formcolumncell"><nobr>$Encoder.bodyEscape($fieldmapping.get('TARGETDISPLAY'))</nobr> - </td> - </tr> - #set($fieldcounter = $fieldcounter + 1) #end #if($fieldcounter == 0) - <tr class="formrow"> - <td class="formmessage" colspan="2">$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.NoFieldMappingSpecified'))</td> - </tr> - #end - </table> - </td> - </tr> - <tr> - <td class="separator" colspan="2"><hr /></td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.KeepAllMetadata'))</nobr></td> - <td class="value"><nobr>$Encoder.bodyEscape($KEEPALLMETADATA)</nobr></td> - </tr> - <tr> - <td class="separator" colspan="2"><hr /></td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.LowerNames'))</nobr></td> - <td class="value"><nobr>$Encoder.bodyEscape($LOWERNAMES)</nobr></td> - </tr> - <tr> - <td class="separator" colspan="2"><hr /></td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.WriteLimit'))</nobr></td> - <td class="value"><nobr>$Encoder.bodyEscape($WRITELIMIT)</nobr></td> - </tr> - <tr> - <td class="separator" colspan="2"><hr /></td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.IgnoreTikaExceptions'))</nobr></td> - <td class="value"><nobr>$Encoder.bodyEscape($IGNORETIKAEXCEPTIONS)</nobr></td> - </tr> - <tr> - <td class="separator" colspan="2"><hr /></td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.BoilerplateExtractorColon'))</nobr></td> - <td class="value">#if ($BOILERPLATECLASSNAME == '') <nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.NoExtractionSelected'))</nobr> - #else <nobr>$Encoder.bodyEscape($BOILERPLATECLASSNAME)</nobr> #end - </td> - </tr> + <tr> + <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.FieldMappings'))</nobr></td> + <td class="boxcell"> + <table class="formtable"> + <tr class="formheaderrow"> + <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.MetadataFieldName'))</nobr></td> + <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.FinalFieldName'))</nobr></td> + </tr> +#set($fieldcounter = 0) +#foreach($fieldmapping in $FIELDMAPPINGS) + #if(($fieldcounter % 2) == 0) + <tr class="evenformrow"> + #else + <tr class="oddformrow"> + #end + <td class="formcolumncell"> + <nobr>$Encoder.bodyEscape($fieldmapping.get('SOURCE'))</nobr> + </td> + <td class="formcolumncell"> + <nobr>$Encoder.bodyEscape($fieldmapping.get('TARGETDISPLAY'))</nobr> + </td> + </tr> + #set($fieldcounter = $fieldcounter + 1) +#end +#if($fieldcounter == 0) + <tr class="formrow"><td class="formmessage" colspan="2">$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.NoFieldMappingSpecified'))</td></tr> +#end + </table> + </td> + </tr> + <tr><td class="separator" colspan="2"><hr/></td></tr> + <tr> + <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.KeepAllMetadata'))</nobr></td> + <td class="value"><nobr>$Encoder.bodyEscape($KEEPALLMETADATA)</nobr></td> + </tr> + <tr><td class="separator" colspan="2"><hr/></td></tr> + <tr> + <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.LowerNames'))</nobr></td> + <td class="value"><nobr>$Encoder.bodyEscape($LOWERNAMES)</nobr></td> + </tr> + <tr><td class="separator" colspan="2"><hr/></td></tr> + <tr> + <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.WriteLimit'))</nobr></td> + <td class="value"><nobr>$Encoder.bodyEscape($WRITELIMIT)</nobr></td> + </tr> + <tr><td class="separator" colspan="2"><hr/></td></tr> + <tr> + <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.IgnoreTikaExceptions'))</nobr></td> + <td class="value"><nobr>$Encoder.bodyEscape($IGNORETIKAEXCEPTIONS)</nobr></td> + </tr> + <tr><td class="separator" colspan="2"><hr/></td></tr> + <tr> + <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.BoilerplateExtractorColon'))</nobr></td> + <td class="value"> +#if ($BOILERPLATECLASSNAME == '') + <nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.NoExtractionSelected'))</nobr> +#else + <nobr>$Encoder.bodyEscape($BOILERPLATECLASSNAME)</nobr> +#end + </td> + </tr> </table> Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/build.xml?rev=1794806&r1=1794719&r2=1794806&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/build.xml (original) +++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/build.xml Thu May 11 10:36:57 2017 @@ -15,7 +15,7 @@ limitations under the License. --> -<project name="tika" default="all"> +<project name="tikaservice" default="all"> <property environment="env"/> <condition property="mcf-dist" value="${env.MCFDISTPATH}"> @@ -32,7 +32,7 @@ <target name="deliver-connector" depends="mcf-connector-build.deliver-connector"> <antcall target="general-add-transformation-connector"> - <param name="connector-label" value="Tika content extractor"/> + <param name="connector-label" value="Tika external content extractor"/> <param name="connector-class" value="org.apache.manifoldcf.agents.transformation.tika.TikaExtractor"/> </antcall> </target> Copied: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java (from r1794772, manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java) URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java?p2=manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java&p1=manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java&r1=1794772&r2=1794806&rev=1794806&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1425/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java (original) +++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java Thu May 11 10:36:57 2017 @@ -300,16 +300,14 @@ public class TikaExtractor extends org.a // times to Tika // one for the metadata and one for the content IOUtils.copy(document.getBinaryStream(), ds.getOutputStream()); - HttpPut httpPut; - HttpEntity entity; // Metadata - httpPut = new HttpPut(sp.metaURI); + final HttpPut httpPut = new HttpPut(sp.metaURI); if (!mime.isEmpty()) { httpPut.addHeader("Content-Type", mime); } httpPut.addHeader("Accept", "application/json"); - entity = new InputStreamEntity(ds.getInputStream()); + final HttpEntity entity = new InputStreamEntity(ds.getInputStream()); httpPut.setEntity(entity); while (retry < 3 && response == null) { try { Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/pom.xml?rev=1794806&r1=1794719&r2=1794806&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/pom.xml (original) +++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/pom.xml Thu May 11 10:36:57 2017 @@ -29,8 +29,8 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> - <artifactId>mcf-tika-connector</artifactId> - <name>ManifoldCF - Connectors - Tika Transformer</name> + <artifactId>mcf-tika-service-connector</artifactId> + <name>ManifoldCF - Connectors - Tika Service Transformer</name> <build> <defaultGoal>integration-test</defaultGoal>
