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
diff --git a/test/java/TestClient b/test/java/TestClient
index bcdffa2..b848755 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 ee2ba9d..f2c596b 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 360efdf..82a6d2a 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 0860d9c..b779663 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 ac11ffa..3983373 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 8bdba2c..5ff0d69 100644
--- a/test/java/src/EqualityTest.java
+++ b/test/java/src/EqualityTest.java
@@ -22,7 +22,7 @@
print >> out, "*""/"
print >> out, r'''
-package com.facebook.thrift.test;
+package org.apache.thrift.test;
// Generated code
import thrift.test.*;
@@ -84,7 +84,7 @@
'''
*/
-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 3f64ef7..afc114a 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 4177765..4dba33f 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 f1d70a3..707a4c2 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 26f5354..49b7509 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 b092197..da638d2 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 450d67a..5df52da 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 92fd4d2..a2f2d20 100644
--- a/test/java/src/TestServer.java
+++ b/test/java/src/TestServer.java
@@ -1,14 +1,14 @@
-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.TThreadPoolServer;
-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.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 6b328ee..56ce4c9 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.*;