svn commit: r1061436 - in /tika/trunk/tika-core/src/main/java/org/apache/tika/fork: ForkClient.java ForkObjectInputStream.java ForkSerializer.java ForkServer.java

[ju...@apache.org]

Author: jukka
Date: Thu Jan 20 18:22:07 2011
New Revision: 1061436

URL: http://svn.apache.org/viewvc?rev=1061436&view=rev
Log:
TIKA-416: Out-of-process text extraction

Rename ForkSerializer to ForkObjectInputStream to better reflect its current role

Added:
    tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkObjectInputStream.java
      - copied, changed from r1060837, tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkSerializer.java
Removed:
    tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkSerializer.java
Modified:
    tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
    tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkServer.java

Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java?rev=1061436&r1=1061435&r2=1061436&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java Thu Jan 20 18:22:07 2011
@@ -218,7 +218,7 @@ class ForkClient {
             jar.write(manifest.getBytes("UTF-8"));
 
             Class<?>[] bootstrap = {
-                    ForkServer.class, ForkSerializer.class,
+                    ForkServer.class, ForkObjectInputStream.class,
                     ForkProxy.class, ClassLoaderProxy.class,
                     MemoryURLConnection.class, MemoryURLStreamHandler.class,
                     MemoryURLStreamHandlerFactory.class

Copied: tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkObjectInputStream.java (from r1060837, tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkSerializer.java)
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkObjectInputStream.java?p2=tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkObjectInputStream.java&p1=tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkSerializer.java&r1=1060837&r2=1061436&rev=1061436&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkSerializer.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkObjectInputStream.java Thu Jan 20 18:22:07 2011
@@ -22,14 +22,17 @@ import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 
 /**
- * Utility class for serializing and deserializing objects. Normal Java
- * serialization is used, but each serialized object graph is first written
- * or read into an in-memory buffer before it is written to a given byte
- * stream or deserialized. This way the underlying stream can be used for
- * other things like loading referenced classes while the object graph is
- * still being deserialized.
+ * An object input stream that uses a given class loader when deserializing
+ * objects.
+ * <p>
+ * Note that this functionality could easily be implemented as a simple
+ * anonymous {@link ObjectInputStream} subclass, but since the
+ * functionality is needed during the somewhat complicated bootstrapping
+ * of the stdin/out communication channel of a forked server process,
+ * it's better if class has a stable name that can be referenced at
+ * compile-time by the {@link ForkClient} class.
  */
-class ForkSerializer extends ObjectInputStream {
+class ForkObjectInputStream extends ObjectInputStream {
 
     /** The class loader used when deserializing objects. */
     private final ClassLoader loader;
@@ -37,19 +40,12 @@ class ForkSerializer extends ObjectInput
     /**
      * Creates a new object input stream that uses the given class loader
      * when deserializing objects.
-     * <p>
-     * Note that this functionality could easily be implemented as a simple
-     * anonymous {@link ObjectInputStream} subclass, but since the
-     * functionality is needed during the somewhat complicated bootstrapping
-     * of the stdin/out communication channel of a forked server process,
-     * it's better if class has a stable name that can be referenced at
-     * compile-time by the {@link ForkClient} class.
      *
      * @param input underlying input stream
      * @param loader class loader used when deserializing objects
      * @throws IOException if this stream could not be initiated
      */
-    public ForkSerializer(InputStream input, ClassLoader loader)
+    public ForkObjectInputStream(InputStream input, ClassLoader loader)
             throws IOException {
         super(input);
         this.loader = loader;

Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkServer.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkServer.java?rev=1061436&r1=1061435&r2=1061436&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkServer.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkServer.java Thu Jan 20 18:22:07 2011
@@ -154,7 +154,7 @@ class ForkServer implements Runnable, Ch
         input.readFully(data);
 
         ObjectInputStream deserializer =
-            new ForkSerializer(new ByteArrayInputStream(data), loader);
+            new ForkObjectInputStream(new ByteArrayInputStream(data), loader);
         Object object = deserializer.readObject();
         if (object instanceof ForkProxy) {
             ((ForkProxy) object).init(input, output);