diff --git a/.gitignore b/.gitignore index d5b2315e..df7006c9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,9 @@ .*.swp .DS_STORE -bin/ +# Maven build directory target/ + +# IntelliJ IDEA project files +.idea/ +*.iml diff --git a/build/junit-4.6.jar b/build/junit-4.6.jar deleted file mode 100644 index 00770a4f..00000000 Binary files a/build/junit-4.6.jar and /dev/null differ diff --git a/build/kryo-2.20.jar b/build/kryo-2.20.jar deleted file mode 100644 index 428afb3c..00000000 Binary files a/build/kryo-2.20.jar and /dev/null differ diff --git a/build/minlog-none-1.2.jar b/build/minlog-none-1.2.jar deleted file mode 100644 index 50bd8d2c..00000000 Binary files a/build/minlog-none-1.2.jar and /dev/null differ diff --git a/lib/asm-4.0.jar b/lib/asm-4.0.jar deleted file mode 100644 index 6d63075e..00000000 Binary files a/lib/asm-4.0.jar and /dev/null differ diff --git a/lib/jsonbeans-0.5.jar b/lib/jsonbeans-0.5.jar deleted file mode 100644 index 1dcd9d85..00000000 Binary files a/lib/jsonbeans-0.5.jar and /dev/null differ diff --git a/lib/kryo-debug-2.20.jar b/lib/kryo-debug-2.20.jar deleted file mode 100644 index aabae511..00000000 Binary files a/lib/kryo-debug-2.20.jar and /dev/null differ diff --git a/lib/minlog-1.2.jar b/lib/minlog-1.2.jar deleted file mode 100644 index 7cc55acf..00000000 Binary files a/lib/minlog-1.2.jar and /dev/null differ diff --git a/lib/objenesis-1.2.jar b/lib/objenesis-1.2.jar deleted file mode 100644 index 45cb6416..00000000 Binary files a/lib/objenesis-1.2.jar and /dev/null differ diff --git a/lib/reflectasm-1.07.jar b/lib/reflectasm-1.07.jar deleted file mode 100644 index d5c31a46..00000000 Binary files a/lib/reflectasm-1.07.jar and /dev/null differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..24e7df4f --- /dev/null +++ b/pom.xml @@ -0,0 +1,168 @@ + + + + org.sonatype.oss + oss-parent + 7 + + 4.0.0 + + com.esotericsoftware + kryonet + 2.22-SNAPSHOT + jar + + kryonet + TCP and UDP client/server library for Java + https://github.com/EsotericSoftware/kryonet + + + + New BSD License + http://www.opensource.org/licenses/bsd-license.php + repo + + + + + + nathan.sweet + Nathan Sweet + nathan.sweet@gmail.com + + + + + https://github.com/EsotericSoftware/kryonet + scm:git:https://github.com/EsotericSoftware/kryonet.git + scm:git:https://github.com/EsotericSoftware/kryonet.git + HEAD + + + + + true + + + 70CC1444 + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.4 + + ${gpgGuiPassphrase} + ${gpgKeyId} + + + + sign-artifacts + verify + + sign + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + package-sources + package + + jar-no-fork + test-jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + package-javadocs + package + + jar + test-jar + + + + + + maven-jar-plugin + 2.4 + + + package-tests + package + + test-jar + + + + + + + true + true + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.4.1 + + + + + + + com.esotericsoftware.kryo + kryo + 2.20 + + + org.ow2.asm + asm + 4.0 + + + org.objenesis + objenesis + 1.2 + + + com.esotericsoftware + jsonbeans + + 0.7-SNAPHOT + + + com.esotericsoftware + minlog + + 1.3-SNAPHOT + + + junit + junit + 4.11 + test + + + diff --git a/examples/com/esotericsoftware/kryonet/examples/chat/ChatClient.java b/src/examples/java/com/esotericsoftware/kryonet/examples/chat/ChatClient.java similarity index 100% rename from examples/com/esotericsoftware/kryonet/examples/chat/ChatClient.java rename to src/examples/java/com/esotericsoftware/kryonet/examples/chat/ChatClient.java diff --git a/examples/com/esotericsoftware/kryonet/examples/chat/ChatServer.java b/src/examples/java/com/esotericsoftware/kryonet/examples/chat/ChatServer.java similarity index 100% rename from examples/com/esotericsoftware/kryonet/examples/chat/ChatServer.java rename to src/examples/java/com/esotericsoftware/kryonet/examples/chat/ChatServer.java diff --git a/examples/com/esotericsoftware/kryonet/examples/chat/Network.java b/src/examples/java/com/esotericsoftware/kryonet/examples/chat/Network.java similarity index 100% rename from examples/com/esotericsoftware/kryonet/examples/chat/Network.java rename to src/examples/java/com/esotericsoftware/kryonet/examples/chat/Network.java diff --git a/examples/com/esotericsoftware/kryonet/examples/chatrmi/ChatRmiClient.java b/src/examples/java/com/esotericsoftware/kryonet/examples/chatrmi/ChatRmiClient.java similarity index 100% rename from examples/com/esotericsoftware/kryonet/examples/chatrmi/ChatRmiClient.java rename to src/examples/java/com/esotericsoftware/kryonet/examples/chatrmi/ChatRmiClient.java diff --git a/examples/com/esotericsoftware/kryonet/examples/chatrmi/ChatRmiServer.java b/src/examples/java/com/esotericsoftware/kryonet/examples/chatrmi/ChatRmiServer.java similarity index 100% rename from examples/com/esotericsoftware/kryonet/examples/chatrmi/ChatRmiServer.java rename to src/examples/java/com/esotericsoftware/kryonet/examples/chatrmi/ChatRmiServer.java diff --git a/examples/com/esotericsoftware/kryonet/examples/chatrmi/IChatFrame.java b/src/examples/java/com/esotericsoftware/kryonet/examples/chatrmi/IChatFrame.java similarity index 100% rename from examples/com/esotericsoftware/kryonet/examples/chatrmi/IChatFrame.java rename to src/examples/java/com/esotericsoftware/kryonet/examples/chatrmi/IChatFrame.java diff --git a/examples/com/esotericsoftware/kryonet/examples/chatrmi/IPlayer.java b/src/examples/java/com/esotericsoftware/kryonet/examples/chatrmi/IPlayer.java similarity index 100% rename from examples/com/esotericsoftware/kryonet/examples/chatrmi/IPlayer.java rename to src/examples/java/com/esotericsoftware/kryonet/examples/chatrmi/IPlayer.java diff --git a/examples/com/esotericsoftware/kryonet/examples/chatrmi/Network.java b/src/examples/java/com/esotericsoftware/kryonet/examples/chatrmi/Network.java similarity index 100% rename from examples/com/esotericsoftware/kryonet/examples/chatrmi/Network.java rename to src/examples/java/com/esotericsoftware/kryonet/examples/chatrmi/Network.java diff --git a/examples/com/esotericsoftware/kryonet/examples/position/Character.java b/src/examples/java/com/esotericsoftware/kryonet/examples/position/Character.java similarity index 100% rename from examples/com/esotericsoftware/kryonet/examples/position/Character.java rename to src/examples/java/com/esotericsoftware/kryonet/examples/position/Character.java diff --git a/examples/com/esotericsoftware/kryonet/examples/position/Network.java b/src/examples/java/com/esotericsoftware/kryonet/examples/position/Network.java similarity index 100% rename from examples/com/esotericsoftware/kryonet/examples/position/Network.java rename to src/examples/java/com/esotericsoftware/kryonet/examples/position/Network.java diff --git a/examples/com/esotericsoftware/kryonet/examples/position/PositionClient.java b/src/examples/java/com/esotericsoftware/kryonet/examples/position/PositionClient.java similarity index 100% rename from examples/com/esotericsoftware/kryonet/examples/position/PositionClient.java rename to src/examples/java/com/esotericsoftware/kryonet/examples/position/PositionClient.java diff --git a/examples/com/esotericsoftware/kryonet/examples/position/PositionServer.java b/src/examples/java/com/esotericsoftware/kryonet/examples/position/PositionServer.java similarity index 100% rename from examples/com/esotericsoftware/kryonet/examples/position/PositionServer.java rename to src/examples/java/com/esotericsoftware/kryonet/examples/position/PositionServer.java diff --git a/src/com/esotericsoftware/kryonet/Client.java b/src/main/java/com/esotericsoftware/kryonet/Client.java similarity index 100% rename from src/com/esotericsoftware/kryonet/Client.java rename to src/main/java/com/esotericsoftware/kryonet/Client.java diff --git a/src/com/esotericsoftware/kryonet/Connection.java b/src/main/java/com/esotericsoftware/kryonet/Connection.java similarity index 100% rename from src/com/esotericsoftware/kryonet/Connection.java rename to src/main/java/com/esotericsoftware/kryonet/Connection.java diff --git a/src/com/esotericsoftware/kryonet/EndPoint.java b/src/main/java/com/esotericsoftware/kryonet/EndPoint.java similarity index 100% rename from src/com/esotericsoftware/kryonet/EndPoint.java rename to src/main/java/com/esotericsoftware/kryonet/EndPoint.java diff --git a/src/com/esotericsoftware/kryonet/FrameworkMessage.java b/src/main/java/com/esotericsoftware/kryonet/FrameworkMessage.java similarity index 100% rename from src/com/esotericsoftware/kryonet/FrameworkMessage.java rename to src/main/java/com/esotericsoftware/kryonet/FrameworkMessage.java diff --git a/src/com/esotericsoftware/kryonet/JsonSerialization.java b/src/main/java/com/esotericsoftware/kryonet/JsonSerialization.java similarity index 100% rename from src/com/esotericsoftware/kryonet/JsonSerialization.java rename to src/main/java/com/esotericsoftware/kryonet/JsonSerialization.java diff --git a/src/com/esotericsoftware/kryonet/KryoNetException.java b/src/main/java/com/esotericsoftware/kryonet/KryoNetException.java similarity index 100% rename from src/com/esotericsoftware/kryonet/KryoNetException.java rename to src/main/java/com/esotericsoftware/kryonet/KryoNetException.java diff --git a/src/com/esotericsoftware/kryonet/KryoSerialization.java b/src/main/java/com/esotericsoftware/kryonet/KryoSerialization.java similarity index 100% rename from src/com/esotericsoftware/kryonet/KryoSerialization.java rename to src/main/java/com/esotericsoftware/kryonet/KryoSerialization.java diff --git a/src/com/esotericsoftware/kryonet/Listener.java b/src/main/java/com/esotericsoftware/kryonet/Listener.java similarity index 100% rename from src/com/esotericsoftware/kryonet/Listener.java rename to src/main/java/com/esotericsoftware/kryonet/Listener.java diff --git a/src/com/esotericsoftware/kryonet/Serialization.java b/src/main/java/com/esotericsoftware/kryonet/Serialization.java similarity index 100% rename from src/com/esotericsoftware/kryonet/Serialization.java rename to src/main/java/com/esotericsoftware/kryonet/Serialization.java diff --git a/src/com/esotericsoftware/kryonet/Server.java b/src/main/java/com/esotericsoftware/kryonet/Server.java similarity index 100% rename from src/com/esotericsoftware/kryonet/Server.java rename to src/main/java/com/esotericsoftware/kryonet/Server.java diff --git a/src/com/esotericsoftware/kryonet/TcpConnection.java b/src/main/java/com/esotericsoftware/kryonet/TcpConnection.java similarity index 100% rename from src/com/esotericsoftware/kryonet/TcpConnection.java rename to src/main/java/com/esotericsoftware/kryonet/TcpConnection.java diff --git a/src/com/esotericsoftware/kryonet/UdpConnection.java b/src/main/java/com/esotericsoftware/kryonet/UdpConnection.java similarity index 100% rename from src/com/esotericsoftware/kryonet/UdpConnection.java rename to src/main/java/com/esotericsoftware/kryonet/UdpConnection.java diff --git a/src/com/esotericsoftware/kryonet/rmi/ObjectSpace.java b/src/main/java/com/esotericsoftware/kryonet/rmi/ObjectSpace.java similarity index 100% rename from src/com/esotericsoftware/kryonet/rmi/ObjectSpace.java rename to src/main/java/com/esotericsoftware/kryonet/rmi/ObjectSpace.java diff --git a/src/com/esotericsoftware/kryonet/rmi/RemoteObject.java b/src/main/java/com/esotericsoftware/kryonet/rmi/RemoteObject.java similarity index 100% rename from src/com/esotericsoftware/kryonet/rmi/RemoteObject.java rename to src/main/java/com/esotericsoftware/kryonet/rmi/RemoteObject.java diff --git a/src/com/esotericsoftware/kryonet/rmi/TimeoutException.java b/src/main/java/com/esotericsoftware/kryonet/rmi/TimeoutException.java similarity index 100% rename from src/com/esotericsoftware/kryonet/rmi/TimeoutException.java rename to src/main/java/com/esotericsoftware/kryonet/rmi/TimeoutException.java diff --git a/src/com/esotericsoftware/kryonet/util/InputStreamSender.java b/src/main/java/com/esotericsoftware/kryonet/util/InputStreamSender.java similarity index 100% rename from src/com/esotericsoftware/kryonet/util/InputStreamSender.java rename to src/main/java/com/esotericsoftware/kryonet/util/InputStreamSender.java diff --git a/src/com/esotericsoftware/kryonet/util/TcpIdleSender.java b/src/main/java/com/esotericsoftware/kryonet/util/TcpIdleSender.java similarity index 100% rename from src/com/esotericsoftware/kryonet/util/TcpIdleSender.java rename to src/main/java/com/esotericsoftware/kryonet/util/TcpIdleSender.java diff --git a/test/com/esotericsoftware/kryonet/BufferTest.java b/src/test/java/com/esotericsoftware/kryonet/BufferTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/BufferTest.java rename to src/test/java/com/esotericsoftware/kryonet/BufferTest.java diff --git a/test/com/esotericsoftware/kryonet/DiscoverHostTest.java b/src/test/java/com/esotericsoftware/kryonet/DiscoverHostTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/DiscoverHostTest.java rename to src/test/java/com/esotericsoftware/kryonet/DiscoverHostTest.java diff --git a/test/com/esotericsoftware/kryonet/InputStreamSenderTest.java b/src/test/java/com/esotericsoftware/kryonet/InputStreamSenderTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/InputStreamSenderTest.java rename to src/test/java/com/esotericsoftware/kryonet/InputStreamSenderTest.java diff --git a/test/com/esotericsoftware/kryonet/JsonTest.java b/src/test/java/com/esotericsoftware/kryonet/JsonTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/JsonTest.java rename to src/test/java/com/esotericsoftware/kryonet/JsonTest.java diff --git a/test/com/esotericsoftware/kryonet/KryoNetTestCase.java b/src/test/java/com/esotericsoftware/kryonet/KryoNetTestCase.java similarity index 100% rename from test/com/esotericsoftware/kryonet/KryoNetTestCase.java rename to src/test/java/com/esotericsoftware/kryonet/KryoNetTestCase.java diff --git a/test/com/esotericsoftware/kryonet/MultipleServerTest.java b/src/test/java/com/esotericsoftware/kryonet/MultipleServerTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/MultipleServerTest.java rename to src/test/java/com/esotericsoftware/kryonet/MultipleServerTest.java diff --git a/test/com/esotericsoftware/kryonet/MultipleThreadTest.java b/src/test/java/com/esotericsoftware/kryonet/MultipleThreadTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/MultipleThreadTest.java rename to src/test/java/com/esotericsoftware/kryonet/MultipleThreadTest.java diff --git a/test/com/esotericsoftware/kryonet/PingPongTest.java b/src/test/java/com/esotericsoftware/kryonet/PingPongTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/PingPongTest.java rename to src/test/java/com/esotericsoftware/kryonet/PingPongTest.java diff --git a/test/com/esotericsoftware/kryonet/PingTest.java b/src/test/java/com/esotericsoftware/kryonet/PingTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/PingTest.java rename to src/test/java/com/esotericsoftware/kryonet/PingTest.java diff --git a/test/com/esotericsoftware/kryonet/ReconnectTest.java b/src/test/java/com/esotericsoftware/kryonet/ReconnectTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/ReconnectTest.java rename to src/test/java/com/esotericsoftware/kryonet/ReconnectTest.java diff --git a/test/com/esotericsoftware/kryonet/ReuseTest.java b/src/test/java/com/esotericsoftware/kryonet/ReuseTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/ReuseTest.java rename to src/test/java/com/esotericsoftware/kryonet/ReuseTest.java diff --git a/test/com/esotericsoftware/kryonet/UnregisteredClassTest.java b/src/test/java/com/esotericsoftware/kryonet/UnregisteredClassTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/UnregisteredClassTest.java rename to src/test/java/com/esotericsoftware/kryonet/UnregisteredClassTest.java diff --git a/test/com/esotericsoftware/kryonet/compress/DeflateTest.java b/src/test/java/com/esotericsoftware/kryonet/compress/DeflateTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/compress/DeflateTest.java rename to src/test/java/com/esotericsoftware/kryonet/compress/DeflateTest.java diff --git a/test/com/esotericsoftware/kryonet/rmi/RmiTest.java b/src/test/java/com/esotericsoftware/kryonet/rmi/RmiTest.java similarity index 100% rename from test/com/esotericsoftware/kryonet/rmi/RmiTest.java rename to src/test/java/com/esotericsoftware/kryonet/rmi/RmiTest.java