THRIFT-34 Java libraries should be namespaced under org.apache.thrift, not com.facebook.thrift

Library classes and tests have been moved to the proper package and directory structure, and references to com.facebook.thrift where replaced with org.apache.thrift throughout the code. The fb303 contrib project still contains com.facebook packages.



git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@734855 13f79535-47bb-0310-9956-ffa450edef68

72 files changed, 249 insertions, 249 deletions

diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc
index cf1ea1963..5f2c99951 100644
--- a/compiler/cpp/src/generate/t_java_generator.cc
+++ b/compiler/cpp/src/generate/t_java_generator.cc
@@ -228,7 +228,7 @@ void t_java_generator::init_generator() {
 /**
  * Packages the generated file
  *
- * @return String of the package, i.e. "package com.facebook.thriftdemo;"
+ * @return String of the package, i.e. "package org.apache.thriftdemo;"
  */
 string t_java_generator::java_package() {
   if (!package_name_.empty()) {
@@ -258,7 +258,7 @@ string t_java_generator::java_type_imports() {
     "import java.util.HashSet;\n" +
     "import java.util.Collections;\n" +
     hash_builder +
-    "import com.facebook.thrift.*;\n\n";
+    "import org.apache.thrift.*;\n\n";
 }
 
 /**
@@ -269,8 +269,8 @@ string t_java_generator::java_type_imports() {
 string t_java_generator::java_thrift_imports() {
   return
     string() +
-    "import com.facebook.thrift.protocol.*;\n" +
-    "import com.facebook.thrift.transport.*;\n\n";
+    "import org.apache.thrift.protocol.*;\n" +
+    "import org.apache.thrift.transport.*;\n\n";
 }
 
 /**
diff --git a/contrib/fb303/java/Constants.java b/contrib/fb303/java/Constants.java
index d1e8c73c7..79034b490 100644
--- a/contrib/fb303/java/Constants.java
+++ b/contrib/fb303/java/Constants.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.HashSet;
-import com.facebook.thrift.*;
+import org.apache.thrift.*;
 
 public class Constants {
 
diff --git a/contrib/fb303/java/FacebookBase.java b/contrib/fb303/java/FacebookBase.java
index c9fe43ba0..50c38ae63 100644
--- a/contrib/fb303/java/FacebookBase.java
+++ b/contrib/fb303/java/FacebookBase.java
@@ -83,8 +83,8 @@ public abstract class FacebookBase implements FacebookService.Iface {
     return "";
   }
 
-  public com.facebook.thrift.reflection.limited.Service getLimitedReflection() {
-    return new com.facebook.thrift.reflection.limited.Service();
+  public org.apache.thrift.reflection.limited.Service getLimitedReflection() {
+    return new org.apache.thrift.reflection.limited.Service();
   }
 
   public void reinitialize() {}
diff --git a/contrib/fb303/java/FacebookService.java b/contrib/fb303/java/FacebookService.java
index b7a23ddb1..50d19f8af 100644
--- a/contrib/fb303/java/FacebookService.java
+++ b/contrib/fb303/java/FacebookService.java
@@ -9,10 +9,10 @@ import java.util.ArrayList;
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.HashSet;
-import com.facebook.thrift.*;
+import org.apache.thrift.*;
 
-import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
+import org.apache.thrift.protocol.*;
+import org.apache.thrift.transport.*;
 
 public class FacebookService {
 
@@ -27,7 +27,7 @@ public class FacebookService {
     public String getOption(String key) throws TException;
     public AbstractMap<String,String> getOptions() throws TException;
     public long aliveSince() throws TException;
-    public com.facebook.thrift.reflection.limited.Service getLimitedReflection() throws TException;
+    public org.apache.thrift.reflection.limited.Service getLimitedReflection() throws TException;
     public void reinitialize() throws TException;
     public void shutdown() throws TException;
   }
@@ -370,7 +370,7 @@ public class FacebookService {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "aliveSince failed: unknown result");
     }
 
-    public com.facebook.thrift.reflection.limited.Service getLimitedReflection() throws TException
+    public org.apache.thrift.reflection.limited.Service getLimitedReflection() throws TException
     {
       send_getLimitedReflection();
       return recv_getLimitedReflection();
@@ -385,7 +385,7 @@ public class FacebookService {
       oprot_.getTransport().flush();
     }
 
-    public com.facebook.thrift.reflection.limited.Service recv_getLimitedReflection() throws TException
+    public org.apache.thrift.reflection.limited.Service recv_getLimitedReflection() throws TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -1906,7 +1906,7 @@ public class FacebookService {
   }
 
   public static class getLimitedReflection_result   {
-    public com.facebook.thrift.reflection.limited.Service success;
+    public org.apache.thrift.reflection.limited.Service success;
 
     public final Isset __isset = new Isset();
     public final class Isset {
@@ -1929,7 +1929,7 @@ public class FacebookService {
         {
           case 0:
             if (field.type == TType.STRUCT) {
-              this.success = new com.facebook.thrift.reflection.limited.Service();
+              this.success = new org.apache.thrift.reflection.limited.Service();
               this.success.read(iprot);
               this.__isset.success = true;
             } else { 
diff --git a/lib/java/src/com/facebook/thrift/FieldMetaData.java b/lib/java/src/org/apache/thrift/FieldMetaData.java
index de530d647..246989233 100644
--- a/lib/java/src/com/facebook/thrift/FieldMetaData.java
+++ b/lib/java/src/org/apache/thrift/FieldMetaData.java
@@ -1,4 +1,4 @@
-package com.facebook.thrift;
+package org.apache.thrift;
 
 public class FieldMetaData implements java.io.Serializable {
   public final String fieldName;
diff --git a/lib/java/src/com/facebook/thrift/TApplicationException.java b/lib/java/src/org/apache/thrift/TApplicationException.java
index fed9a634b..e2b34b96e 100644
--- a/lib/java/src/com/facebook/thrift/TApplicationException.java
+++ b/lib/java/src/org/apache/thrift/TApplicationException.java
@@ -4,13 +4,13 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift;
+package org.apache.thrift;
 
-import com.facebook.thrift.protocol.TField;
-import com.facebook.thrift.protocol.TProtocol;
-import com.facebook.thrift.protocol.TProtocolUtil;
-import com.facebook.thrift.protocol.TStruct;
-import com.facebook.thrift.protocol.TType;
+import org.apache.thrift.protocol.TField;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TProtocolUtil;
+import org.apache.thrift.protocol.TStruct;
+import org.apache.thrift.protocol.TType;
 
 /**
  * Application level exception
diff --git a/lib/java/src/com/facebook/thrift/TBase.java b/lib/java/src/org/apache/thrift/TBase.java
index 6a30ae080..faf1435b0 100644
--- a/lib/java/src/com/facebook/thrift/TBase.java
+++ b/lib/java/src/org/apache/thrift/TBase.java
@@ -4,9 +4,9 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift;
+package org.apache.thrift;
 
-import com.facebook.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TProtocol;
 
 /**
  * Generic base interface for generated Thrift objects.
diff --git a/lib/java/src/com/facebook/thrift/TByteArrayOutputStream.java b/lib/java/src/org/apache/thrift/TByteArrayOutputStream.java
index 4d3ffbf93..08eda02d7 100644
--- a/lib/java/src/com/facebook/thrift/TByteArrayOutputStream.java
+++ b/lib/java/src/org/apache/thrift/TByteArrayOutputStream.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift;
+package org.apache.thrift;
 
 import java.io.ByteArrayOutputStream;
 
diff --git a/lib/java/src/com/facebook/thrift/TDeserializer.java b/lib/java/src/org/apache/thrift/TDeserializer.java
index 99fd056d0..bb6a0e516 100644
--- a/lib/java/src/com/facebook/thrift/TDeserializer.java
+++ b/lib/java/src/org/apache/thrift/TDeserializer.java
@@ -4,14 +4,14 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift;
+package org.apache.thrift;
 
 import java.io.ByteArrayInputStream;
 import java.io.UnsupportedEncodingException;
 
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.protocol.TProtocolFactory;
-import com.facebook.thrift.transport.TIOStreamTransport;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.transport.TIOStreamTransport;
 
 /**
  * Generic utility for easily deserializing objects from a byte array or Java
diff --git a/lib/java/src/com/facebook/thrift/TException.java b/lib/java/src/org/apache/thrift/TException.java
index 4a7b1a513..f62bd5d90 100644
--- a/lib/java/src/com/facebook/thrift/TException.java
+++ b/lib/java/src/org/apache/thrift/TException.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift;
+package org.apache.thrift;
 
 /**
  * Generic exception class for Thrift.
diff --git a/lib/java/src/com/facebook/thrift/TProcessor.java b/lib/java/src/org/apache/thrift/TProcessor.java
index 973f1d008..030e4a62b 100644
--- a/lib/java/src/com/facebook/thrift/TProcessor.java
+++ b/lib/java/src/org/apache/thrift/TProcessor.java
@@ -4,9 +4,9 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift;
+package org.apache.thrift;
 
-import com.facebook.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TProtocol;
 
 /**
  * A processor is a generic object which operates upon an input stream and
diff --git a/lib/java/src/com/facebook/thrift/TProcessorFactory.java b/lib/java/src/org/apache/thrift/TProcessorFactory.java
index 5bac1ba55..057435d1d 100644
--- a/lib/java/src/com/facebook/thrift/TProcessorFactory.java
+++ b/lib/java/src/org/apache/thrift/TProcessorFactory.java
@@ -4,9 +4,9 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift;
+package org.apache.thrift;
 
-import com.facebook.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransport;
 
 /**
  * The default processor factory just returns a singleton
diff --git a/lib/java/src/com/facebook/thrift/TSerializer.java b/lib/java/src/org/apache/thrift/TSerializer.java
index 1df068dfe..0653305ba 100644
--- a/lib/java/src/com/facebook/thrift/TSerializer.java
+++ b/lib/java/src/org/apache/thrift/TSerializer.java
@@ -4,15 +4,15 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift;
+package org.apache.thrift;
 
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
 
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.protocol.TProtocol;
-import com.facebook.thrift.protocol.TProtocolFactory;
-import com.facebook.thrift.transport.TIOStreamTransport;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.transport.TIOStreamTransport;
 
 /**
  * Generic utility for easily serializing objects into a byte array or Java
diff --git a/lib/java/src/com/facebook/thrift/protocol/TBase64Utils.java b/lib/java/src/org/apache/thrift/protocol/TBase64Utils.java
index f3fc1c3e1..6b12152ae 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TBase64Utils.java
+++ b/lib/java/src/org/apache/thrift/protocol/TBase64Utils.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
 /**
  * Class for encoding and decoding Base64 data.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TBinaryProtocol.java b/lib/java/src/org/apache/thrift/protocol/TBinaryProtocol.java
index d8c9473d8..36fb566dc 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TBinaryProtocol.java
+++ b/lib/java/src/org/apache/thrift/protocol/TBinaryProtocol.java
@@ -4,12 +4,12 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
 import java.io.UnsupportedEncodingException;
 
-import com.facebook.thrift.TException;
-import com.facebook.thrift.transport.TTransport;
+import org.apache.thrift.TException;
+import org.apache.thrift.transport.TTransport;
 
 /**
  * Binary protocol implementation for thrift.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TField.java b/lib/java/src/org/apache/thrift/protocol/TField.java
index 85675e006..d74b0cee7 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TField.java
+++ b/lib/java/src/org/apache/thrift/protocol/TField.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
 /**
  * Helper class that encapsulates field metadata.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TJSONProtocol.java b/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java
index 1e51dd21d..b66b8f6c1 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TJSONProtocol.java
+++ b/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java
@@ -4,11 +4,11 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
-import com.facebook.thrift.TException;
-import com.facebook.thrift.TByteArrayOutputStream;
-import com.facebook.thrift.transport.TTransport;
+import org.apache.thrift.TException;
+import org.apache.thrift.TByteArrayOutputStream;
+import org.apache.thrift.transport.TTransport;
 import java.io.UnsupportedEncodingException;
 import java.util.Stack;
 
diff --git a/lib/java/src/com/facebook/thrift/protocol/TList.java b/lib/java/src/org/apache/thrift/protocol/TList.java
index 3fe85990f..4d356e96c 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TList.java
+++ b/lib/java/src/org/apache/thrift/protocol/TList.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
 /**
  * Helper class that encapsulates list metadata.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TMap.java b/lib/java/src/org/apache/thrift/protocol/TMap.java
index 9b7126e00..964eb7971 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TMap.java
+++ b/lib/java/src/org/apache/thrift/protocol/TMap.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
 /**
  * Helper class that encapsulates map metadata.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TMessage.java b/lib/java/src/org/apache/thrift/protocol/TMessage.java
index 9f1fec129..fa933946f 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TMessage.java
+++ b/lib/java/src/org/apache/thrift/protocol/TMessage.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
 /**
  * Helper class that encapsulates struct metadata.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TMessageType.java b/lib/java/src/org/apache/thrift/protocol/TMessageType.java
index 2b4c8cd70..62f6e3056 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TMessageType.java
+++ b/lib/java/src/org/apache/thrift/protocol/TMessageType.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
 /**
  * Message type constants in the Thrift protocol.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TProtocol.java b/lib/java/src/org/apache/thrift/protocol/TProtocol.java
index 551ef507c..412aa4312 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TProtocol.java
+++ b/lib/java/src/org/apache/thrift/protocol/TProtocol.java
@@ -4,10 +4,10 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
-import com.facebook.thrift.TException;
-import com.facebook.thrift.transport.TTransport;
+import org.apache.thrift.TException;
+import org.apache.thrift.transport.TTransport;
 
 /**
  * Protocol interface definition.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TProtocolException.java b/lib/java/src/org/apache/thrift/protocol/TProtocolException.java
index cea786a7a..2228b5c82 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TProtocolException.java
+++ b/lib/java/src/org/apache/thrift/protocol/TProtocolException.java
@@ -4,9 +4,9 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
-import com.facebook.thrift.TException;
+import org.apache.thrift.TException;
 
 /**
  * Protocol exceptions.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TProtocolFactory.java b/lib/java/src/org/apache/thrift/protocol/TProtocolFactory.java
index 09ffb2275..6a77ebab3 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TProtocolFactory.java
+++ b/lib/java/src/org/apache/thrift/protocol/TProtocolFactory.java
@@ -4,9 +4,9 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
-import com.facebook.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransport;
 
 /**
  * Factory interface for constructing protocol instances.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TProtocolUtil.java b/lib/java/src/org/apache/thrift/protocol/TProtocolUtil.java
index dc4aeebdd..fe2ea9f39 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TProtocolUtil.java
+++ b/lib/java/src/org/apache/thrift/protocol/TProtocolUtil.java
@@ -4,9 +4,9 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
-import com.facebook.thrift.TException;
+import org.apache.thrift.TException;
 
 /**
  * Utility class with static methods for interacting with protocol data
diff --git a/lib/java/src/com/facebook/thrift/protocol/TSet.java b/lib/java/src/org/apache/thrift/protocol/TSet.java
index c40ef714d..6f14154b3 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TSet.java
+++ b/lib/java/src/org/apache/thrift/protocol/TSet.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
 /**
  * Helper class that encapsulates set metadata.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TSimpleJSONProtocol.java b/lib/java/src/org/apache/thrift/protocol/TSimpleJSONProtocol.java
index b577c0d98..1a5167ce6 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TSimpleJSONProtocol.java
+++ b/lib/java/src/org/apache/thrift/protocol/TSimpleJSONProtocol.java
@@ -4,13 +4,13 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Stack;
 
-import com.facebook.thrift.TException;
-import com.facebook.thrift.transport.TTransport;
+import org.apache.thrift.TException;
+import org.apache.thrift.transport.TTransport;
 
 /**
  * JSON protocol implementation for thrift.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TStruct.java b/lib/java/src/org/apache/thrift/protocol/TStruct.java
index 6832babe7..2a8f869ef 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TStruct.java
+++ b/lib/java/src/org/apache/thrift/protocol/TStruct.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
 /**
  * Helper class that encapsulates struct metadata.
diff --git a/lib/java/src/com/facebook/thrift/protocol/TType.java b/lib/java/src/org/apache/thrift/protocol/TType.java
index 4a0f0d09a..dfa4a5d6e 100644
--- a/lib/java/src/com/facebook/thrift/protocol/TType.java
+++ b/lib/java/src/org/apache/thrift/protocol/TType.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.protocol;
+package org.apache.thrift.protocol;
 
 /**
  * Type constants in the Thrift protocol.
diff --git a/lib/java/src/com/facebook/thrift/reflection/limited/Argument.java b/lib/java/src/org/apache/thrift/reflection/limited/Argument.java
index 2a485e82a..9dc7d951d 100644
--- a/lib/java/src/com/facebook/thrift/reflection/limited/Argument.java
+++ b/lib/java/src/org/apache/thrift/reflection/limited/Argument.java
@@ -3,16 +3,16 @@
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
-package com.facebook.thrift.reflection.limited;
+package org.apache.thrift.reflection.limited;
 
 import java.util.ArrayList;
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.HashSet;
-import com.facebook.thrift.*;
+import org.apache.thrift.*;
 
-import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
+import org.apache.thrift.protocol.*;
+import org.apache.thrift.transport.*;
 
 public class Argument implements java.io.Serializable {
   public short key;
diff --git a/lib/java/src/com/facebook/thrift/reflection/limited/Constants.java b/lib/java/src/org/apache/thrift/reflection/limited/Constants.java
index 669abac5a..2e6cc5189 100644
--- a/lib/java/src/com/facebook/thrift/reflection/limited/Constants.java
+++ b/lib/java/src/org/apache/thrift/reflection/limited/Constants.java
@@ -3,13 +3,13 @@
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
-package com.facebook.thrift.reflection.limited;
+package org.apache.thrift.reflection.limited;
 
 import java.util.ArrayList;
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.HashSet;
-import com.facebook.thrift.*;
+import org.apache.thrift.*;
 
 public class Constants {
 
diff --git a/lib/java/src/com/facebook/thrift/reflection/limited/ContainerType.java b/lib/java/src/org/apache/thrift/reflection/limited/ContainerType.java
index 6c8bcc319..c006dc3f1 100644
--- a/lib/java/src/com/facebook/thrift/reflection/limited/ContainerType.java
+++ b/lib/java/src/org/apache/thrift/reflection/limited/ContainerType.java
@@ -3,16 +3,16 @@
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
-package com.facebook.thrift.reflection.limited;
+package org.apache.thrift.reflection.limited;
 
 import java.util.ArrayList;
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.HashSet;
-import com.facebook.thrift.*;
+import org.apache.thrift.*;
 
-import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
+import org.apache.thrift.protocol.*;
+import org.apache.thrift.transport.*;
 
 public class ContainerType implements java.io.Serializable {
   public int ttype;
diff --git a/lib/java/src/com/facebook/thrift/reflection/limited/Method.java b/lib/java/src/org/apache/thrift/reflection/limited/Method.java
index 41fa6ca15..34d9164c1 100644
--- a/lib/java/src/com/facebook/thrift/reflection/limited/Method.java
+++ b/lib/java/src/org/apache/thrift/reflection/limited/Method.java
@@ -3,16 +3,16 @@
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
-package com.facebook.thrift.reflection.limited;
+package org.apache.thrift.reflection.limited;
 
 import java.util.ArrayList;
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.HashSet;
-import com.facebook.thrift.*;
+import org.apache.thrift.*;
 
-import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
+import org.apache.thrift.protocol.*;
+import org.apache.thrift.transport.*;
 
 public class Method implements java.io.Serializable {
   public String name;
diff --git a/lib/java/src/com/facebook/thrift/reflection/limited/Service.java b/lib/java/src/org/apache/thrift/reflection/limited/Service.java
index fcbd09cef..dd5f901e4 100644
--- a/lib/java/src/com/facebook/thrift/reflection/limited/Service.java
+++ b/lib/java/src/org/apache/thrift/reflection/limited/Service.java
@@ -3,16 +3,16 @@
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
-package com.facebook.thrift.reflection.limited;
+package org.apache.thrift.reflection.limited;
 
 import java.util.ArrayList;
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.HashSet;
-import com.facebook.thrift.*;
+import org.apache.thrift.*;
 
-import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
+import org.apache.thrift.protocol.*;
+import org.apache.thrift.transport.*;
 
 public class Service implements java.io.Serializable {
   public String name;
diff --git a/lib/java/src/com/facebook/thrift/reflection/limited/SimpleType.java b/lib/java/src/org/apache/thrift/reflection/limited/SimpleType.java
index 2a69e3927..3cbdd894d 100644
--- a/lib/java/src/com/facebook/thrift/reflection/limited/SimpleType.java
+++ b/lib/java/src/org/apache/thrift/reflection/limited/SimpleType.java
@@ -3,16 +3,16 @@
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
-package com.facebook.thrift.reflection.limited;
+package org.apache.thrift.reflection.limited;
 
 import java.util.ArrayList;
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.HashSet;
-import com.facebook.thrift.*;
+import org.apache.thrift.*;
 
-import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
+import org.apache.thrift.protocol.*;
+import org.apache.thrift.transport.*;
 
 public class SimpleType implements java.io.Serializable {
   public int ttype;
diff --git a/lib/java/src/com/facebook/thrift/reflection/limited/TTypeTag.java b/lib/java/src/org/apache/thrift/reflection/limited/TTypeTag.java
index c9095f556..e196c78f4 100644
--- a/lib/java/src/com/facebook/thrift/reflection/limited/TTypeTag.java
+++ b/lib/java/src/org/apache/thrift/reflection/limited/TTypeTag.java
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
-package com.facebook.thrift.reflection.limited;
+package org.apache.thrift.reflection.limited;
 
 
 public class TTypeTag {
diff --git a/lib/java/src/com/facebook/thrift/reflection/limited/ThriftType.java b/lib/java/src/org/apache/thrift/reflection/limited/ThriftType.java
index 63022ec0d..91586df5f 100644
--- a/lib/java/src/com/facebook/thrift/reflection/limited/ThriftType.java
+++ b/lib/java/src/org/apache/thrift/reflection/limited/ThriftType.java
@@ -3,16 +3,16 @@
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
-package com.facebook.thrift.reflection.limited;
+package org.apache.thrift.reflection.limited;
 
 import java.util.ArrayList;
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.HashSet;
-import com.facebook.thrift.*;
+import org.apache.thrift.*;
 
-import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
+import org.apache.thrift.protocol.*;
+import org.apache.thrift.transport.*;
 
 public class ThriftType implements java.io.Serializable {
   public boolean is_container;
diff --git a/lib/java/src/com/facebook/thrift/server/THsHaServer.java b/lib/java/src/org/apache/thrift/server/THsHaServer.java
index 8790d8453..ccb4a8e57 100644
--- a/lib/java/src/com/facebook/thrift/server/THsHaServer.java
+++ b/lib/java/src/org/apache/thrift/server/THsHaServer.java
@@ -1,18 +1,18 @@
 
-package com.facebook.thrift.server;
-
-import com.facebook.thrift.TException;
-import com.facebook.thrift.TProcessor;
-import com.facebook.thrift.TProcessorFactory;
-import com.facebook.thrift.protocol.TProtocol;
-import com.facebook.thrift.protocol.TProtocolFactory;
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.transport.TNonblockingServerTransport;
-import com.facebook.thrift.transport.TTransport;
-import com.facebook.thrift.transport.TFramedTransport;
-import com.facebook.thrift.transport.TNonblockingTransport;
-import com.facebook.thrift.transport.TTransportException;
-import com.facebook.thrift.transport.TTransportFactory;
+package org.apache.thrift.server;
+
+import org.apache.thrift.TException;
+import org.apache.thrift.TProcessor;
+import org.apache.thrift.TProcessorFactory;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.transport.TNonblockingServerTransport;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TNonblockingTransport;
+import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.transport.TTransportFactory;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
diff --git a/lib/java/src/com/facebook/thrift/server/TNonblockingServer.java b/lib/java/src/org/apache/thrift/server/TNonblockingServer.java
index 8e9d3bd17..21859807a 100644
--- a/lib/java/src/com/facebook/thrift/server/TNonblockingServer.java
+++ b/lib/java/src/org/apache/thrift/server/TNonblockingServer.java
@@ -1,20 +1,20 @@
 
-package com.facebook.thrift.server;
-
-import com.facebook.thrift.TException;
-import com.facebook.thrift.TProcessor;
-import com.facebook.thrift.TProcessorFactory;
-import com.facebook.thrift.protocol.TProtocol;
-import com.facebook.thrift.protocol.TProtocolFactory;
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.transport.TNonblockingServerTransport;
-import com.facebook.thrift.transport.TIOStreamTransport;
-import com.facebook.thrift.transport.TTransport;
-import com.facebook.thrift.transport.TFramedTransport;
-import com.facebook.thrift.transport.TNonblockingTransport;
-import com.facebook.thrift.transport.TTransportException;
-import com.facebook.thrift.transport.TTransportFactory;
-import com.facebook.thrift.TByteArrayOutputStream;
+package org.apache.thrift.server;
+
+import org.apache.thrift.TException;
+import org.apache.thrift.TProcessor;
+import org.apache.thrift.TProcessorFactory;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.transport.TNonblockingServerTransport;
+import org.apache.thrift.transport.TIOStreamTransport;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TNonblockingTransport;
+import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.transport.TTransportFactory;
+import org.apache.thrift.TByteArrayOutputStream;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
diff --git a/lib/java/src/com/facebook/thrift/server/TServer.java b/lib/java/src/org/apache/thrift/server/TServer.java
index c066607c6..d4ec10c7e 100644
--- a/lib/java/src/com/facebook/thrift/server/TServer.java
+++ b/lib/java/src/org/apache/thrift/server/TServer.java
@@ -4,13 +4,13 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.server;
+package org.apache.thrift.server;
 
-import com.facebook.thrift.TProcessorFactory;
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.protocol.TProtocolFactory;
-import com.facebook.thrift.transport.TServerTransport;
-import com.facebook.thrift.transport.TTransportFactory;
+import org.apache.thrift.TProcessorFactory;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.transport.TServerTransport;
+import org.apache.thrift.transport.TTransportFactory;
 
 /**
  * Generic interface for a Thrift server.
diff --git a/lib/java/src/com/facebook/thrift/server/TSimpleServer.java b/lib/java/src/org/apache/thrift/server/TSimpleServer.java
index 1c252610c..3f8da13a5 100644
--- a/lib/java/src/com/facebook/thrift/server/TSimpleServer.java
+++ b/lib/java/src/org/apache/thrift/server/TSimpleServer.java
@@ -4,20 +4,20 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.server;
+package org.apache.thrift.server;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.facebook.thrift.TException;
-import com.facebook.thrift.TProcessor;
-import com.facebook.thrift.TProcessorFactory;
-import com.facebook.thrift.protocol.TProtocol;
-import com.facebook.thrift.protocol.TProtocolFactory;
-import com.facebook.thrift.transport.TServerTransport;
-import com.facebook.thrift.transport.TTransport;
-import com.facebook.thrift.transport.TTransportFactory;
-import com.facebook.thrift.transport.TTransportException;
+import org.apache.thrift.TException;
+import org.apache.thrift.TProcessor;
+import org.apache.thrift.TProcessorFactory;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.transport.TServerTransport;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportFactory;
+import org.apache.thrift.transport.TTransportException;
 
 /**
  * Simple singlethreaded server for testing.
diff --git a/lib/java/src/com/facebook/thrift/server/TThreadPoolServer.java b/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
index 13f83a121..83c95ae27 100644
--- a/lib/java/src/com/facebook/thrift/server/TThreadPoolServer.java
+++ b/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
@@ -4,18 +4,18 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.server;
-
-import com.facebook.thrift.TException;
-import com.facebook.thrift.TProcessor;
-import com.facebook.thrift.TProcessorFactory;
-import com.facebook.thrift.protocol.TProtocol;
-import com.facebook.thrift.protocol.TProtocolFactory;
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.transport.TServerTransport;
-import com.facebook.thrift.transport.TTransport;
-import com.facebook.thrift.transport.TTransportException;
-import com.facebook.thrift.transport.TTransportFactory;
+package org.apache.thrift.server;
+
+import org.apache.thrift.TException;
+import org.apache.thrift.TProcessor;
+import org.apache.thrift.TProcessorFactory;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.transport.TServerTransport;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.transport.TTransportFactory;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
diff --git a/lib/java/src/com/facebook/thrift/transport/TFramedTransport.java b/lib/java/src/org/apache/thrift/transport/TFramedTransport.java
index dbb9e5f24..f7ff5ac77 100644
--- a/lib/java/src/com/facebook/thrift/transport/TFramedTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TFramedTransport.java
@@ -4,11 +4,11 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
 import java.io.ByteArrayInputStream;
 
-import com.facebook.thrift.TByteArrayOutputStream;
+import org.apache.thrift.TByteArrayOutputStream;
 
 /**
  * Socket implementation of the TTransport interface. To be commented soon!
diff --git a/lib/java/src/com/facebook/thrift/transport/THttpClient.java b/lib/java/src/org/apache/thrift/transport/THttpClient.java
index ab3893db7..100cb9c99 100644
--- a/lib/java/src/com/facebook/thrift/transport/THttpClient.java
+++ b/lib/java/src/org/apache/thrift/transport/THttpClient.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
diff --git a/lib/java/src/com/facebook/thrift/transport/TIOStreamTransport.java b/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
index fd561ed2c..717f48e5b 100644
--- a/lib/java/src/com/facebook/thrift/transport/TIOStreamTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/lib/java/src/com/facebook/thrift/transport/TMemoryBuffer.java b/lib/java/src/org/apache/thrift/transport/TMemoryBuffer.java
index d558f6bed..ed3c8442e 100644
--- a/lib/java/src/com/facebook/thrift/transport/TMemoryBuffer.java
+++ b/lib/java/src/org/apache/thrift/transport/TMemoryBuffer.java
@@ -4,9 +4,9 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
-import com.facebook.thrift.TByteArrayOutputStream;
+import org.apache.thrift.TByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
 
 /**
diff --git a/lib/java/src/com/facebook/thrift/transport/TNonblockingServerSocket.java b/lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java
index 44ed0d8d6..9e1af698c 100644
--- a/lib/java/src/com/facebook/thrift/transport/TNonblockingServerSocket.java
+++ b/lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java
@@ -1,5 +1,5 @@
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/lib/java/src/com/facebook/thrift/transport/TNonblockingServerTransport.java b/lib/java/src/org/apache/thrift/transport/TNonblockingServerTransport.java
index 7911851cb..60e43a2d3 100644
--- a/lib/java/src/com/facebook/thrift/transport/TNonblockingServerTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TNonblockingServerTransport.java
@@ -1,5 +1,5 @@
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
 import java.nio.channels.Selector;
 
diff --git a/lib/java/src/com/facebook/thrift/transport/TNonblockingSocket.java b/lib/java/src/org/apache/thrift/transport/TNonblockingSocket.java
index 07c03e3c6..b14b84b1b 100644
--- a/lib/java/src/com/facebook/thrift/transport/TNonblockingSocket.java
+++ b/lib/java/src/org/apache/thrift/transport/TNonblockingSocket.java
@@ -1,5 +1,5 @@
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/lib/java/src/com/facebook/thrift/transport/TNonblockingTransport.java b/lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java
index a70249055..6619c707e 100644
--- a/lib/java/src/com/facebook/thrift/transport/TNonblockingTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java
@@ -1,4 +1,4 @@
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
 import java.io.IOException;
 import java.nio.channels.Selector;
diff --git a/lib/java/src/com/facebook/thrift/transport/TServerSocket.java b/lib/java/src/org/apache/thrift/transport/TServerSocket.java
index b4ad6fb44..d5cee7f9f 100644
--- a/lib/java/src/com/facebook/thrift/transport/TServerSocket.java
+++ b/lib/java/src/org/apache/thrift/transport/TServerSocket.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/lib/java/src/com/facebook/thrift/transport/TServerTransport.java b/lib/java/src/org/apache/thrift/transport/TServerTransport.java
index 872ac3cf9..1730a031e 100644
--- a/lib/java/src/com/facebook/thrift/transport/TServerTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TServerTransport.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
 /**
  * Server transport. Object which provides client transports.
diff --git a/lib/java/src/com/facebook/thrift/transport/TSocket.java b/lib/java/src/org/apache/thrift/transport/TSocket.java
index c30a47862..6a2feb716 100644
--- a/lib/java/src/com/facebook/thrift/transport/TSocket.java
+++ b/lib/java/src/org/apache/thrift/transport/TSocket.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/lib/java/src/com/facebook/thrift/transport/TTransport.java b/lib/java/src/org/apache/thrift/transport/TTransport.java
index 3d911bfc8..fd7e6199a 100644
--- a/lib/java/src/com/facebook/thrift/transport/TTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TTransport.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
 /**
  * Generic class that encapsulates the I/O layer. This is basically a thin
diff --git a/lib/java/src/com/facebook/thrift/transport/TTransportException.java b/lib/java/src/org/apache/thrift/transport/TTransportException.java
index 7a04ae12f..3bbf38e47 100644
--- a/lib/java/src/com/facebook/thrift/transport/TTransportException.java
+++ b/lib/java/src/org/apache/thrift/transport/TTransportException.java
@@ -4,9 +4,9 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
-import com.facebook.thrift.TException;
+import org.apache.thrift.TException;
 
 /**
  * Transport exceptions.
diff --git a/lib/java/src/com/facebook/thrift/transport/TTransportFactory.java b/lib/java/src/org/apache/thrift/transport/TTransportFactory.java
index cbe5808fa..e0883ede1 100644
--- a/lib/java/src/com/facebook/thrift/transport/TTransportFactory.java
+++ b/lib/java/src/org/apache/thrift/transport/TTransportFactory.java
@@ -4,7 +4,7 @@
 // See accompanying file LICENSE or visit the Thrift site at:
 // http://developers.facebook.com/thrift/
 
-package com.facebook.thrift.transport;
+package org.apache.thrift.transport;
 
 /**
  * Factory class used to create wrapped instance of Transports.
diff --git a/test/java/TestClient b/test/java/TestClient
index bcdffa21c..b848755e2 100755
--- a/test/java/TestClient
+++ b/test/java/TestClient
@@ -1,2 +1,2 @@
 #!/bin/bash -v
-java -cp thrifttest.jar:../../lib/java/libthrift.jar com.facebook.thrift.test.TestClient $*
+java -cp thrifttest.jar:../../lib/java/libthrift.jar org.apache.thrift.test.TestClient $*
diff --git a/test/java/TestNonblockingServer b/test/java/TestNonblockingServer
index ee2ba9da9..f2c596b4e 100644
--- a/test/java/TestNonblockingServer
+++ b/test/java/TestNonblockingServer
@@ -1,2 +1,2 @@
 #!/bin/bash -v
-java -server -Xmx256m -cp thrifttest.jar:../../lib/java/libthrift.jar com.facebook.thrift.test.TestNonblockingServer $*
+java -server -Xmx256m -cp thrifttest.jar:../../lib/java/libthrift.jar org.apache.thrift.test.TestNonblockingServer $*
diff --git a/test/java/TestServer b/test/java/TestServer
index 360efdf5f..82a6d2ac3 100755
--- a/test/java/TestServer
+++ b/test/java/TestServer
@@ -1,2 +1,2 @@
 #!/bin/bash -v
-java -server -cp thrifttest.jar:../../lib/java/libthrift.jar com.facebook.thrift.test.TestServer $*
+java -server -cp thrifttest.jar:../../lib/java/libthrift.jar org.apache.thrift.test.TestServer $*
diff --git a/test/java/build.xml b/test/java/build.xml
index 0860d9c7c..b779663a4 100644
--- a/test/java/build.xml
+++ b/test/java/build.xml
@@ -40,17 +40,17 @@
   </target>
 
   <target name="test" depends="compile">
-    <java classname="com.facebook.thrift.test.JSONProtoTest"
+    <java classname="org.apache.thrift.test.JSONProtoTest"
       classpath="${cpath}:${testjar}:${gen}" failonerror="true" />
-    <java classname="com.facebook.thrift.test.IdentityTest"
+    <java classname="org.apache.thrift.test.IdentityTest"
       classpath="${cpath}:${testjar}:${gen}" failonerror="true" />
-    <java classname="com.facebook.thrift.test.EqualityTest"
+    <java classname="org.apache.thrift.test.EqualityTest"
       classpath="${cpath}:${testjar}:${gen}" failonerror="true" />
-    <java classname="com.facebook.thrift.test.ToStringTest"
+    <java classname="org.apache.thrift.test.ToStringTest"
       classpath="${cpath}:${testjar}:${gen}" failonerror="true" />
-    <java classname="com.facebook.thrift.test.DeepCopyTest"
+    <java classname="org.apache.thrift.test.DeepCopyTest"
       classpath="${cpath}:${testjar}:${gen}" failonerror="true" />
-    <java classname="com.facebook.thrift.test.JavaBeansTest"
+    <java classname="org.apache.thrift.test.JavaBeansTest"
       classpath="${cpath}:${testjar}:${gen}" failonerror="true" />
   </target>
 
diff --git a/test/java/src/DeepCopyTest.java b/test/java/src/DeepCopyTest.java
index ac11ffae4..398337365 100644
--- a/test/java/src/DeepCopyTest.java
+++ b/test/java/src/DeepCopyTest.java
@@ -1,9 +1,9 @@
 
-package com.facebook.thrift.test;
+package org.apache.thrift.test;
 
-import com.facebook.thrift.TDeserializer;
-import com.facebook.thrift.TSerializer;
-import com.facebook.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.TDeserializer;
+import org.apache.thrift.TSerializer;
+import org.apache.thrift.protocol.TBinaryProtocol;
 import thrift.test.*;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/test/java/src/EqualityTest.java b/test/java/src/EqualityTest.java
index 8bdba2c06..5ff0d696c 100644
--- a/test/java/src/EqualityTest.java
+++ b/test/java/src/EqualityTest.java
@@ -22,7 +22,7 @@ with open(os.path.join(os.path.dirname(sys.argv[0]), 'EqualityTest.java'), 'w')
   print >> out, "*""/"
 
   print >> out, r'''
-package com.facebook.thrift.test;
+package org.apache.thrift.test;
 
 // Generated code
 import thrift.test.*;
@@ -84,7 +84,7 @@ public class EqualityTest {
 '''
 */
 
-package com.facebook.thrift.test;
+package org.apache.thrift.test;
 
 // Generated code
 import thrift.test.*;
diff --git a/test/java/src/IdentityTest.java b/test/java/src/IdentityTest.java
index 3f64ef7fb..afc114a65 100644
--- a/test/java/src/IdentityTest.java
+++ b/test/java/src/IdentityTest.java
@@ -1,12 +1,12 @@
-package com.facebook.thrift.test;
+package org.apache.thrift.test;
 
 // Generated code
 import thrift.test.*;
 
-import com.facebook.thrift.TSerializer;
-import com.facebook.thrift.TDeserializer;
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.protocol.TSimpleJSONProtocol;
+import org.apache.thrift.TSerializer;
+import org.apache.thrift.TDeserializer;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TSimpleJSONProtocol;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git a/test/java/src/JSONProtoTest.java b/test/java/src/JSONProtoTest.java
index 4177765b8..4dba33f48 100644
--- a/test/java/src/JSONProtoTest.java
+++ b/test/java/src/JSONProtoTest.java
@@ -1,10 +1,10 @@
-package com.facebook.thrift.test;
+package org.apache.thrift.test;
 
 // Generated code
 import thrift.test.*;
 
-import com.facebook.thrift.transport.TMemoryBuffer;
-import com.facebook.thrift.protocol.TJSONProtocol;
+import org.apache.thrift.transport.TMemoryBuffer;
+import org.apache.thrift.protocol.TJSONProtocol;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git a/test/java/src/JavaBeansTest.java b/test/java/src/JavaBeansTest.java
index f1d70a351..707a4c257 100644
--- a/test/java/src/JavaBeansTest.java
+++ b/test/java/src/JavaBeansTest.java
@@ -1,4 +1,4 @@
-package com.facebook.thrift.test;
+package org.apache.thrift.test;
 
 import java.util.LinkedList;
 import thrift.test.OneOfEachBeans;
diff --git a/test/java/src/OverloadNonblockingServer.java b/test/java/src/OverloadNonblockingServer.java
index 26f53546a..49b750915 100644
--- a/test/java/src/OverloadNonblockingServer.java
+++ b/test/java/src/OverloadNonblockingServer.java
@@ -1,16 +1,16 @@
 
-package com.facebook.thrift;
+package org.apache.thrift;
 
 import thrift.test.*;
 
-import com.facebook.thrift.TApplicationException;
-import com.facebook.thrift.TSerializer;
-import com.facebook.thrift.transport.TTransport;
-import com.facebook.thrift.transport.TSocket;
-import com.facebook.thrift.transport.TFramedTransport;
-import com.facebook.thrift.transport.TTransportException;
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.protocol.TSimpleJSONProtocol;
+import org.apache.thrift.TApplicationException;
+import org.apache.thrift.TSerializer;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TSimpleJSONProtocol;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git a/test/java/src/TestClient.java b/test/java/src/TestClient.java
index b092197ef..da638d231 100644
--- a/test/java/src/TestClient.java
+++ b/test/java/src/TestClient.java
@@ -1,17 +1,17 @@
-package com.facebook.thrift.test;
+package org.apache.thrift.test;
 
 // Generated code
 import thrift.test.*;
 
-import com.facebook.thrift.TApplicationException;
-import com.facebook.thrift.TSerializer;
-import com.facebook.thrift.transport.TTransport;
-import com.facebook.thrift.transport.TSocket;
-import com.facebook.thrift.transport.THttpClient;
-import com.facebook.thrift.transport.TFramedTransport;
-import com.facebook.thrift.transport.TTransportException;
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.protocol.TSimpleJSONProtocol;
+import org.apache.thrift.TApplicationException;
+import org.apache.thrift.TSerializer;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.THttpClient;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TSimpleJSONProtocol;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git a/test/java/src/TestNonblockingServer.java b/test/java/src/TestNonblockingServer.java
index 450d67a51..5df52da46 100644
--- a/test/java/src/TestNonblockingServer.java
+++ b/test/java/src/TestNonblockingServer.java
@@ -1,16 +1,16 @@
-package com.facebook.thrift.test;
+package org.apache.thrift.test;
 
-import com.facebook.thrift.TException;
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.protocol.TProtocol;
-import com.facebook.thrift.protocol.TProtocolFactory;
-import com.facebook.thrift.server.TServer;
-import com.facebook.thrift.server.TSimpleServer;
-import com.facebook.thrift.server.TNonblockingServer;
-import com.facebook.thrift.server.THsHaServer;
-import com.facebook.thrift.transport.TNonblockingServerSocket;
-import com.facebook.thrift.transport.TNonblockingServerTransport;
-import com.facebook.thrift.transport.TFramedTransport;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.TSimpleServer;
+import org.apache.thrift.server.TNonblockingServer;
+import org.apache.thrift.server.THsHaServer;
+import org.apache.thrift.transport.TNonblockingServerSocket;
+import org.apache.thrift.transport.TNonblockingServerTransport;
+import org.apache.thrift.transport.TFramedTransport;
 
 // Generated code
 import thrift.test.*;
diff --git a/test/java/src/TestServer.java b/test/java/src/TestServer.java
index 92fd4d277..a2f2d2076 100644
--- a/test/java/src/TestServer.java
+++ b/test/java/src/TestServer.java
@@ -1,14 +1,14 @@
-package com.facebook.thrift.test;
-
-import com.facebook.thrift.TException;
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.protocol.TProtocol;
-import com.facebook.thrift.protocol.TProtocolFactory;
-import com.facebook.thrift.server.TServer;
-import com.facebook.thrift.server.TSimpleServer;
-import com.facebook.thrift.server.TThreadPoolServer;
-import com.facebook.thrift.transport.TServerSocket;
-import com.facebook.thrift.transport.TServerTransport;
+package org.apache.thrift.test;
+
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.TSimpleServer;
+import org.apache.thrift.server.TThreadPoolServer;
+import org.apache.thrift.transport.TServerSocket;
+import org.apache.thrift.transport.TServerTransport;
 
 // Generated code
 import thrift.test.*;
diff --git a/test/java/src/ToStringTest.java b/test/java/src/ToStringTest.java
index 6b328eefc..56ce4c932 100644
--- a/test/java/src/ToStringTest.java
+++ b/test/java/src/ToStringTest.java
@@ -1,4 +1,4 @@
-package com.facebook.thrift.test;
+package org.apache.thrift.test;
 
 import thrift.test.*;
 
diff --git a/tutorial/java/src/JavaClient.java b/tutorial/java/src/JavaClient.java
index 753f0c62e..eaeafc9a9 100644
--- a/tutorial/java/src/JavaClient.java
+++ b/tutorial/java/src/JavaClient.java
@@ -2,12 +2,12 @@
 import tutorial.*;
 import shared.*;
 
-import com.facebook.thrift.TException;
-import com.facebook.thrift.transport.TTransport;
-import com.facebook.thrift.transport.TSocket;
-import com.facebook.thrift.transport.TTransportException;
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.protocol.TProtocol;
+import org.apache.thrift.TException;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
 
 import java.util.AbstractMap;
 import java.util.HashMap;
diff --git a/tutorial/java/src/JavaServer.java b/tutorial/java/src/JavaServer.java
index b7db0db20..631fb9a3d 100644
--- a/tutorial/java/src/JavaServer.java
+++ b/tutorial/java/src/JavaServer.java
@@ -1,10 +1,10 @@
-import com.facebook.thrift.TException;
-import com.facebook.thrift.protocol.TBinaryProtocol;
-import com.facebook.thrift.protocol.TProtocol;
-import com.facebook.thrift.server.TServer;
-import com.facebook.thrift.server.TSimpleServer;
-import com.facebook.thrift.transport.TServerSocket;
-import com.facebook.thrift.transport.TServerTransport;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.TSimpleServer;
+import org.apache.thrift.transport.TServerSocket;
+import org.apache.thrift.transport.TServerTransport;
 
 // Generated code
 import tutorial.*;