Skip to content

Commit ea96710

Browse files
nkzawankzawa
committed
Merge pull request #206 from socketio/package-name
Change package name
2 parents 742e824 + ddd2cf0 commit ea96710

32 files changed

+93
-89
lines changed

‎History.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
0.6.1 / 2015-08-31
2+
==================
3+
4+
* change package name to "io.socket"
5+
16
0.6.0 / 2015-08-09
27
==================
38

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
# Socket.IO-client.java
2-
[![Build Status](https://travis-ci.org/nkzawa/socket.io-client.java.png?branch=master)](https://travis-ci.org/nkzawa/socket.io-client.java)
1+
# Socket.IO-client Java
2+
[![Build Status](https://travis-ci.org/socketio/socket.io-client-java.png?branch=master)](https://travis-ci.org/socketio/socket.io-client-java)
33

4-
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).
4+
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).
55

66
See also:
77

88
- [Android chat demo](https://github.com/nkzawa/socket.io-android-chat)
9-
- [engine.io-client.java](https://github.com/nkzawa/engine.io-client.java)
9+
- [engine.io-client-java](https://github.com/socketio/engine.io-client-java)
1010

1111
## Installation
12-
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.
12+
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.
1313

1414
### Maven
1515
Add the following dependency to your `pom.xml`.
1616

1717
```xml
1818
<dependencies>
1919
<dependency>
20-
<groupId>com.github.nkzawa</groupId>
20+
<groupId>io.socket</groupId>
2121
<artifactId>socket.io-client</artifactId>
22-
<version>0.6.0</version>
22+
<version>0.6.1</version>
2323
</dependency>
2424
</dependencies>
2525
```
@@ -28,11 +28,11 @@ Add the following dependency to your `pom.xml`.
2828
Add it as a gradle dependency for Android Studio, in `build.gradle`:
2929

3030
```groovy
31-
compile 'com.github.nkzawa:socket.io-client:0.6.0'
31+
compile 'io.socket:socket.io-client:0.6.1'
3232
```
3333

3434
## Usage
35-
Socket.IO-client.java has almost the same api and features with the original JS client. You use `IO#socket` to initialize `Socket`:
35+
Socket.IO-client Java has almost the same api and features with the original JS client. You use `IO#socket` to initialize `Socket`:
3636

3737
```java
3838
socket = IO.socket("http://localhost");
@@ -131,7 +131,7 @@ socket = IO.socket("https://localhost", opts);
131131

132132
See the Javadoc for more details.
133133

134-
http://nkzawa.github.io/socket.io-client.java/apidocs/
134+
http://socketio.github.io/socket.io-client-java/apidocs/
135135

136136
## Features
137137
This library supports all of the features the JS client does, including events, options and upgrading transport. Android is fully supported.

‎pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
3-
<groupId>com.github.nkzawa</groupId>
3+
<groupId>io.socket</groupId>
44
<artifactId>socket.io-client</artifactId>
5-
<version>0.6.1-SNAPSHOT</version>
5+
<version>0.6.2-SNAPSHOT</version>
66
<packaging>jar</packaging>
77
<name>socket.io-client</name>
88
<description>Socket.IO Client Library for Java</description>
9-
<url>https://github.com/nkzawa/socket.io-client.java</url>
9+
<url>https://github.com/socketio/socket.io-client-java</url>
1010

1111
<parent>
1212
<groupId>org.sonatype.oss</groupId>
@@ -27,9 +27,9 @@
2727
</licenses>
2828

2929
<scm>
30-
<url>https://github.com/nkzawa/socket.io-client.java</url>
31-
<connection>scm:git:git://github.com/nkzawa/socket.io-client.java.git</connection>
32-
<developerConnection>scm:git:[email protected]:nkzawa/socket.io-client.java.git</developerConnection>
30+
<url>https://github.com/socketio/socket.io-client-java</url>
31+
<connection>scm:git:git://github.com/socketio/socket.io-client-java.git</connection>
32+
<developerConnection>scm:git:[email protected]:socketio/socket.io-client-java.git</developerConnection>
3333
<tag>HEAD</tag>
3434
</scm>
3535

@@ -56,9 +56,9 @@
5656

5757
<dependencies>
5858
<dependency>
59-
<groupId>com.github.nkzawa</groupId>
59+
<groupId>io.socket</groupId>
6060
<artifactId>engine.io-client</artifactId>
61-
<version>0.6.0</version>
61+
<version>0.6.1</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.json</groupId>

src/main/java/com/github/nkzawa/backo/Backoff.java renamed to src/main/java/io/socket/backo/Backoff.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.nkzawa.backo;
1+
package io.socket.backo;
22

33
public class Backoff {
44

src/main/java/com/github/nkzawa/socketio/client/Ack.java renamed to src/main/java/io/socket/client/Ack.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.nkzawa.socketio.client;
1+
package io.socket.client;
22

33
/**
44
* Acknowledgement.

src/main/java/com/github/nkzawa/socketio/client/IO.java renamed to src/main/java/io/socket/client/IO.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.github.nkzawa.socketio.client;
1+
package io.socket.client;
22

33

4-
import com.github.nkzawa.socketio.parser.Parser;
4+
import io.socket.parser.Parser;
55

66
import javax.net.ssl.HostnameVerifier;
77
import javax.net.ssl.SSLContext;

src/main/java/com/github/nkzawa/socketio/client/Manager.java renamed to src/main/java/io/socket/client/Manager.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.github.nkzawa.socketio.client;
1+
package io.socket.client;
22

3-
import com.github.nkzawa.backo.Backoff;
4-
import com.github.nkzawa.emitter.Emitter;
5-
import com.github.nkzawa.socketio.parser.Packet;
6-
import com.github.nkzawa.socketio.parser.Parser;
7-
import com.github.nkzawa.thread.EventThread;
3+
import io.socket.backo.Backoff;
4+
import io.socket.emitter.Emitter;
5+
import io.socket.parser.Packet;
6+
import io.socket.parser.Parser;
7+
import io.socket.thread.EventThread;
88

99
import javax.net.ssl.HostnameVerifier;
1010
import javax.net.ssl.SSLContext;
@@ -14,7 +14,6 @@
1414
import java.util.logging.Level;
1515
import java.util.logging.Logger;
1616

17-
1817
/**
1918
* Manager class represents a connection to a given Socket.IO server.
2019
*/
@@ -90,7 +89,7 @@ public class Manager extends Emitter {
9089
private List<Packet> packetBuffer;
9190
private Queue<On.Handle> subs;
9291
private Options opts;
93-
/*package*/ com.github.nkzawa.engineio.client.Socket engine;
92+
/*package*/ io.socket.engineio.client.Socket engine;
9493
private Parser.Encoder encoder;
9594
private Parser.Decoder decoder;
9695

@@ -252,7 +251,7 @@ public void run() {
252251

253252
logger.fine(String.format("opening %s", Manager.this.uri));
254253
Manager.this.engine = new Engine(Manager.this.uri, Manager.this.opts);
255-
final com.github.nkzawa.engineio.client.Socket socket = Manager.this.engine;
254+
final io.socket.engineio.client.Socket socket = Manager.this.engine;
256255
final Manager self = Manager.this;
257256
Manager.this.readyState = ReadyState.OPENING;
258257
Manager.this.skipReconnect = false;
@@ -338,7 +337,7 @@ private void onopen() {
338337
this.readyState = ReadyState.OPEN;
339338
this.emit(EVENT_OPEN);
340339

341-
final com.github.nkzawa.engineio.client.Socket socket = this.engine;
340+
final io.socket.engineio.client.Socket socket = this.engine;
342341
this.subs.add(On.on(socket, Engine.EVENT_DATA, new Listener() {
343342
@Override
344343
public void call(Object... objects) {
@@ -558,14 +557,14 @@ public static interface OpenCallback {
558557
}
559558

560559

561-
private static class Engine extends com.github.nkzawa.engineio.client.Socket {
560+
private static class Engine extends io.socket.engineio.client.Socket {
562561

563562
Engine(URI uri, Options opts) {
564563
super(uri, opts);
565564
}
566565
}
567566

568-
public static class Options extends com.github.nkzawa.engineio.client.Socket.Options {
567+
public static class Options extends io.socket.engineio.client.Socket.Options {
569568

570569
public boolean reconnection = true;
571570
public int reconnectionAttempts;

src/main/java/com/github/nkzawa/socketio/client/On.java renamed to src/main/java/io/socket/client/On.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.github.nkzawa.socketio.client;
1+
package io.socket.client;
22

3-
import com.github.nkzawa.emitter.Emitter;
3+
import io.socket.emitter.Emitter;
44

55
public class On {
66

src/main/java/com/github/nkzawa/socketio/client/Socket.java renamed to src/main/java/io/socket/client/Socket.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.github.nkzawa.socketio.client;
1+
package io.socket.client;
22

3-
import com.github.nkzawa.emitter.Emitter;
4-
import com.github.nkzawa.hasbinary.HasBinary;
5-
import com.github.nkzawa.socketio.parser.Packet;
6-
import com.github.nkzawa.socketio.parser.Parser;
7-
import com.github.nkzawa.thread.EventThread;
3+
import io.socket.emitter.Emitter;
4+
import io.socket.hasbinary.HasBinary;
5+
import io.socket.parser.Packet;
6+
import io.socket.parser.Parser;
7+
import io.socket.thread.EventThread;
88
import org.json.JSONArray;
99
import org.json.JSONException;
1010
import org.json.JSONObject;

src/main/java/com/github/nkzawa/socketio/client/SocketIOException.java renamed to src/main/java/io/socket/client/SocketIOException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.nkzawa.socketio.client;
1+
package io.socket.client;
22

33
public class SocketIOException extends Exception {
44

0 commit comments

Comments
 (0)