Thanks nick Sent from my iPhone
> On Jun 5, 2014, at 4:19 PM, "n...@apache.org" <n...@apache.org> wrote: > > Author: nick > Date: Thu Jun 5 23:19:21 2014 > New Revision: 1600791 > > URL: http://svn.apache.org/r1600791 > Log: > TIKA-1324 As discussed on the mailing lists, use a common url prefix for the > unpacker resources > > Modified: > tika/trunk/CHANGES.txt > > tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java > > tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java > > Modified: tika/trunk/CHANGES.txt > URL: > http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1600791&r1=1600790&r2=1600791&view=diff > ============================================================================== > --- tika/trunk/CHANGES.txt (original) > +++ tika/trunk/CHANGES.txt Thu Jun 5 23:19:21 2014 > @@ -1,5 +1,10 @@ > Release 1.6 - ??/??/2014 > > + * The Tika Server URLs for the unpacker resources have been changed, > + to bring them under a common prefix (TIKA-1324). The mapping is > + /unpacker/{id} -> /unpack/{id} > + /all/{id} -> /unpack/all/{id} > + > * Added module and core Tika interface for translating text between > languages and added a default implementation that call's Microsoft's > translate service (TIKA-1319) > @@ -18,8 +23,8 @@ Release 1.6 - ??/??/2014 > based (TIKA-1204, TIKA-1221) > > * Added a user facing welcome page to the Tika Server, which > - says what it is, and a very brief summary of what is available. > - (Not working yet though...!) (TIKA-1269) > + says what it is, and a very brief summary of what is available. > + (TIKA-1269) > > * Added Tika Server endpoints to list the available mime types, > Parsers and Detectors, similar to the --list-<foo> methods on > > Modified: > tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java > URL: > http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java?rev=1600791&r1=1600790&r2=1600791&view=diff > ============================================================================== > --- > tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java > (original) > +++ > tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java > Thu Jun 5 23:19:21 2014 > @@ -60,6 +60,7 @@ import org.xml.sax.ContentHandler; > import org.xml.sax.SAXException; > import org.xml.sax.helpers.DefaultHandler; > > +@Path("/unpack") > public class UnpackerResource { > private static final Log logger = LogFactory.getLog(UnpackerResource.class); > public static final String TEXT_FILENAME = "__TEXT__"; > @@ -70,7 +71,7 @@ public class UnpackerResource { > this.tikaConfig = tikaConfig; > } > > - @Path("/unpacker{id:(/.*)?}") > + @Path("/{id:(/.*)?}") > @PUT > @Produces({"application/zip", "application/x-tar"}) > public Map<String, byte[]> unpack( > > Modified: > tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java > URL: > http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java?rev=1600791&r1=1600790&r2=1600791&view=diff > ============================================================================== > --- > tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java > (original) > +++ > tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java > Thu Jun 5 23:19:21 2014 > @@ -36,8 +36,9 @@ import org.apache.cxf.jaxrs.lifecycle.Si > import org.junit.Test; > > public class UnpackerResourceTest extends CXFTestBase { > - private static final String UNPACKER_PATH = "/unpacker"; > - private static final String ALL_PATH = "/all"; > + private static final String BASE_PATH = "/unpack"; > + private static final String UNPACKER_PATH = BASE_PATH + ""; > + private static final String ALL_PATH = BASE_PATH + "/all"; > > private static final String TEST_DOC_WAV = "Doc1_ole.doc"; > private static final String WAV1_MD5 = "bdd0a78a54968e362445364f95d8dc96"; > >
