Re: svn commit: r1640535 - /tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java

[Tyler Palsulich <tp...@gmail.com>]

On Wed, Nov 19, 2014 at 7:44 AM, <dm...@apache.org> wrote:

> Author: dmeikle
> Date: Wed Nov 19 12:44:41 2014
> New Revision: 1640535
>
> URL: http://svn.apache.org/r1640535
> Log:
> TIKA-1477: Added new custom header to Tika resource override Tesseract OCR
> language
>
> Modified:
>
> tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java
>
> Modified:
> tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java
> URL:
> http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java?rev=1640535&r1=1640534&r2=1640535&view=diff
>
> ==============================================================================
> ---
> tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java
> (original)
> +++
> tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java
> Wed Nov 19 12:44:41 2014
> @@ -17,35 +17,6 @@
>
>  package org.apache.tika.server;
>
> -import java.io.IOException;
> -import java.io.InputStream;
> -import java.io.OutputStream;
> -import java.io.OutputStreamWriter;
> -import java.io.Writer;
> -import java.util.Locale;
> -import java.util.Map;
> -import java.util.Set;
> -
> -import javax.mail.internet.ContentDisposition;
> -import javax.mail.internet.ParseException;
> -import javax.ws.rs.Consumes;
> -import javax.ws.rs.GET;
> -import javax.ws.rs.PUT;
> -import javax.ws.rs.Path;
> -import javax.ws.rs.Produces;
> -import javax.ws.rs.WebApplicationException;
> -import javax.ws.rs.core.Context;
> -import javax.ws.rs.core.HttpHeaders;
> -import javax.ws.rs.core.MultivaluedMap;
> -import javax.ws.rs.core.Response;
> -import javax.ws.rs.core.StreamingOutput;
> -import javax.ws.rs.core.UriInfo;
> -import javax.xml.transform.OutputKeys;
> -import javax.xml.transform.TransformerConfigurationException;
> -import javax.xml.transform.sax.SAXTransformerFactory;
> -import javax.xml.transform.sax.TransformerHandler;
> -import javax.xml.transform.stream.StreamResult;
> -
>  import org.apache.commons.logging.Log;
>  import org.apache.commons.logging.LogFactory;
>  import org.apache.cxf.jaxrs.ext.multipart.Attachment;
> @@ -63,14 +34,44 @@ import org.apache.tika.parser.AutoDetect
>  import org.apache.tika.parser.ParseContext;
>  import org.apache.tika.parser.Parser;
>  import org.apache.tika.parser.html.HtmlParser;
> +import org.apache.tika.parser.ocr.TesseractOCRConfig;
>  import org.apache.tika.sax.BodyContentHandler;
>  import org.apache.tika.sax.ExpandedTitleContentHandler;
>  import org.xml.sax.ContentHandler;
>  import org.xml.sax.SAXException;
>
> +import javax.mail.internet.ContentDisposition;
> +import javax.mail.internet.ParseException;
> +import javax.ws.rs.Consumes;
> +import javax.ws.rs.GET;
> +import javax.ws.rs.PUT;
> +import javax.ws.rs.Path;
> +import javax.ws.rs.Produces;
> +import javax.ws.rs.WebApplicationException;
> +import javax.ws.rs.core.Context;
> +import javax.ws.rs.core.HttpHeaders;
> +import javax.ws.rs.core.MultivaluedMap;
> +import javax.ws.rs.core.Response;
> +import javax.ws.rs.core.StreamingOutput;
> +import javax.ws.rs.core.UriInfo;
> +import javax.xml.transform.OutputKeys;
> +import javax.xml.transform.TransformerConfigurationException;
> +import javax.xml.transform.sax.SAXTransformerFactory;
> +import javax.xml.transform.sax.TransformerHandler;
> +import javax.xml.transform.stream.StreamResult;
> +import java.io.IOException;
> +import java.io.InputStream;
> +import java.io.OutputStream;
> +import java.io.OutputStreamWriter;
> +import java.io.Writer;
> +import java.util.Locale;
> +import java.util.Map;
> +import java.util.Set;
> +
>


It looks like imports are being reordered here. I think we decided (can't
find an archive link right now) on java and javax imports before others.

Tyler

Re: svn commit: r1640535 - /tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource. java

[David Meikle <lo...@gmail.com>]

Hey Guys,

> On 19 Nov 2014, at 17:09, Tyler Palsulich <tp...@gmail.com> wrote:
> 
> Found it! http://markmail.org/message/42nc64tdyhvzaril <http://markmail.org/message/42nc64tdyhvzaril>
> 
> Looks like javax, java, then other. I'll update the site today.

Sorry a clean install here and I didn’t update the settings (nor notice).  Will set my config now and tidy up imports in recent commits.

Cheers,
Dave

Re: svn commit: r1640535 - /tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource. java

[Tyler Palsulich <tp...@gmail.com>]

Found it! http://markmail.org/message/42nc64tdyhvzaril

Looks like javax, java, then other. I'll update the site today.

Tyler

On Wed, Nov 19, 2014 at 10:54 AM, Nick Burch <ap...@gagravarr.org> wrote:

> On Wed, 19 Nov 2014, Tyler Palsulich wrote:
>
>> It looks like imports are being reordered here. I think we decided (can't
>> find an archive link right now) on java and javax imports before others.
>>
>
> Everything we wrote down is here:
> http://tika.apache.org/contribute.html#Code_Formatting
>
> Nothing there yet on that particular area, but I agree it'd be worth
> recording what we're generally doing!
>
> Nick
>

Re: svn commit: r1640535 - /tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource. java

[Nick Burch <ap...@gagravarr.org>]

On Wed, 19 Nov 2014, Tyler Palsulich wrote:
> It looks like imports are being reordered here. I think we decided (can't
> find an archive link right now) on java and javax imports before others.

Everything we wrote down is here:
http://tika.apache.org/contribute.html#Code_Formatting

Nothing there yet on that particular area, but I agree it'd be worth 
recording what we're generally doing!

Nick