Merge pull request #206 from socketio/package-name

Change package name

History.md

@@ -1,3 +1,8 @@
+0.6.1 / 2015-08-31
+==================
+
+* change package name to "io.socket"
+
 0.6.0 / 2015-08-09
 ==================
 

README.md

@@ -1,15 +1,15 @@
-# Socket.IO-client.java
-[![Build Status](https://travis-ci.org/nkzawa/socket.io-client.java.png?branch=master)](https://travis-ci.org/nkzawa/socket.io-client.java)
+# Socket.IO-client Java
+[![Build Status](https://travis-ci.org/socketio/socket.io-client-java.png?branch=master)](https://travis-ci.org/socketio/socket.io-client-java)
 
-This is the Socket.IO v1.x Client Library for Java, which is simply ported from the [JavaScript client](https://github.com/Automattic/socket.io-client).
+This is the Socket.IO v1.x Client Library for Java, which is simply ported from the [JavaScript client](https://github.com/socketio/socket.io-client).
 
 See also:
 
 - [Android chat demo](https://github.com/nkzawa/socket.io-android-chat)
-- [engine.io-client.java](https://github.com/nkzawa/engine.io-client.java)
+- [engine.io-client-java](https://github.com/socketio/engine.io-client-java)
 
 ## Installation
-The latest artifact is available on Maven Central. You'll also need [dependencies](http://nkzawa.github.io/socket.io-client.java/dependencies.html) to install.
+The latest artifact is available on Maven Central. You'll also need [dependencies](http://socketio.github.io/socket.io-client-java/dependencies.html) to install.
 
 ### Maven
 Add the following dependency to your `pom.xml`.
@@ -17,9 +17,9 @@ Add the following dependency to your `pom.xml`.
 ```xml
 <dependencies>
   <dependency>
-    <groupId>com.github.nkzawa</groupId>
+    <groupId>io.socket</groupId>
     <artifactId>socket.io-client</artifactId>
-    <version>0.6.0</version>
+    <version>0.6.1</version>
   </dependency>
 </dependencies>
 ```
@@ -28,11 +28,11 @@ Add the following dependency to your `pom.xml`.
 Add it as a gradle dependency for Android Studio, in `build.gradle`:
 
 ```groovy
-compile 'com.github.nkzawa:socket.io-client:0.6.0'
+compile 'io.socket:socket.io-client:0.6.1'
 ```
 
 ## Usage
-Socket.IO-client.java has almost the same api and features with the original JS client. You use `IO#socket` to initialize `Socket`:
+Socket.IO-client Java has almost the same api and features with the original JS client. You use `IO#socket` to initialize `Socket`:
 
 ```java
 socket = IO.socket("http://localhost");
@@ -131,7 +131,7 @@ socket = IO.socket("https://localhost", opts);
 
 See the Javadoc for more details.
 
-http://nkzawa.github.io/socket.io-client.java/apidocs/
+http://socketio.github.io/socket.io-client-java/apidocs/
 
 ## Features
 This library supports all of the features the JS client does, including events, options and upgrading transport. Android is fully supported.

pom.xml

@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.github.nkzawa</groupId>
+  <groupId>io.socket</groupId>
   <artifactId>socket.io-client</artifactId>
-  <version>0.6.1-SNAPSHOT</version>
+  <version>0.6.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>socket.io-client</name>
   <description>Socket.IO Client Library for Java</description>
-  <url>https://github.com/nkzawa/socket.io-client.java</url>
+  <url>https://github.com/socketio/socket.io-client-java</url>
 
   <parent>
     <groupId>org.sonatype.oss</groupId>
@@ -27,9 +27,9 @@
   </licenses>
 
   <scm>
-    <url>https://github.com/nkzawa/socket.io-client.java</url>
-    <connection>scm:git:git://github.com/nkzawa/socket.io-client.java.git</connection>
-    <developerConnection>scm:git:git@github.com:nkzawa/socket.io-client.java.git</developerConnection>
+    <url>https://github.com/socketio/socket.io-client-java</url>
+    <connection>scm:git:git://github.com/socketio/socket.io-client-java.git</connection>
+    <developerConnection>scm:git:git@github.com:socketio/socket.io-client-java.git</developerConnection>
     <tag>HEAD</tag>
   </scm>
 
@@ -56,9 +56,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.github.nkzawa</groupId>
+      <groupId>io.socket</groupId>
       <artifactId>engine.io-client</artifactId>
-      <version>0.6.0</version>
+      <version>0.6.1</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>

src/main/java/io/socket/backo/Backoff.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.backo;
+package io.socket.backo;
 
 public class Backoff {
 

src/main/java/io/socket/client/Ack.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
 /**
  * Acknowledgement.

src/main/java/io/socket/client/IO.java

@@ -1,7 +1,7 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
 
-import com.github.nkzawa.socketio.parser.Parser;
+import io.socket.parser.Parser;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;

src/main/java/io/socket/client/Manager.java

@@ -1,10 +1,10 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
-import com.github.nkzawa.backo.Backoff;
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.socketio.parser.Packet;
-import com.github.nkzawa.socketio.parser.Parser;
-import com.github.nkzawa.thread.EventThread;
+import io.socket.backo.Backoff;
+import io.socket.emitter.Emitter;
+import io.socket.parser.Packet;
+import io.socket.parser.Parser;
+import io.socket.thread.EventThread;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
@@ -14,7 +14,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-
 /**
  * Manager class represents a connection to a given Socket.IO server.
  */
@@ -90,7 +89,7 @@ public class Manager extends Emitter {
     private List<Packet> packetBuffer;
     private Queue<On.Handle> subs;
     private Options opts;
-    /*package*/ com.github.nkzawa.engineio.client.Socket engine;
+    /*package*/ io.socket.engineio.client.Socket engine;
     private Parser.Encoder encoder;
     private Parser.Decoder decoder;
 
@@ -252,7 +251,7 @@ public class Manager extends Emitter {
 
                 logger.fine(String.format("opening %s", Manager.this.uri));
                 Manager.this.engine = new Engine(Manager.this.uri, Manager.this.opts);
-                final com.github.nkzawa.engineio.client.Socket socket = Manager.this.engine;
+                final io.socket.engineio.client.Socket socket = Manager.this.engine;
                 final Manager self = Manager.this;
                 Manager.this.readyState = ReadyState.OPENING;
                 Manager.this.skipReconnect = false;
@@ -338,7 +337,7 @@ public class Manager extends Emitter {
         this.readyState = ReadyState.OPEN;
         this.emit(EVENT_OPEN);
 
-        final com.github.nkzawa.engineio.client.Socket socket = this.engine;
+        final io.socket.engineio.client.Socket socket = this.engine;
         this.subs.add(On.on(socket, Engine.EVENT_DATA, new Listener() {
             @Override
             public void call(Object... objects) {
@@ -558,14 +557,14 @@ public class Manager extends Emitter {
     }
 
 
-    private static class Engine extends com.github.nkzawa.engineio.client.Socket {
+    private static class Engine extends io.socket.engineio.client.Socket {
 
         Engine(URI uri, Options opts) {
             super(uri, opts);
         }
     }
 
-    public static class Options extends com.github.nkzawa.engineio.client.Socket.Options {
+    public static class Options extends io.socket.engineio.client.Socket.Options {
 
         public boolean reconnection = true;
         public int reconnectionAttempts;

src/main/java/io/socket/client/On.java

@@ -1,6 +1,6 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 
 public class On {
 

src/main/java/io/socket/client/Socket.java

@@ -1,10 +1,10 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.hasbinary.HasBinary;
-import com.github.nkzawa.socketio.parser.Packet;
-import com.github.nkzawa.socketio.parser.Parser;
-import com.github.nkzawa.thread.EventThread;
+import io.socket.emitter.Emitter;
+import io.socket.hasbinary.HasBinary;
+import io.socket.parser.Packet;
+import io.socket.parser.Parser;
+import io.socket.thread.EventThread;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

src/main/java/io/socket/client/SocketIOException.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
 public class SocketIOException extends Exception {
 

src/main/java/io/socket/client/Url.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
 import java.net.MalformedURLException;
 import java.net.URI;

src/main/java/io/socket/hasbinary/HasBinary.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.hasbinary;
+package io.socket.hasbinary;
 
 import org.json.JSONArray;
 import org.json.JSONException;

src/main/java/io/socket/parser/Binary.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.parser;
+package io.socket.parser;
 
 import org.json.JSONArray;
 import org.json.JSONException;

src/main/java/io/socket/parser/Packet.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.parser;
+package io.socket.parser;
 
 
 public class Packet<T> {

src/main/java/io/socket/parser/Parser.java

@@ -1,6 +1,6 @@
-package com.github.nkzawa.socketio.parser;
+package io.socket.parser;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import org.json.JSONException;
 import org.json.JSONTokener;
 

src/test/java/io/socket/backo/BackoffTest.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.backo;
+package io.socket.backo;
 
 import org.junit.Test;
 

src/test/java/io/socket/client/Connection.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
 import org.junit.After;
 import org.junit.Before;

src/test/java/io/socket/client/ConnectionTest.java

@@ -1,6 +1,6 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;

src/test/java/io/socket/client/ExecutionTest.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -21,17 +21,17 @@ public class ExecutionTest extends Connection {
 
     @Test(timeout = TIMEOUT)
     public void execConnection() throws InterruptedException, IOException {
-        exec("com.github.nkzawa.socketio.client.executions.Connection");
+        exec("io.socket.client.executions.Connection");
     }
 
     @Test(timeout = TIMEOUT)
     public void execConnectionFailure() throws InterruptedException, IOException {
-        exec("com.github.nkzawa.socketio.client.executions.ConnectionFailure");
+        exec("io.socket.client.executions.ConnectionFailure");
     }
 
     @Test(timeout = TIMEOUT)
     public void execImmediateClose() throws InterruptedException, IOException {
-        exec("com.github.nkzawa.socketio.client.executions.ImmediateClose");
+        exec("io.socket.client.executions.ImmediateClose");
     }
 
     private void exec(String mainClass) throws InterruptedException, IOException {

src/test/java/io/socket/client/SSLConnectionTest.java

@@ -1,6 +1,6 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;

src/test/java/io/socket/client/ServerConnectionNamespaceTest.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;

src/test/java/io/socket/client/ServerConnectionTest.java

@@ -1,9 +1,9 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.client.Transport;
-import com.github.nkzawa.engineio.client.transports.Polling;
-import com.github.nkzawa.engineio.client.transports.WebSocket;
+import io.socket.emitter.Emitter;
+import io.socket.engineio.client.Transport;
+import io.socket.engineio.client.transports.Polling;
+import io.socket.engineio.client.transports.WebSocket;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -195,7 +195,7 @@ public class ServerConnectionTest extends Connection {
         socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() {
             @Override
             public void call(Object... args) {
-                socket.io().engine.on(com.github.nkzawa.engineio.client.Socket.EVENT_CLOSE, new Emitter.Listener() {
+                socket.io().engine.on(io.socket.engineio.client.Socket.EVENT_CLOSE, new Emitter.Listener() {
                     @Override
                     public void call(Object... objects) {
                         values.offer("done");

src/test/java/io/socket/client/SocketTest.java

@@ -1,7 +1,7 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.util.Optional;
+import io.socket.emitter.Emitter;
+import io.socket.util.Optional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;

src/test/java/io/socket/client/UrlTest.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

src/test/java/io/socket/client/executions/Connection.java

@@ -1,8 +1,8 @@
-package com.github.nkzawa.socketio.client.executions;
+package io.socket.client.executions;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.socketio.client.IO;
-import com.github.nkzawa.socketio.client.Socket;
+import io.socket.emitter.Emitter;
+import io.socket.client.IO;
+import io.socket.client.Socket;
 
 import java.net.URISyntaxException;
 

src/test/java/io/socket/client/executions/ConnectionFailure.java

@@ -1,8 +1,8 @@
-package com.github.nkzawa.socketio.client.executions;
+package io.socket.client.executions;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.socketio.client.IO;
-import com.github.nkzawa.socketio.client.Socket;
+import io.socket.emitter.Emitter;
+import io.socket.client.IO;
+import io.socket.client.Socket;
 
 import java.net.URISyntaxException;
 

src/test/java/io/socket/client/executions/ImmediateClose.java

@@ -1,8 +1,8 @@
-package com.github.nkzawa.socketio.client.executions;
+package io.socket.client.executions;
 
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.socketio.client.IO;
-import com.github.nkzawa.socketio.client.Socket;
+import io.socket.emitter.Emitter;
+import io.socket.client.IO;
+import io.socket.client.Socket;
 
 import java.net.URISyntaxException;
 

src/test/java/io/socket/hasbinary/HasBinaryTest.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.hasbinary;
+package io.socket.hasbinary;
 
 import org.json.JSONArray;
 import org.json.JSONException;

src/test/java/io/socket/parser/ByteArrayTest.java

@@ -1,6 +1,6 @@
-package com.github.nkzawa.socketio.parser;
+package io.socket.parser;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

src/test/java/io/socket/parser/Helpers.java

@@ -1,6 +1,6 @@
-package com.github.nkzawa.socketio.parser;
+package io.socket.parser;
 
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

src/test/java/io/socket/parser/ParserTest.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.parser;
+package io.socket.parser;
 
 import org.json.JSONArray;
 import org.json.JSONException;

src/test/java/io/socket/util/Optional.java

@@ -1,4 +1,4 @@
-package com.github.nkzawa.util;
+package io.socket.util;
 
 import java.util.NoSuchElementException;