avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scottca...@apache.org
Subject svn commit: r1064397 [1/2] - in /avro/trunk: ./ lang/java/ lang/java/avro/src/main/java/org/apache/avro/ lang/java/avro/src/main/java/org/apache/avro/io/ lang/java/avro/src/main/java/org/apache/avro/ipc/ lang/java/avro/src/main/java/org/apache/avro/ref...
Date Fri, 28 Jan 2011 01:04:56 GMT
Author: scottcarey
Date: Fri Jan 28 01:04:53 2011
New Revision: 1064397

URL: http://svn.apache.org/viewvc?rev=1064397&view=rev
Log:
    AVRO-716. Java: Improve correlation between packages and modules.
    Each module introduced by AVRO-647 now exclusively provides 
    different java packages.  This required moving several classes
    around into new packages and will therefore require users to
    change their package imports when upgrading to Avro 1.5.0.
    Summary of changes:
    * AvroRemoteException has moved to org.apache.avro
    * ByteBufferInputStream and ByteBufferInputStream have moved 
      to org.apache.avro.util
    * InduceSchemaTool has moved to org.apache.avro.tools
    * SpecificCompiler, SchemaTask, and ProtocolTask have moved 
      to org.apache.avro.compiler.specific
    * The Idl compiler has moved to org.apache.avro.compiler.idl
    * ReflectRequestor and ReflectResponder have moved to
      org.apache.avro.ipc.reflect
    * GenericRequestor and GenericResponder have moved to
      org.apache.avro.ipc.generic
    * SpecificRequestor and SpecificResponder have moved to
      org.apache.avro.ipc.specific
    (scottcarey)

Added:
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/AvroRemoteException.java
      - copied, changed from r1063989, avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/AvroRemoteException.java
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferInputStream.java
      - copied, changed from r1063989, avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/ByteBufferInputStream.java
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferOutputStream.java
      - copied, changed from r1063989, avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/ByteBufferOutputStream.java
    avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/
    avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/
      - copied from r1063989, avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/specific/
    avro/trunk/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/
    avro/trunk/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/
      - copied from r1063989, avro/trunk/lang/java/compiler/src/main/javacc/org/apache/avro/idl/
    avro/trunk/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/
    avro/trunk/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/
      - copied from r1063989, avro/trunk/lang/java/compiler/src/main/velocity/org/apache/avro/specific/
    avro/trunk/lang/java/compiler/src/test/java/org/apache/avro/compiler/
    avro/trunk/lang/java/compiler/src/test/java/org/apache/avro/compiler/idl/
      - copied from r1063989, avro/trunk/lang/java/compiler/src/test/java/org/apache/avro/idl/
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/generic/
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/generic/GenericRequestor.java
      - copied, changed from r1063989, avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/generic/GenericRequestor.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/generic/GenericResponder.java
      - copied, changed from r1063989, avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/generic/GenericResponder.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/reflect/
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/reflect/ReflectRequestor.java
      - copied, changed from r1063989, avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/reflect/ReflectRequestor.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/reflect/ReflectResponder.java
      - copied, changed from r1063989, avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/reflect/ReflectResponder.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/specific/
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/specific/SpecificRequestor.java
      - copied, changed from r1063989, avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/specific/SpecificRequestor.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/specific/SpecificResponder.java
      - copied, changed from r1063989, avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/specific/SpecificResponder.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/Avro14SpecificCompiler.java
      - copied, changed from r1063989, avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/Avro14SpecificCompiler.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java
      - copied, changed from r1063989, avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificCompiler.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/TestTemplatedCompilerFidelity.java
      - copied, changed from r1063989, avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestTemplatedCompilerFidelity.java
    avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/InduceSchemaTool.java
      - copied, changed from r1063989, avro/trunk/lang/java/avro/src/main/java/org/apache/avro/reflect/InduceSchemaTool.java
    avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/SpecificCompilerTool.java
    avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/Tool.java
      - copied unchanged from r1063989, avro/trunk/lang/java/avro/src/main/java/org/apache/avro/tool/Tool.java
    avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/package.html
      - copied unchanged from r1063989, avro/trunk/lang/java/avro/src/main/java/org/apache/avro/tool/package.html
Removed:
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/AvroRemoteException.java
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/ByteBufferInputStream.java
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/ByteBufferOutputStream.java
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/reflect/InduceSchemaTool.java
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/tool/Tool.java
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/tool/package.html
    avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/specific/
    avro/trunk/lang/java/compiler/src/main/javacc/org/apache/avro/idl/
    avro/trunk/lang/java/compiler/src/main/velocity/org/apache/avro/specific/
    avro/trunk/lang/java/compiler/src/test/java/org/apache/avro/idl/
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/generic/GenericRequestor.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/generic/GenericResponder.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/reflect/ReflectRequestor.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/reflect/ReflectResponder.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/specific/SpecificRequestor.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/specific/SpecificResponder.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/Avro14SpecificCompiler.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificCompiler.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestTemplatedCompilerFidelity.java
Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/BinaryEncoder.java
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/DirectBinaryDecoder.java
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/reflect/ReflectData.java
    avro/trunk/lang/java/avro/src/main/java/org/apache/avro/specific/SpecificExceptionBase.java
    avro/trunk/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java
    avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/ProtocolTask.java
    avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SchemaTask.java
    avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java
    avro/trunk/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj
    avro/trunk/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/protocol.vm
    avro/trunk/lang/java/compiler/src/test/java/org/apache/avro/compiler/idl/TestIdl.java
    avro/trunk/lang/java/ipc/pom.xml
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/Requestor.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/Responder.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/SaslSocketTransceiver.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/SocketServer.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TraceClientServlet.java
    avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TracePlugin.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestBulkData.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceReflect.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceSpecific.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolDatagram.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolGeneric.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolGenericMeta.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolHttp.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolReflect.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolReflectMeta.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestSchema.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestLocalTransceiver.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestRpcPluginOrdering.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslAnonymous.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslDigestMd5.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/stats/StatsPluginOverhead.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/stats/TestStatsPluginAndServlet.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestBasicTracing.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestEndToEndTracing.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestFileSpanStorage.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestTraceCollection.java
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificData.java
    avro/trunk/lang/java/mapred/pom.xml
    avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java
    avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTask.java
    avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTaskRunner.java
    avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/IDLProtocolMojo.java
    avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java
    avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java
    avro/trunk/lang/java/pom.xml
    avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/IdlTool.java
    avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/Main.java
    avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/RpcReceiveTool.java
    avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/RpcSendTool.java

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Fri Jan 28 01:04:53 2011
@@ -32,6 +32,27 @@ Avro 1.5.0 (unreleased)
 
     (scottcarey)
 
+    AVRO-716. Java: Improve correlation between packages and modules.
+    Each module introduced by AVRO-647 now exclusively provides 
+    different java packages.  This required moving several classes
+    around into new packages and will therefore require users to
+    change their package imports when upgrading to Avro 1.5.0.
+    Summary of changes:
+    * AvroRemoteException has moved to org.apache.avro
+    * ByteBufferInputStream and ByteBufferInputStream have moved 
+      to org.apache.avro.util
+    * InduceSchemaTool has moved to org.apache.avro.tools
+    * SpecificCompiler, SchemaTask, and ProtocolTask have moved 
+      to org.apache.avro.compiler.specific
+    * The Idl compiler has moved to org.apache.avro.compiler.idl
+    * ReflectRequestor and ReflectResponder have moved to
+      org.apache.avro.ipc.reflect
+    * GenericRequestor and GenericResponder have moved to
+      org.apache.avro.ipc.generic
+    * SpecificRequestor and SpecificResponder have moved to
+      org.apache.avro.ipc.specific
+    (scottcarey)
+
     AVRO-670. Allow DataFileWriteTool to accept schema files as input with new
     --schema-file and --schema command-line flags. (Ron Bodkin via philz)
 

Copied: avro/trunk/lang/java/avro/src/main/java/org/apache/avro/AvroRemoteException.java (from r1063989, avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/AvroRemoteException.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/AvroRemoteException.java?p2=avro/trunk/lang/java/avro/src/main/java/org/apache/avro/AvroRemoteException.java&p1=avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/AvroRemoteException.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/AvroRemoteException.java (original)
+++ avro/trunk/lang/java/avro/src/main/java/org/apache/avro/AvroRemoteException.java Fri Jan 28 01:04:53 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.ipc;
+package org.apache.avro;
 
 import java.io.IOException;
 

Modified: avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/BinaryEncoder.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/BinaryEncoder.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/BinaryEncoder.java (original)
+++ avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/BinaryEncoder.java Fri Jan 28 01:04:53 2011
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
-import org.apache.avro.ipc.ByteBufferOutputStream;
+import org.apache.avro.util.ByteBufferOutputStream;
 import org.apache.avro.util.Utf8;
 
 /**

Modified: avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/DirectBinaryDecoder.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/DirectBinaryDecoder.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/DirectBinaryDecoder.java (original)
+++ avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/DirectBinaryDecoder.java Fri Jan 28 01:04:53 2011
@@ -22,7 +22,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 
-import org.apache.avro.ipc.ByteBufferInputStream;
+import org.apache.avro.util.ByteBufferInputStream;
+
 
 /**
  *  A non-buffering version of {@link BinaryDecoder}.

Modified: avro/trunk/lang/java/avro/src/main/java/org/apache/avro/reflect/ReflectData.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/reflect/ReflectData.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/avro/src/main/java/org/apache/avro/reflect/ReflectData.java (original)
+++ avro/trunk/lang/java/avro/src/main/java/org/apache/avro/reflect/ReflectData.java Fri Jan 28 01:04:53 2011
@@ -33,6 +33,7 @@ import java.util.concurrent.ConcurrentHa
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.apache.avro.AvroRemoteException;
 import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Protocol;
@@ -43,7 +44,6 @@ import org.apache.avro.generic.GenericFi
 import org.apache.avro.specific.SpecificData;
 import org.apache.avro.specific.FixedSize;
 import org.apache.avro.io.BinaryData;
-import org.apache.avro.ipc.AvroRemoteException;
 
 import com.thoughtworks.paranamer.CachingParanamer;
 import com.thoughtworks.paranamer.Paranamer;

Modified: avro/trunk/lang/java/avro/src/main/java/org/apache/avro/specific/SpecificExceptionBase.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/specific/SpecificExceptionBase.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/avro/src/main/java/org/apache/avro/specific/SpecificExceptionBase.java (original)
+++ avro/trunk/lang/java/avro/src/main/java/org/apache/avro/specific/SpecificExceptionBase.java Fri Jan 28 01:04:53 2011
@@ -18,8 +18,8 @@
 
 package org.apache.avro.specific;
 
+import org.apache.avro.AvroRemoteException;
 import org.apache.avro.Schema;
-import org.apache.avro.ipc.AvroRemoteException;
 
 /** Base class for specific exceptions. */
 public abstract class SpecificExceptionBase extends AvroRemoteException

Copied: avro/trunk/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferInputStream.java (from r1063989, avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/ByteBufferInputStream.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferInputStream.java?p2=avro/trunk/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferInputStream.java&p1=avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/ByteBufferInputStream.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/ByteBufferInputStream.java (original)
+++ avro/trunk/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferInputStream.java Fri Jan 28 01:04:53 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.ipc;
+package org.apache.avro.util;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -35,12 +35,14 @@ public class ByteBufferInputStream exten
 
   /** @see InputStream#read()
    * @throws EOFException if EOF is reached. */
+  @Override
   public int read() throws IOException {
     return getBuffer().get() & 0xff;
   }
 
   /** @see InputStream#read(byte[], int, int)
    * @throws EOFException if EOF is reached before reading all the bytes. */
+  @Override
   public int read(byte[] b, int off, int len) throws IOException {
     if (len == 0) return 0;
     ByteBuffer buffer = getBuffer();

Copied: avro/trunk/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferOutputStream.java (from r1063989, avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/ByteBufferOutputStream.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferOutputStream.java?p2=avro/trunk/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferOutputStream.java&p1=avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/ByteBufferOutputStream.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/avro/src/main/java/org/apache/avro/ipc/ByteBufferOutputStream.java (original)
+++ avro/trunk/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferOutputStream.java Fri Jan 28 01:04:53 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.ipc;
+package org.apache.avro.util;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -69,6 +69,7 @@ public class ByteBufferOutputStream exte
     buffers.add(buffer);
   }
 
+  @Override
   public void write(int b) {
     ByteBuffer buffer = buffers.get(buffers.size()-1);
     if (buffer.remaining() < 1) {
@@ -78,6 +79,7 @@ public class ByteBufferOutputStream exte
     buffer.put((byte)b);
   }
 
+  @Override
   public void write(byte[] b, int off, int len) {
     ByteBuffer buffer = buffers.get(buffers.size()-1);
     int remaining = buffer.remaining();

Modified: avro/trunk/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java (original)
+++ avro/trunk/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java Fri Jan 28 01:04:53 2011
@@ -31,8 +31,8 @@ import org.apache.avro.RandomData;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.generic.GenericDatumWriter;
-import org.apache.avro.ipc.ByteBufferInputStream;
-import org.apache.avro.ipc.ByteBufferOutputStream;
+import org.apache.avro.util.ByteBufferInputStream;
+import org.apache.avro.util.ByteBufferOutputStream;
 import org.apache.avro.util.Utf8;
 import org.junit.Assert;
 import org.junit.BeforeClass;

Modified: avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/ProtocolTask.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/ProtocolTask.java?rev=1064397&r1=1063989&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/ProtocolTask.java (original)
+++ avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/ProtocolTask.java Fri Jan 28 01:04:53 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.avro.specific;
+package org.apache.avro.compiler.specific;
 
 import java.io.File;
 import java.io.IOException;
@@ -44,6 +44,7 @@ public class ProtocolTask extends Task {
   public void addFileset(FileSet set) { filesets.add(set); }
   
   /** Run the compiler. */
+  @Override
   public void execute() {
     if (src == null && filesets.size()==0)
       throw new BuildException("No file or fileset specified.");

Modified: avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SchemaTask.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SchemaTask.java?rev=1064397&r1=1063989&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SchemaTask.java (original)
+++ avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SchemaTask.java Fri Jan 28 01:04:53 2011
@@ -15,13 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.avro.specific;
+package org.apache.avro.compiler.specific;
 
 import java.io.File;
 import java.io.IOException;
 
 /** Ant task to generate Java interface and classes for a protocol. */
 public class SchemaTask extends ProtocolTask {
+  @Override
   protected void doCompile(File src, File dest) throws IOException {
     SpecificCompiler.compileSchema(src, dest);
   }

Modified: avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java?rev=1064397&r1=1063989&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java (original)
+++ avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java Fri Jan 28 01:04:53 2011
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.avro.specific;
+package org.apache.avro.compiler.specific;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,7 +30,6 @@ import java.util.Set;
 
 import org.apache.avro.Protocol;
 import org.apache.avro.Schema;
-import org.apache.avro.tool.Tool;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
@@ -90,7 +87,7 @@ public class SpecificCompiler {
   SpecificCompiler() {
     this.templateDir =
       System.getProperty("org.apache.avro.specific.templates",
-                         "/org/apache/avro/specific/templates/java/classic/");
+                         "/org/apache/avro/compiler/specific/templates/java/classic/");
     initializeVelocity();
   }
 
@@ -115,7 +112,7 @@ public class SpecificCompiler {
       // multiple threads can get here concurrently, but that's ok.
       try {
         new Slf4jLogChute();
-        logChuteName = "org.apache.avro.specific.SpecificCompiler$Slf4jLogChute";
+        logChuteName = Slf4jLogChute.class.getName();
       } catch (Exception e) {
         logChuteName = "org.apache.velocity.runtime.log.NullLogChute";
       }
@@ -360,42 +357,6 @@ public class SpecificCompiler {
     //compileSchema(new File(args[0]), new File(args[1]));
     compileProtocol(new File(args[0]), new File(args[1]));
   }
-
-  /**
-   * Implementation of Tool for inclusion by the "avro-tools" runner.
-   */
-  public static class SpecificCompilerTool implements Tool {
-    @Override
-    public int run(InputStream in, PrintStream out, PrintStream err,
-        List<String> args) throws Exception {
-      if (args.size() != 3) {
-        System.err.println("Expected 3 arguments: (schema|protocol) inputfile outputdir");
-        return 1;
-      }
-      String method = args.get(0);
-      File input = new File(args.get(1));
-      File output = new File(args.get(2));
-      if ("schema".equals(method)) {
-        compileSchema(input, output);
-      } else if ("protocol".equals(method)) {
-        compileProtocol(input, output);
-      } else {
-        System.err.println("Expected \"schema\" or \"protocol\".");
-        return 1;
-      }
-      return 0;
-    }
-
-    @Override
-    public String getName() {
-      return "compile";
-    }
-
-    @Override
-    public String getShortDescription() {
-      return "Generates Java code for the given schema.";
-    }
-  }
   
   public static final class Slf4jLogChute implements LogChute {
     private Logger logger = LoggerFactory.getLogger("AvroVelocityLogChute");

Modified: avro/trunk/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj?rev=1064397&r1=1063989&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj (original)
+++ avro/trunk/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj Fri Jan 28 01:04:53 2011
@@ -58,7 +58,7 @@ options {
 
 PARSER_BEGIN(Idl)
 
-package org.apache.avro.idl;
+package org.apache.avro.compiler.idl;
 
 import java.io.*;
 import java.util.ArrayList;

Modified: avro/trunk/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/protocol.vm
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/protocol.vm?rev=1064397&r1=1063989&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/protocol.vm (original)
+++ avro/trunk/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/protocol.vm Fri Jan 28 01:04:53 2011
@@ -38,7 +38,7 @@ public interface $this.mangle($protocol.
 #*      *#${this.javaUnbox($p.schema())} ${this.mangle($p.name())}#if ($velocityHasNext), #end
 #end
 )#if (! $message.isOneWay())
- throws org.apache.avro.ipc.AvroRemoteException##
+ throws org.apache.avro.AvroRemoteException##
 ## The first error is always "string", so we skip it.
 #foreach ($error in $message.getErrors().getTypes().subList(1, $message.getErrors().getTypes().size()))
 , ${this.mangle($error.getFullName())}##

Modified: avro/trunk/lang/java/compiler/src/test/java/org/apache/avro/compiler/idl/TestIdl.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/compiler/src/test/java/org/apache/avro/compiler/idl/TestIdl.java?rev=1064397&r1=1063989&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/compiler/src/test/java/org/apache/avro/compiler/idl/TestIdl.java (original)
+++ avro/trunk/lang/java/compiler/src/test/java/org/apache/avro/compiler/idl/TestIdl.java Fri Jan 28 01:04:53 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.idl;
+package org.apache.avro.compiler.idl;
 
 import org.junit.Before;
 import org.junit.Test;

Modified: avro/trunk/lang/java/ipc/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/pom.xml?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/pom.xml (original)
+++ avro/trunk/lang/java/ipc/pom.xml Fri Jan 28 01:04:53 2011
@@ -77,6 +77,9 @@
               <goal>idl-protocol</goal>
             </goals>
             <configuration>
+              <excludes>
+                <exclude>**/mapred/tether/**</exclude>
+              </excludes>
               <sourceDirectory>${parent.project.basedir}/../../../../share/schemas/</sourceDirectory>
               <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
               <testSourceDirectory>${parent.project.basedir}/../../../../share/test/schemas/</testSourceDirectory>

Modified: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/Requestor.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/Requestor.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/Requestor.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/Requestor.java Fri Jan 28 01:04:53 2011
@@ -39,6 +39,8 @@ import org.apache.avro.io.Encoder;
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.specific.SpecificDatumReader;
 import org.apache.avro.specific.SpecificDatumWriter;
+import org.apache.avro.util.ByteBufferInputStream;
+import org.apache.avro.util.ByteBufferOutputStream;
 import org.apache.avro.util.Utf8;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/Responder.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/Responder.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/Responder.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/Responder.java Fri Jan 28 01:04:53 2011
@@ -35,6 +35,8 @@ import org.apache.avro.UnresolvedUnionEx
 import org.apache.avro.Protocol;
 import org.apache.avro.Schema;
 import org.apache.avro.Protocol.Message;
+import org.apache.avro.util.ByteBufferInputStream;
+import org.apache.avro.util.ByteBufferOutputStream;
 import org.apache.avro.util.Utf8;
 import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.generic.GenericDatumWriter;

Modified: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/SaslSocketTransceiver.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/SaslSocketTransceiver.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/SaslSocketTransceiver.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/SaslSocketTransceiver.java Fri Jan 28 01:04:53 2011
@@ -34,6 +34,7 @@ import javax.security.sasl.SaslClient;
 import javax.security.sasl.SaslServer;
 
 import org.apache.avro.Protocol;
+import org.apache.avro.util.ByteBufferOutputStream;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/SocketServer.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/SocketServer.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/SocketServer.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/SocketServer.java Fri Jan 28 01:04:53 2011
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
 
 import org.apache.avro.Protocol;
 import org.apache.avro.Protocol.Message;
-import org.apache.avro.generic.GenericResponder;
+import org.apache.avro.ipc.generic.GenericResponder;
 
 /** A socket-based server implementation. This uses a simple, non-standard wire
  * protocol and is not intended for production services.

Copied: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/generic/GenericRequestor.java (from r1063989, avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/generic/GenericRequestor.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/generic/GenericRequestor.java?p2=avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/generic/GenericRequestor.java&p1=avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/generic/GenericRequestor.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/generic/GenericRequestor.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/generic/GenericRequestor.java Fri Jan 28 01:04:53 2011
@@ -16,16 +16,18 @@
  * limitations under the License.
  */
 
-package org.apache.avro.generic;
+package org.apache.avro.ipc.generic;
 
 import java.io.IOException;
 
+import org.apache.avro.AvroRemoteException;
 import org.apache.avro.Protocol;
 import org.apache.avro.Schema;
 import org.apache.avro.AvroRuntimeException;
+import org.apache.avro.generic.GenericDatumReader;
+import org.apache.avro.generic.GenericDatumWriter;
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.ipc.AvroRemoteException;
 import org.apache.avro.ipc.Requestor;
 import org.apache.avro.ipc.Transceiver;
 

Copied: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/generic/GenericResponder.java (from r1063989, avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/generic/GenericResponder.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/generic/GenericResponder.java?p2=avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/generic/GenericResponder.java&p1=avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/generic/GenericResponder.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/generic/GenericResponder.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/generic/GenericResponder.java Fri Jan 28 01:04:53 2011
@@ -16,15 +16,17 @@
  * limitations under the License.
  */
 
-package org.apache.avro.generic;
+package org.apache.avro.ipc.generic;
 
 import java.io.IOException;
 
+import org.apache.avro.AvroRemoteException;
 import org.apache.avro.Protocol;
 import org.apache.avro.Schema;
+import org.apache.avro.generic.GenericDatumReader;
+import org.apache.avro.generic.GenericDatumWriter;
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
-import org.apache.avro.ipc.AvroRemoteException;
 import org.apache.avro.ipc.Responder;
 
 /** {@link Responder} implementation for generic Java data. */

Copied: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/reflect/ReflectRequestor.java (from r1063989, avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/reflect/ReflectRequestor.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/reflect/ReflectRequestor.java?p2=avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/reflect/ReflectRequestor.java&p1=avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/reflect/ReflectRequestor.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/reflect/ReflectRequestor.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/reflect/ReflectRequestor.java Fri Jan 28 01:04:53 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.reflect;
+package org.apache.avro.ipc.reflect;
 
 import java.io.IOException;
 import java.lang.reflect.Proxy;
@@ -25,8 +25,11 @@ import org.apache.avro.Protocol;
 import org.apache.avro.Schema;
 import org.apache.avro.io.DatumReader;
 import org.apache.avro.io.DatumWriter;
-import org.apache.avro.specific.SpecificRequestor;
+import org.apache.avro.reflect.ReflectData;
+import org.apache.avro.reflect.ReflectDatumReader;
+import org.apache.avro.reflect.ReflectDatumWriter;
 import org.apache.avro.ipc.Transceiver;
+import org.apache.avro.ipc.specific.SpecificRequestor;
 
 /** A {@link org.apache.avro.ipc.Requestor} for existing interfaces. */
 public class ReflectRequestor extends SpecificRequestor {

Copied: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/reflect/ReflectResponder.java (from r1063989, avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/reflect/ReflectResponder.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/reflect/ReflectResponder.java?p2=avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/reflect/ReflectResponder.java&p1=avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/reflect/ReflectResponder.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/reflect/ReflectResponder.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/reflect/ReflectResponder.java Fri Jan 28 01:04:53 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.reflect;
+package org.apache.avro.ipc.reflect;
 
 import java.io.IOException;
 
@@ -25,7 +25,10 @@ import org.apache.avro.Protocol;
 import org.apache.avro.io.Encoder;
 import org.apache.avro.io.DatumReader;
 import org.apache.avro.io.DatumWriter;
-import org.apache.avro.specific.SpecificResponder;
+import org.apache.avro.ipc.specific.SpecificResponder;
+import org.apache.avro.reflect.ReflectData;
+import org.apache.avro.reflect.ReflectDatumReader;
+import org.apache.avro.reflect.ReflectDatumWriter;
 
 /** {@link org.apache.avro.ipc.Responder} for existing interfaces.*/
 public class ReflectResponder extends SpecificResponder {

Copied: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/specific/SpecificRequestor.java (from r1063989, avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/specific/SpecificRequestor.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/specific/SpecificRequestor.java?p2=avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/specific/SpecificRequestor.java&p1=avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/specific/SpecificRequestor.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/specific/SpecificRequestor.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/specific/SpecificRequestor.java Fri Jan 28 01:04:53 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.specific;
+package org.apache.avro.ipc.specific;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -32,6 +32,9 @@ import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
 import org.apache.avro.ipc.Transceiver;
 import org.apache.avro.ipc.Requestor;
+import org.apache.avro.specific.SpecificData;
+import org.apache.avro.specific.SpecificDatumReader;
+import org.apache.avro.specific.SpecificDatumWriter;
 
 /** {@link org.apache.avro.ipc.Requestor Requestor} for generated interfaces. */
 public class SpecificRequestor extends Requestor implements InvocationHandler {

Copied: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/specific/SpecificResponder.java (from r1063989, avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/specific/SpecificResponder.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/specific/SpecificResponder.java?p2=avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/specific/SpecificResponder.java&p1=avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/specific/SpecificResponder.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/specific/SpecificResponder.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/specific/SpecificResponder.java Fri Jan 28 01:04:53 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.avro.specific;
+package org.apache.avro.ipc.specific;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -31,6 +31,9 @@ import org.apache.avro.io.DatumWriter;
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.Encoder;
 import org.apache.avro.ipc.Responder;
+import org.apache.avro.specific.SpecificData;
+import org.apache.avro.specific.SpecificDatumReader;
+import org.apache.avro.specific.SpecificDatumWriter;
 
 /** {@link org.apache.avro.ipc.Responder Responder} for generated interfaces.*/
 public class SpecificResponder extends Responder {

Modified: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TraceClientServlet.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TraceClientServlet.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TraceClientServlet.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TraceClientServlet.java Fri Jan 28 01:04:53 2011
@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.avro.ipc.HttpTransceiver;
+import org.apache.avro.ipc.specific.SpecificRequestor;
 import org.apache.avro.ipc.trace.TraceCollection.TraceNodeStats;
-import org.apache.avro.specific.SpecificRequestor;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
@@ -70,12 +70,12 @@ public class TraceClientServlet extends 
         "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
   }
   
+  @Override
   public void doPost(HttpServletRequest request, 
     HttpServletResponse response)
     throws ServletException, IOException {
     response.setContentType("text/html");
-    VelocityContext context = new VelocityContext();
-    
+       
     PrintWriter out = response.getWriter();
     String servers = request.getParameter("servers");
 
@@ -155,6 +155,7 @@ public class TraceClientServlet extends 
    *   /collection/[p_id]                  Show details for pattern with [p_id]
    *   /collection/[p_id]/[n_id]/          Show trace node with [n_id] 
    */
+  @Override
   public void doGet(HttpServletRequest request, 
       HttpServletResponse response) throws IOException {
     response.setContentType("text/html");

Modified: avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TracePlugin.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TracePlugin.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TracePlugin.java (original)
+++ avro/trunk/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TracePlugin.java Fri Jan 28 01:04:53 2011
@@ -27,14 +27,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+import org.apache.avro.AvroRemoteException;
 import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
-import org.apache.avro.ipc.AvroRemoteException;
 import org.apache.avro.ipc.HttpServer;
 import org.apache.avro.ipc.RPCContext;
 import org.apache.avro.ipc.RPCPlugin;
-import org.apache.avro.specific.SpecificResponder;
+import org.apache.avro.ipc.specific.SpecificResponder;
 import org.apache.avro.util.Utf8;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.bio.SocketConnector;
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
 public class TracePlugin extends RPCPlugin {
   final private static Random RANDOM = new Random();
   private static final Logger LOG = LoggerFactory.getLogger(TracePlugin.class);
-  public static enum StorageType { MEMORY, DISK };
+  public static enum StorageType { MEMORY, DISK }
   protected static TracePlugin singleton;
   protected static TracePluginConfiguration singletonConf;
   

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestBulkData.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestBulkData.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestBulkData.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestBulkData.java Fri Jan 28 01:04:53 2011
@@ -17,12 +17,12 @@
  */
 package org.apache.avro;
 
-import org.apache.avro.specific.SpecificRequestor;
-import org.apache.avro.specific.SpecificResponder;
 import org.apache.avro.ipc.HttpServer;
 import org.apache.avro.ipc.HttpTransceiver;
 import org.apache.avro.ipc.Server;
 import org.apache.avro.ipc.Transceiver;
+import org.apache.avro.ipc.specific.SpecificRequestor;
+import org.apache.avro.ipc.specific.SpecificResponder;
 
 import org.junit.AfterClass;
 import org.junit.Assert;

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceReflect.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceReflect.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceReflect.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceReflect.java Fri Jan 28 01:04:53 2011
@@ -19,8 +19,8 @@ package org.apache.avro;
 
 import org.apache.avro.ipc.SocketServer;
 import org.apache.avro.ipc.SocketTransceiver;
-import org.apache.avro.reflect.ReflectRequestor;
-import org.apache.avro.reflect.ReflectResponder;
+import org.apache.avro.ipc.reflect.ReflectRequestor;
+import org.apache.avro.ipc.reflect.ReflectResponder;
 import org.apache.avro.test.namespace.TestNamespace;
 import org.junit.Before;
 

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceSpecific.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceSpecific.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceSpecific.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceSpecific.java Fri Jan 28 01:04:53 2011
@@ -17,12 +17,11 @@
  */
 package org.apache.avro;
 
-import org.apache.avro.ipc.AvroRemoteException;
 import org.apache.avro.ipc.SocketServer;
 import org.apache.avro.ipc.SocketTransceiver;
 import org.apache.avro.ipc.Transceiver;
-import org.apache.avro.specific.SpecificRequestor;
-import org.apache.avro.specific.SpecificResponder;
+import org.apache.avro.ipc.specific.SpecificRequestor;
+import org.apache.avro.ipc.specific.SpecificResponder;
 import org.apache.avro.test.namespace.TestNamespace;
 import org.apache.avro.test.util.MD5;
 import org.apache.avro.test.errors.TestError;

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolDatagram.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolDatagram.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolDatagram.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolDatagram.java Fri Jan 28 01:04:53 2011
@@ -25,7 +25,7 @@ import org.apache.avro.ipc.DatagramTrans
 import org.apache.avro.ipc.Responder;
 import org.apache.avro.ipc.Server;
 import org.apache.avro.ipc.Transceiver;
-import org.apache.avro.specific.SpecificResponder;
+import org.apache.avro.ipc.specific.SpecificResponder;
 import org.apache.avro.test.Simple;
 
 public class TestProtocolDatagram extends TestProtocolSpecific {

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolGeneric.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolGeneric.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolGeneric.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolGeneric.java Fri Jan 28 01:04:53 2011
@@ -21,12 +21,11 @@ import org.apache.avro.Protocol.Message;
 import org.apache.avro.Schema.Field;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.generic.GenericRequestor;
-import org.apache.avro.generic.GenericResponder;
-import org.apache.avro.ipc.AvroRemoteException;
 import org.apache.avro.ipc.SocketServer;
 import org.apache.avro.ipc.SocketTransceiver;
 import org.apache.avro.ipc.Transceiver;
+import org.apache.avro.ipc.generic.GenericRequestor;
+import org.apache.avro.ipc.generic.GenericResponder;
 import org.apache.avro.util.Utf8;
 import org.junit.AfterClass;
 import org.junit.Before;

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolGenericMeta.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolGenericMeta.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolGenericMeta.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolGenericMeta.java Fri Jan 28 01:04:53 2011
@@ -19,10 +19,10 @@ package org.apache.avro;
 
 import java.net.InetSocketAddress;
 
-import org.apache.avro.generic.GenericRequestor;
 import org.apache.avro.ipc.Responder;
 import org.apache.avro.ipc.SocketServer;
 import org.apache.avro.ipc.SocketTransceiver;
+import org.apache.avro.ipc.generic.GenericRequestor;
 import org.junit.Before;
 
 public class TestProtocolGenericMeta extends TestProtocolGeneric {

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolHttp.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolHttp.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolHttp.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolHttp.java Fri Jan 28 01:04:53 2011
@@ -24,9 +24,9 @@ import org.apache.avro.ipc.Transceiver;
 import org.apache.avro.ipc.Responder;
 import org.apache.avro.ipc.HttpServer;
 import org.apache.avro.ipc.HttpTransceiver;
+import org.apache.avro.ipc.generic.GenericRequestor;
+import org.apache.avro.ipc.specific.SpecificRequestor;
 import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRequestor;
-import org.apache.avro.specific.SpecificRequestor;
 import org.apache.avro.test.Simple;
 
 import org.junit.Test;

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolReflect.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolReflect.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolReflect.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolReflect.java Fri Jan 28 01:04:53 2011
@@ -21,8 +21,8 @@ import org.apache.avro.ipc.Server;
 import org.apache.avro.ipc.Transceiver;
 import org.apache.avro.ipc.SocketServer;
 import org.apache.avro.ipc.SocketTransceiver;
-import org.apache.avro.reflect.ReflectRequestor;
-import org.apache.avro.reflect.ReflectResponder;
+import org.apache.avro.ipc.reflect.ReflectRequestor;
+import org.apache.avro.ipc.reflect.ReflectResponder;
 
 import org.junit.AfterClass;
 import org.junit.Before;

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolReflectMeta.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolReflectMeta.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolReflectMeta.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolReflectMeta.java Fri Jan 28 01:04:53 2011
@@ -19,8 +19,8 @@ package org.apache.avro;
 
 import org.apache.avro.ipc.SocketServer;
 import org.apache.avro.ipc.SocketTransceiver;
-import org.apache.avro.reflect.ReflectRequestor;
-import org.apache.avro.reflect.ReflectResponder;
+import org.apache.avro.ipc.reflect.ReflectRequestor;
+import org.apache.avro.ipc.reflect.ReflectResponder;
 import org.apache.avro.test.Simple;
 import org.junit.Before;
 

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java Fri Jan 28 01:04:53 2011
@@ -17,7 +17,6 @@
  */
 package org.apache.avro;
 
-import org.apache.avro.ipc.AvroRemoteException;
 import org.apache.avro.ipc.RPCContext;
 import org.apache.avro.ipc.RPCPlugin;
 import org.apache.avro.ipc.Requestor;
@@ -26,8 +25,8 @@ import org.apache.avro.ipc.Server;
 import org.apache.avro.ipc.SocketServer;
 import org.apache.avro.ipc.SocketTransceiver;
 import org.apache.avro.ipc.Transceiver;
-import org.apache.avro.specific.SpecificRequestor;
-import org.apache.avro.specific.SpecificResponder;
+import org.apache.avro.ipc.specific.SpecificRequestor;
+import org.apache.avro.ipc.specific.SpecificResponder;
 import org.apache.avro.test.Simple;
 import org.apache.avro.test.Kind;
 import org.apache.avro.test.MD5;

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestSchema.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestSchema.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestSchema.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/TestSchema.java Fri Jan 28 01:04:53 2011
@@ -47,7 +47,7 @@ import org.apache.avro.io.Encoder;
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.JsonDecoder;
 import org.apache.avro.io.JsonEncoder;
-import org.apache.avro.specific.TestSpecificCompiler;
+import org.apache.avro.compiler.specific.TestSpecificCompiler;
 import org.apache.avro.util.Utf8;
 
 public class TestSchema {

Copied: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/Avro14SpecificCompiler.java (from r1063989, avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/Avro14SpecificCompiler.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/Avro14SpecificCompiler.java?p2=avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/Avro14SpecificCompiler.java&p1=avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/Avro14SpecificCompiler.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/Avro14SpecificCompiler.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/Avro14SpecificCompiler.java Fri Jan 28 01:04:53 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.avro.specific;
+package org.apache.avro.compiler.specific;
 
 import java.io.File;
 import java.util.Arrays;
@@ -27,7 +27,7 @@ import java.util.Set;
 import org.apache.avro.Protocol;
 import org.apache.avro.Protocol.Message;
 import org.apache.avro.Schema;
-import org.apache.avro.specific.SpecificCompiler.OutputFile;
+import org.apache.avro.compiler.specific.SpecificCompiler.OutputFile;
 
 /**
  * Copy of "legacy" Avro 1.4 Specific Compiler.
@@ -82,7 +82,10 @@ public class Avro14SpecificCompiler {
       doc(out, 1, e.getValue().getDoc());
       line(out, 1, response+" "+ mangle(name)+"("+params(request)+")"
            + (message.isOneWay() ? ""
-              : (" throws org.apache.avro.ipc.AvroRemoteException"
+               // Avro 1.4 threw o.a.a.ipc.AvroRemoteException, but 
+               // in 1.5 it moved to o.a.a   This is not exactly like 
+               // 1.4 as a result.
+              : (" throws org.apache.avro.AvroRemoteException"
                  +errors(message.getErrors())))
            +";");
     }

Copied: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java (from r1063989, avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificCompiler.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java?p2=avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java&p1=avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificCompiler.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificCompiler.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java Fri Jan 28 01:04:53 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.avro.specific;
+package org.apache.avro.compiler.specific;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -38,7 +38,7 @@ import org.apache.avro.Protocol;
 import org.apache.avro.Schema;
 import org.apache.avro.TestProtocolParsing;
 import org.apache.avro.TestSchema;
-import org.apache.avro.specific.SpecificCompiler.OutputFile;
+import org.apache.avro.compiler.specific.SpecificCompiler.OutputFile;
 import org.junit.Test;
 
 public class TestSpecificCompiler {
@@ -62,7 +62,7 @@ public class TestSpecificCompiler {
 
   @Test
   public void testEsc() {
-    assertEquals("\\\"", new SpecificCompiler().javaEscape("\""));
+    assertEquals("\\\"", SpecificCompiler.javaEscape("\""));
   }
 
   @Test
@@ -106,7 +106,7 @@ public class TestSpecificCompiler {
 
     assertTrue(protocol.contains("java.lang.CharSequence goto$(java.lang.CharSequence break$)"));
     assertTrue(protocol.contains("public interface default$"));
-    assertTrue(protocol.contains("throws org.apache.avro.ipc.AvroRemoteException, finally$"));
+    assertTrue(protocol.contains("throws org.apache.avro.AvroRemoteException, finally$"));
     
     assertCompilesWithJavaCompiler(c);
 

Copied: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/TestTemplatedCompilerFidelity.java (from r1063989, avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestTemplatedCompilerFidelity.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/TestTemplatedCompilerFidelity.java?p2=avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/TestTemplatedCompilerFidelity.java&p1=avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestTemplatedCompilerFidelity.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestTemplatedCompilerFidelity.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/compiler/specific/TestTemplatedCompilerFidelity.java Fri Jan 28 01:04:53 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.avro.specific;
+package org.apache.avro.compiler.specific;
 
 import static org.junit.Assert.assertEquals;
 
@@ -67,7 +67,6 @@ public class TestTemplatedCompilerFideli
   /** Because asserts are pretty poor for debugging, optionally write to
    * temporary files. 
    */
-  @SuppressWarnings("unused")
   private void debug(String expected, String actual) throws IOException {
     if (expected.equals(actual)) return;
     

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestLocalTransceiver.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestLocalTransceiver.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestLocalTransceiver.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestLocalTransceiver.java Fri Jan 28 01:04:53 2011
@@ -21,12 +21,13 @@ import static org.junit.Assert.assertEqu
 
 import java.io.IOException;
 
+import org.apache.avro.AvroRemoteException;
 import org.apache.avro.Protocol;
 import org.apache.avro.Protocol.Message;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.generic.GenericRequestor;
-import org.apache.avro.generic.GenericResponder;
+import org.apache.avro.ipc.generic.GenericRequestor;
+import org.apache.avro.ipc.generic.GenericResponder;
 import org.apache.avro.util.Utf8;
 import org.junit.Test;
 

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java Fri Jan 28 01:04:53 2011
@@ -22,8 +22,8 @@ import java.net.InetSocketAddress;
 
 import junit.framework.Assert;
 
-import org.apache.avro.specific.SpecificRequestor;
-import org.apache.avro.specific.SpecificResponder;
+import org.apache.avro.ipc.specific.SpecificRequestor;
+import org.apache.avro.ipc.specific.SpecificResponder;
 import org.apache.avro.test.Mail;
 import org.apache.avro.test.Message;
 import org.apache.avro.util.Utf8;

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestRpcPluginOrdering.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestRpcPluginOrdering.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestRpcPluginOrdering.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestRpcPluginOrdering.java Fri Jan 28 01:04:53 2011
@@ -4,12 +4,12 @@ import static org.junit.Assert.assertEqu
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.avro.ipc.AvroRemoteException;
+import org.apache.avro.AvroRemoteException;
 import org.apache.avro.ipc.LocalTransceiver;
 import org.apache.avro.ipc.RPCContext;
 import org.apache.avro.ipc.RPCPlugin;
-import org.apache.avro.specific.SpecificRequestor;
-import org.apache.avro.specific.SpecificResponder;
+import org.apache.avro.ipc.specific.SpecificRequestor;
+import org.apache.avro.ipc.specific.SpecificResponder;
 import org.apache.avro.test.Mail;
 import org.apache.avro.test.Message;
 import org.apache.avro.util.Utf8;

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslAnonymous.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslAnonymous.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslAnonymous.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslAnonymous.java Fri Jan 28 01:04:53 2011
@@ -22,7 +22,7 @@ package org.apache.avro.ipc;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
-import org.apache.avro.generic.GenericRequestor;
+import org.apache.avro.ipc.generic.GenericRequestor;
 import org.apache.avro.TestProtocolGeneric;
 
 import org.slf4j.Logger;

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslDigestMd5.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslDigestMd5.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslDigestMd5.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslDigestMd5.java Fri Jan 28 01:04:53 2011
@@ -36,8 +36,8 @@ import javax.security.sasl.SaslClient;
 import javax.security.sasl.SaslException;
 
 import org.apache.avro.generic.GenericData;
-import org.apache.avro.generic.GenericRequestor;
 import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.ipc.generic.GenericRequestor;
 import org.apache.avro.TestProtocolGeneric;
 import org.apache.avro.util.Utf8;
 

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/stats/StatsPluginOverhead.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/stats/StatsPluginOverhead.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/stats/StatsPluginOverhead.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/stats/StatsPluginOverhead.java Fri Jan 28 01:04:53 2011
@@ -20,15 +20,15 @@ package org.apache.avro.ipc.stats;
 import java.io.IOException;
 import java.net.URL;
 
+import org.apache.avro.AvroRemoteException;
 import org.apache.avro.Protocol;
 import org.apache.avro.Protocol.Message;
-import org.apache.avro.generic.GenericRequestor;
-import org.apache.avro.generic.GenericResponder;
-import org.apache.avro.ipc.AvroRemoteException;
 import org.apache.avro.ipc.HttpServer;
 import org.apache.avro.ipc.HttpTransceiver;
 import org.apache.avro.ipc.Responder;
 import org.apache.avro.ipc.Transceiver;
+import org.apache.avro.ipc.generic.GenericRequestor;
+import org.apache.avro.ipc.generic.GenericResponder;
 
 /**
  * Naively measures overhead of using the stats plugin.

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/stats/TestStatsPluginAndServlet.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/stats/TestStatsPluginAndServlet.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/stats/TestStatsPluginAndServlet.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/stats/TestStatsPluginAndServlet.java Fri Jan 28 01:04:53 2011
@@ -28,19 +28,19 @@ import java.util.Random;
 
 import javax.servlet.UnavailableException;
 
+import org.apache.avro.AvroRemoteException;
 import org.apache.avro.Protocol;
 import org.apache.avro.Protocol.Message;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.generic.GenericRequestor;
-import org.apache.avro.generic.GenericResponder;
-import org.apache.avro.ipc.AvroRemoteException;
 import org.apache.avro.ipc.HttpServer;
 import org.apache.avro.ipc.HttpTransceiver;
 import org.apache.avro.ipc.LocalTransceiver;
 import org.apache.avro.ipc.RPCContext;
 import org.apache.avro.ipc.Responder;
 import org.apache.avro.ipc.Transceiver;
+import org.apache.avro.ipc.generic.GenericRequestor;
+import org.apache.avro.ipc.generic.GenericResponder;
 import org.junit.Test;
 import org.mortbay.log.Log;
 

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestBasicTracing.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestBasicTracing.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestBasicTracing.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestBasicTracing.java Fri Jan 28 01:04:53 2011
@@ -25,17 +25,17 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.List;
 
+import org.apache.avro.AvroRemoteException;
 import org.apache.avro.Protocol;
 import org.apache.avro.Protocol.Message;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.generic.GenericRequestor;
-import org.apache.avro.generic.GenericResponder;
-import org.apache.avro.ipc.AvroRemoteException;
 import org.apache.avro.ipc.HttpServer;
 import org.apache.avro.ipc.HttpTransceiver;
 import org.apache.avro.ipc.RPCPlugin;
 import org.apache.avro.ipc.Responder;
+import org.apache.avro.ipc.generic.GenericRequestor;
+import org.apache.avro.ipc.generic.GenericResponder;
 import org.apache.avro.ipc.trace.TracePlugin.StorageType;
 import org.junit.Test;
 

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestEndToEndTracing.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestEndToEndTracing.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestEndToEndTracing.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestEndToEndTracing.java Fri Jan 28 01:04:53 2011
@@ -24,17 +24,17 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 
+import org.apache.avro.AvroRemoteException;
 import org.apache.avro.Protocol;
 import org.apache.avro.Protocol.Message;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.generic.GenericRequestor;
-import org.apache.avro.generic.GenericResponder;
-import org.apache.avro.ipc.AvroRemoteException;
 import org.apache.avro.ipc.HttpServer;
 import org.apache.avro.ipc.HttpTransceiver;
 import org.apache.avro.ipc.RPCPlugin;
 import org.apache.avro.ipc.Responder;
+import org.apache.avro.ipc.generic.GenericRequestor;
+import org.apache.avro.ipc.generic.GenericResponder;
 import org.apache.avro.ipc.trace.SpanAggregator.SpanAggregationResults;
 import org.apache.avro.ipc.trace.SpanAggregator.TraceFormationResults;
 import org.apache.avro.ipc.trace.TracePlugin.StorageType;

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestFileSpanStorage.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestFileSpanStorage.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestFileSpanStorage.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestFileSpanStorage.java Fri Jan 28 01:04:53 2011
@@ -42,7 +42,7 @@ public class TestFileSpanStorage {
     s.messageName = new Utf8("message");
     test.addSpan(s);
     try {
-      Thread.sleep(100);
+      Thread.sleep(1000);
     } catch (InterruptedException e) {
       e.printStackTrace();
     }

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestTraceCollection.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestTraceCollection.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestTraceCollection.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestTraceCollection.java Fri Jan 28 01:04:53 2011
@@ -26,10 +26,10 @@ import java.util.List;
 
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.generic.GenericRequestor;
 import org.apache.avro.ipc.HttpServer;
 import org.apache.avro.ipc.HttpTransceiver;
 import org.apache.avro.ipc.Responder;
+import org.apache.avro.ipc.generic.GenericRequestor;
 import org.apache.avro.ipc.trace.SpanAggregator.SpanAggregationResults;
 import org.apache.avro.ipc.trace.TestBasicTracing.EndpointResponder;
 import org.apache.avro.ipc.trace.TestBasicTracing.RecursingResponder;

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificData.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificData.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificData.java (original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificData.java Fri Jan 28 01:04:53 2011
@@ -20,8 +20,6 @@ package org.apache.avro.specific;
 import java.util.List;
 import java.util.ArrayList;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
 import org.apache.avro.Schema;

Modified: avro/trunk/lang/java/mapred/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/pom.xml?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/mapred/pom.xml (original)
+++ avro/trunk/lang/java/mapred/pom.xml Fri Jan 28 01:04:53 2011
@@ -56,7 +56,7 @@
         <version>${project.version}</version>
         <executions>
           <execution>
-            <id>schemas</id>
+            <id>test-schemas</id>
             <phase>generate-sources</phase>
             <goals>
               <goal>schema</goal>
@@ -69,6 +69,20 @@
               <testOutputDirectory>${project.build.directory}/generated-test-sources/java</testOutputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>mapred-schema</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>protocol</goal>
+            </goals>
+            <configuration>  
+              <includes>
+                <include>**/mapred/tether/*.avpr</include>
+              </includes>
+              <sourceDirectory>${parent.project.basedir}/../../../../share/schemas/</sourceDirectory>
+              <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>a
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>

Modified: avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java (original)
+++ avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java Fri Jan 28 01:04:53 2011
@@ -41,8 +41,8 @@ import org.apache.avro.ipc.Transceiver;
 import org.apache.avro.ipc.SocketTransceiver;
 import org.apache.avro.ipc.Server;
 import org.apache.avro.ipc.SocketServer;
-import org.apache.avro.specific.SpecificRequestor;
-import org.apache.avro.specific.SpecificResponder;
+import org.apache.avro.ipc.specific.SpecificRequestor;
+import org.apache.avro.ipc.specific.SpecificResponder;
 
 class TetheredProcess  {
 

Modified: avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTask.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTask.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTask.java (original)
+++ avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTask.java Fri Jan 28 01:04:53 2011
@@ -29,13 +29,13 @@ import org.slf4j.LoggerFactory;
 import org.apache.avro.Schema;
 import org.apache.avro.util.Utf8;
 import org.apache.avro.ipc.Transceiver;
-import org.apache.avro.ipc.SocketTransceiver;
+import org.apache.avro.ipc.SaslSocketTransceiver;
+import org.apache.avro.ipc.specific.SpecificRequestor;
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.BinaryDecoder;
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.specific.SpecificDatumReader;
 import org.apache.avro.specific.SpecificDatumWriter;
-import org.apache.avro.specific.SpecificRequestor;
 
 /** Base class for Java tether mapreduce programs.  Useless except for testing,
  * since it's already possible to write Java MapReduce programs without
@@ -99,7 +99,7 @@ public abstract class TetherTask<IN,MID,
       throw new RuntimeException("AVRO_TETHER_OUTPUT_PORT env var is null");
     int clientPort = Integer.parseInt(clientPortString);
     this.clientTransceiver =
-      new SocketTransceiver(new InetSocketAddress(clientPort));
+      new SaslSocketTransceiver(new InetSocketAddress(clientPort));
     this.outputClient = SpecificRequestor.getClient(OutputProtocol.class, clientTransceiver);
 
     // send inputPort to parent

Modified: avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTaskRunner.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTaskRunner.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTaskRunner.java (original)
+++ avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TetherTaskRunner.java Fri Jan 28 01:04:53 2011
@@ -25,8 +25,8 @@ import java.nio.ByteBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.avro.ipc.SocketServer;
-import org.apache.avro.specific.SpecificResponder;
+import org.apache.avro.ipc.SaslSocketServer;
+import org.apache.avro.ipc.specific.SpecificResponder;
 
 /** Java implementation of a tether executable.  Useless except for testing,
  * since it's already possible to write Java MapReduce programs without
@@ -35,14 +35,14 @@ import org.apache.avro.specific.Specific
 public class TetherTaskRunner implements InputProtocol {
   static final Logger LOG = LoggerFactory.getLogger(TetherTaskRunner.class);
 
-  private SocketServer inputServer;
+  private SaslSocketServer inputServer;
   private TetherTask task;
 
   public TetherTaskRunner(TetherTask task) throws IOException {
     this.task = task;
 
     // start input server
-    this.inputServer = new SocketServer
+    this.inputServer = new SaslSocketServer
       (new SpecificResponder(InputProtocol.class, this),
        new InetSocketAddress(0));
     inputServer.start();

Modified: avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/IDLProtocolMojo.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/IDLProtocolMojo.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/IDLProtocolMojo.java (original)
+++ avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/IDLProtocolMojo.java Fri Jan 28 01:04:53 2011
@@ -22,9 +22,9 @@ import java.io.File;
 import java.io.IOException;
 
 import org.apache.avro.Protocol;
-import org.apache.avro.idl.Idl;
-import org.apache.avro.idl.ParseException;
-import org.apache.avro.specific.SpecificCompiler;
+import org.apache.avro.compiler.idl.Idl;
+import org.apache.avro.compiler.idl.ParseException;
+import org.apache.avro.compiler.specific.SpecificCompiler;
 
 /**
  * Compile an Avro schema file.

Modified: avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java (original)
+++ avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java Fri Jan 28 01:04:53 2011
@@ -21,7 +21,7 @@ package org.apache.avro.mojo;
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.avro.specific.SpecificCompiler;
+import org.apache.avro.compiler.specific.SpecificCompiler;
 
 /**
  * Compile an Avro protocol schema file.

Modified: avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java (original)
+++ avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java Fri Jan 28 01:04:53 2011
@@ -21,7 +21,7 @@ package org.apache.avro.mojo;
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.avro.specific.SpecificCompiler;
+import org.apache.avro.compiler.specific.SpecificCompiler;
 
 /**
  * Compile an Avro schema file.

Modified: avro/trunk/lang/java/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/pom.xml?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/pom.xml (original)
+++ avro/trunk/lang/java/pom.xml Fri Jan 28 01:04:53 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>7</version>
+    <version>8</version>
   </parent>
 
   <groupId>org.apache.avro</groupId>

Modified: avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/IdlTool.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/IdlTool.java?rev=1064397&r1=1064396&r2=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/IdlTool.java (original)
+++ avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/IdlTool.java Fri Jan 28 01:04:53 2011
@@ -19,7 +19,7 @@
 package org.apache.avro.tool;
 
 import org.apache.avro.Protocol;
-import org.apache.avro.idl.Idl;
+import org.apache.avro.compiler.idl.Idl;
 
 import java.io.File;
 import java.io.FileOutputStream;

Copied: avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/InduceSchemaTool.java (from r1063989, avro/trunk/lang/java/avro/src/main/java/org/apache/avro/reflect/InduceSchemaTool.java)
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/InduceSchemaTool.java?p2=avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/InduceSchemaTool.java&p1=avro/trunk/lang/java/avro/src/main/java/org/apache/avro/reflect/InduceSchemaTool.java&r1=1063989&r2=1064397&rev=1064397&view=diff
==============================================================================
--- avro/trunk/lang/java/avro/src/main/java/org/apache/avro/reflect/InduceSchemaTool.java (original)
+++ avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/InduceSchemaTool.java Fri Jan 28 01:04:53 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.avro.reflect;
+package org.apache.avro.tool;
 
 import java.io.File;
 import java.io.InputStream;
@@ -24,7 +24,7 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.List;
 
-import org.apache.avro.tool.Tool;
+import org.apache.avro.reflect.ReflectData;
 
 /**
  * Utility to induce a schema from a class or a protocol from an interface.



Mime
View raw message