Skip to content

Commit 2aada42

Browse files
marci4marci4
committed
Small changes
1 parent 27209fd commit 2aada42

File tree

2 files changed

+49
-38
lines changed

2 files changed

+49
-38
lines changed

‎README.markdown‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,6 @@ Then you can just add the latest version to your build.
4949
compile "org.java-websocket:Java-WebSocket:1.3.6"
5050
```
5151

52-
53-
### Leiningen
54-
55-
``` bash
56-
[org.java-websocket/java-websocket "1.3.6"]
57-
```
58-
5952
Running the Examples
6053
-------------------
6154

@@ -79,10 +72,7 @@ The chat client is a simple Swing GUI application that allows you to send
7972
messages to all other connected clients, and receive messages from others in a
8073
text box.
8174

82-
In the example folder is also a simple HTML file chat client `chat.html`, which can be opened by any browser. If the browser natively supports the WebSocket API, then it's
83-
implementation will be used, otherwise it will fall back to a
84-
[Flash-based WebSocket Implementation](http://github.com/gimite/web-socket-js).
85-
75+
In the example folder is also a simple HTML file chat client `chat.html`, which can be opened by any browser.
8676

8777
Writing your own WebSocket Server
8878
---------------------------------
@@ -99,7 +89,7 @@ Writing your own WebSocket Client
9989

10090
The `org.java_websocket.client.WebSocketClient` abstract class can connect to
10191
valid WebSocket servers. The constructor expects a valid `ws://` URI to
102-
connect to. Important events `onOpen`, `onClose`, `onMessage` and `onIOError`
92+
connect to. Important events `onOpen`, `onClose`, `onMessage` and `onError`
10393
get fired throughout the life of the WebSocketClient, and must be implemented
10494
in **your** subclass.
10595

@@ -129,8 +119,8 @@ Minimum Required JDK
129119

130120
`Java-WebSocket` is known to work with:
131121

132-
* Java 1.5 (aka SE 6)
133-
* Android 1.6 (API 4)
122+
* Java 1.6 and higher
123+
* Android 4.0 and higher
134124

135125
Other JRE implementations may work as well, but haven't been tested.
136126

‎build.xml‎

Lines changed: 45 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,52 @@
11
<project default="all">
2-
<target name="all" depends="doc,jar" />
2+
<target name="all" depends="doc,jar" />
33

4-
<target name="compile">
5-
<mkdir dir="build/classes" />
6-
<mkdir dir="build/examples" />
7-
<javac includeantruntime="false" debug="on" srcdir="src/main/java"
8-
destdir="build/classes" target="1.6" source="1.6">
9-
</javac>
10-
<javac includeantruntime="false" srcdir="src/main/example/"
11-
classpath="build/classes" destdir="build/examples" />
12-
</target>
4+
<target name="compile">
5+
<mkdir dir="build/classes" />
6+
<mkdir dir="build/examples" />
7+
<javac includeantruntime="false" debug="on" srcdir="src/main/java"
8+
destdir="build/classes" target="1.6" source="1.6">
9+
</javac>
10+
<javac includeantruntime="false" srcdir="src/main/example/"
11+
classpath="build/classes" destdir="build/examples" />
12+
</target>
1313

14-
<target name="jar" depends="compile">
15-
<mkdir dir="dist"/>
16-
<jar destfile="dist/java_websocket.jar">
17-
<fileset dir="build/classes" includes="**/*.class" />
18-
</jar>
19-
</target>
14+
<target name="jar" depends="compile">
15+
<mkdir dir="dist"/>
16+
<jar destfile="dist/java_websocket.jar">
17+
<fileset dir="build/classes" includes="**/*.class" />
18+
</jar>
19+
</target>
2020

21-
<target name="doc">
22-
<delete dir="doc" />
23-
<javadoc sourcepath="src/main/java" destdir="doc" />
24-
</target>
21+
<target name="compileAutobahn">
22+
<mkdir dir="build/classes" />
23+
<mkdir dir="build/examples" />
24+
<javac includeantruntime="false" debug="on" srcdir="src/main/java"
25+
destdir="build/classes" target="1.6" source="1.6">
26+
</javac>
27+
<javac includeantruntime="false" debug="on" srcdir="src/test/java/org/java_websocket/example"
28+
destdir="build/classes" target="1.6" source="1.6">
29+
</javac>
30+
</target>
2531

26-
<target name="clean">
27-
<delete dir="build" />
28-
<delete dir="dist" />
29-
</target>
32+
<target name="jarAutobahn" depends="compileAutobahn">
33+
<mkdir dir="dist"/>
34+
<jar destfile="dist/autobahnserver.jar">
35+
<fileset dir="build/classes" includes="**/*.class" />
36+
<manifest>
37+
<attribute name="Main-Class" value="org.java_websocket.example.AutobahnServerTest"/>
38+
</manifest>
39+
</jar>
40+
</target>
41+
42+
<target name="doc">
43+
<delete dir="doc" />
44+
<javadoc sourcepath="src/main/java" destdir="doc" />
45+
</target>
46+
47+
<target name="clean">
48+
<delete dir="build" />
49+
<delete dir="dist" />
50+
</target>
3051

3152
</project>

0 commit comments

Comments
 (0)