Skip to content

Commit 1196574

Browse files
marci4marci4
authored
Merge branch 'master' into pr/248
2 parents 84af29b + bddca63 commit 1196574

33 files changed

Lines changed: 779 additions & 277 deletions

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ target
1313
.classpath
1414
bin
1515

16-
/doc
16+
/doc
17+
*.xml
18+
.idea/.name

‎.travis.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
language: java
2-
jdk:
3-
- oraclejdk7
4-
5-
script: "./gradlew test"
1+
{
2+
"language": "java",
3+
"script": "ant all"
4+
}

‎README.markdown‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://travis-ci.org/ck1125/Java-WebSocket.png?branch=master)](https://travis-ci.org/ck1125/Java-WebSocket)
1+
[![Build Status](https://travis-ci.org/marci4/Java-WebSocket-Dev.svg?branch=master)](https://travis-ci.org/ck1125/Java-WebSocket)
22
Java WebSockets
33
===============
44

@@ -18,30 +18,19 @@ Implemented WebSocket protocol versions are:
1818
[Here](https://github.com/TooTallNate/Java-WebSocket/wiki/Drafts) some more details about protocol versions/drafts.
1919

2020

21-
##Build
22-
You can build using Ant or Maven but there is nothing against just putting the source path ```src/main/java ``` on your applications buildpath.
21+
## Build
22+
You can build using Ant but there is nothing against just putting the source path ```src/main/java ``` on your applications buildpath.
2323

24-
###Ant
24+
### Ant
2525

2626
``` bash
2727
ant
2828
```
2929

30-
will create the javadoc of this library at ```doc/``` and build the library itself: ```dest/java_websocket.jar```
30+
will create the javadoc of this library at ```doc/``` and build the library itself: ```dist/java_websocket.jar```
3131

3232
The ant targets are: ```compile```, ```jar```, ```doc``` and ```clean```
3333

34-
###Maven
35-
36-
To use maven just add this dependency to your pom.xml:
37-
```xml
38-
<dependency>
39-
<groupId>org.java-websocket</groupId>
40-
<artifactId>Java-WebSocket</artifactId>
41-
<version>1.3.0</version>
42-
</dependency>
43-
```
44-
4534
Running the Examples
4635
-------------------
4736

@@ -83,7 +72,7 @@ connections though HTTP. After that it's up to **your** subclass to add purpose.
8372
Writing your own WebSocket Client
8473
---------------------------------
8574

86-
The `org.java_websocket.server.WebSocketClient` abstract class can connect to
75+
The `org.java_websocket.client.WebSocketClient` abstract class can connect to
8776
valid WebSocket servers. The constructor expects a valid `ws://` URI to
8877
connect to. Important events `onOpen`, `onClose`, `onMessage` and `onIOError`
8978
get fired throughout the life of the WebSocketClient, and must be implemented

‎build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<mkdir dir="build/classes" />
77
<mkdir dir="build/examples" />
88
<javac includeantruntime="false" debug="on" srcdir="src/main/java"
9-
destdir="build/classes" target="1.5" />
9+
destdir="build/classes" target="1.6" />
1010
<javac includeantruntime="false" srcdir="src/main/example/"
1111
classpath="build/classes" destdir="build/examples" />
1212
</target>

‎gradle/wrapper/gradle-wrapper.jar‎

5.87 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Feb 13 00:13:35 GMT 2013
1+
#Wed Jul 02 20:43:27 CEST 2014
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.4-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-1.4-bin.zip

‎gradlew‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 90 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pom.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<properties>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<java.version>1.6</java.version>
24+
<cucumber.version>1.0.0.RC24</cucumber.version>
2425
</properties>
2526
<build>
2627
<plugins>
@@ -61,6 +62,28 @@
6162
</plugin>
6263
</plugins>
6364
</build>
65+
<dependencies>
66+
<!-- JUnit -->
67+
<dependency>
68+
<groupId>junit</groupId>
69+
<artifactId>junit</artifactId>
70+
<version>4.8.2</version>
71+
<scope>test</scope>
72+
</dependency>
73+
<!-- Cucumber -->
74+
<dependency>
75+
<groupId>info.cukes</groupId>
76+
<artifactId>cucumber-junit</artifactId>
77+
<version>1.0.0</version>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>info.cukes</groupId>
82+
<artifactId>cucumber-java</artifactId>
83+
<version>${cucumber.version}</version>
84+
<scope>test</scope>
85+
</dependency>
86+
</dependencies>
6487
<developers>
6588
<developer>
6689
<id>TooTallNate</id>

‎src/main/example/ExampleClient.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.java_websocket.client.WebSocketClient;
55
import org.java_websocket.drafts.Draft;
66
import org.java_websocket.drafts.Draft_10;
7+
import org.java_websocket.drafts.Draft_17;
78
import org.java_websocket.framing.Framedata;
89
import org.java_websocket.handshake.ServerHandshake;
910

@@ -47,7 +48,7 @@ public void onError( Exception ex ) {
4748
}
4849

4950
public static void main( String[] args ) throws URISyntaxException {
50-
ExampleClient c = new ExampleClient( new URI( "ws://localhost:8887" ), new Draft_10() ); // more about drafts here: http://github.com/TooTallNate/Java-WebSocket/wiki/Drafts
51+
ExampleClient c = new ExampleClient( new URI( "ws://localhost:8887" ), new Draft_17() ); // more about drafts here: http://github.com/TooTallNate/Java-WebSocket/wiki/Drafts
5152
c.connect();
5253
}
5354

0 commit comments

Comments
 (0)