Skip to content

Commit 6e3af3a

Browse files
marci4marci4
committed
Initial slf4j commit
1 parent ad2c1a3 commit 6e3af3a

21 files changed

+226
-192
lines changed

‎pom.xml‎

Lines changed: 117 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,121 @@
1-
<?xml version="1.0" encoding="UTF-8"?><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">
2-
<modelVersion>4.0.0</modelVersion>
3-
<groupId>org.java-websocket</groupId>
4-
<artifactId>Java-WebSocket</artifactId>
5-
<packaging>jar</packaging>
6-
<version>1.3.9-dev</version>
7-
<name>Java-WebSocket</name>
8-
<description>A barebones WebSocket client and server implementation written 100% in Java</description>
9-
<url>https://github.com/TooTallNate/Java-WebSocket</url>
10-
<properties>
11-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
</properties>
13-
<licenses>
14-
<license>
15-
<name>MIT License</name>
16-
<url>https://github.com/TooTallNate/Java-WebSocket/blob/master/LICENSE</url>
17-
</license>
18-
</licenses>
19-
<scm>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>org.java-websocket</groupId>
6+
<artifactId>Java-WebSocket</artifactId>
7+
<packaging>jar</packaging>
8+
<version>1.3.9-dev</version>
9+
<name>Java-WebSocket</name>
10+
<description>A barebones WebSocket client and server implementation written 100% in Java</description>
2011
<url>https://github.com/TooTallNate/Java-WebSocket</url>
21-
</scm>
22-
<build>
23-
<sourceDirectory>src/main/java</sourceDirectory>
24-
<plugins>
25-
<plugin>
26-
<groupId>org.sonatype.plugins</groupId>
27-
<artifactId>nexus-staging-maven-plugin</artifactId>
28-
<version>1.6.7</version>
29-
<extensions>true</extensions>
30-
<configuration>
31-
<serverId>ossrh</serverId>
32-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
33-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
34-
</configuration>
35-
</plugin>
36-
<plugin>
37-
<groupId>org.apache.maven.plugins</groupId>
38-
<artifactId>maven-source-plugin</artifactId>
39-
<version>2.2.1</version>
40-
<executions>
41-
<execution>
42-
<id>attach-sources</id>
43-
<goals>
44-
<goal>jar-no-fork</goal>
45-
</goals>
46-
</execution>
47-
</executions>
48-
</plugin>
49-
<plugin>
50-
<groupId>org.apache.maven.plugins</groupId>
51-
<artifactId>maven-javadoc-plugin</artifactId>
52-
<version>2.9.1</version>
53-
<executions>
54-
<execution>
55-
<id>attach-javadocs</id>
56-
<goals>
57-
<goal>jar</goal>
58-
</goals>
59-
</execution>
60-
</executions>
61-
</plugin>
62-
<plugin>
63-
<groupId>org.apache.maven.plugins</groupId>
64-
<artifactId>maven-gpg-plugin</artifactId>
65-
<version>1.5</version>
66-
<executions>
67-
<execution>
68-
<id>sign-artifacts</id>
69-
<phase>verify</phase>
70-
<goals>
71-
<goal>sign</goal>
72-
</goals>
73-
</execution>
74-
</executions>
75-
</plugin>
76-
<plugin>
77-
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-compiler-plugin</artifactId>
79-
<configuration>
80-
<source>1.6</source>
81-
<target>1.6</target>
82-
</configuration>
83-
</plugin>
84-
</plugins>
85-
</build>
86-
<dependencies>
87-
<dependency>
88-
<groupId>junit</groupId>
89-
<artifactId>junit</artifactId>
90-
<version>4.11</version>
91-
<scope>test</scope>
92-
</dependency>
93-
<dependency>
94-
<groupId>org.json</groupId>
95-
<artifactId>json</artifactId>
96-
<version>20171018</version>
97-
<scope>test</scope>
98-
</dependency>
99-
</dependencies>
100-
<developers>
101-
<developer>
102-
<name>Nathan Rajlich</name>
103-
<url>https://github.com/TooTallNate</url>
104-
<email>nathan@tootallnate.net</email>
105-
</developer>
106-
<developer>
107-
<name>Marcel Prestel</name>
108-
<url>https://github.com/marci4</url>
109-
<email>admin@marci4.de</email>
110-
</developer>
111-
</developers>
12+
<properties>
13+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14+
</properties>
15+
<licenses>
16+
<license>
17+
<name>MIT License</name>
18+
<url>https://github.com/TooTallNate/Java-WebSocket/blob/master/LICENSE</url>
19+
</license>
20+
</licenses>
21+
<scm>
22+
<url>https://github.com/TooTallNate/Java-WebSocket</url>
23+
</scm>
24+
<build>
25+
<sourceDirectory>src/main/java</sourceDirectory>
26+
<plugins>
27+
<plugin>
28+
<groupId>org.sonatype.plugins</groupId>
29+
<artifactId>nexus-staging-maven-plugin</artifactId>
30+
<version>1.6.7</version>
31+
<extensions>true</extensions>
32+
<configuration>
33+
<serverId>ossrh</serverId>
34+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
35+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
36+
</configuration>
37+
</plugin>
38+
<plugin>
39+
<groupId>org.apache.maven.plugins</groupId>
40+
<artifactId>maven-source-plugin</artifactId>
41+
<version>2.2.1</version>
42+
<executions>
43+
<execution>
44+
<id>attach-sources</id>
45+
<goals>
46+
<goal>jar-no-fork</goal>
47+
</goals>
48+
</execution>
49+
</executions>
50+
</plugin>
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-javadoc-plugin</artifactId>
54+
<version>2.9.1</version>
55+
<executions>
56+
<execution>
57+
<id>attach-javadocs</id>
58+
<goals>
59+
<goal>jar</goal>
60+
</goals>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-gpg-plugin</artifactId>
67+
<version>1.5</version>
68+
<executions>
69+
<execution>
70+
<id>sign-artifacts</id>
71+
<phase>verify</phase>
72+
<goals>
73+
<goal>sign</goal>
74+
</goals>
75+
</execution>
76+
</executions>
77+
</plugin>
78+
<plugin>
79+
<groupId>org.apache.maven.plugins</groupId>
80+
<artifactId>maven-compiler-plugin</artifactId>
81+
<configuration>
82+
<source>1.6</source>
83+
<target>1.6</target>
84+
</configuration>
85+
</plugin>
86+
</plugins>
87+
</build>
88+
<dependencies>
89+
<dependency>
90+
<groupId>org.slf4j</groupId>
91+
<artifactId>slf4j-api</artifactId>
92+
<version>1.8.0-beta1</version>
93+
</dependency>
94+
<dependency>
95+
<groupId>junit</groupId>
96+
<artifactId>junit</artifactId>
97+
<version>4.11</version>
98+
<scope>test</scope>
99+
</dependency>
100+
<dependency>
101+
<groupId>org.json</groupId>
102+
<artifactId>json</artifactId>
103+
<version>20171018</version>
104+
<scope>test</scope>
105+
</dependency>
106+
</dependencies>
107+
<developers>
108+
<developer>
109+
<name>Nathan Rajlich</name>
110+
<url>https://github.com/TooTallNate</url>
111+
<email>nathan@tootallnate.net</email>
112+
</developer>
113+
<developer>
114+
<name>Marcel Prestel</name>
115+
<url>https://github.com/marci4</url>
116+
<email>admin@marci4.de</email>
117+
</developer>
118+
</developers>
112119
</project>
113120

114121

‎src/main/example/ChatClient.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ public void onError( Exception ex ) {
170170
}
171171

172172
public static void main( String[] args ) {
173-
WebSocketImpl.DEBUG = true;
174173
String location;
175174
if( args.length != 0 ) {
176175
location = args[ 0 ];

‎src/main/example/ChatServer.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public void onMessage( WebSocket conn, ByteBuffer message ) {
7575

7676

7777
public static void main( String[] args ) throws InterruptedException , IOException {
78-
WebSocketImpl.DEBUG = true;
7978
int port = 8887; // 843 flash policy port
8079
try {
8180
port = Integer.parseInt( args[ 0 ] );

‎src/main/example/ChatServerAttachmentExample.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ public void onMessage( WebSocket conn, ByteBuffer message ) {
7777
}
7878

7979
public static void main( String[] args ) throws InterruptedException , IOException {
80-
WebSocketImpl.DEBUG = true;
8180
int port = 8887; // 843 flash policy port
8281
try {
8382
port = Integer.parseInt( args[ 0 ] );

‎src/main/example/CustomHeaderClientExample.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
public class CustomHeaderClientExample {
3939

4040
public static void main( String[] args ) throws URISyntaxException, InterruptedException {
41-
WebSocketImpl.DEBUG = true;
4241
Map<String,String> httpHeaders = new HashMap<String, String>();
4342
httpHeaders.put( "Cookie", "test" );
4443
ExampleClient c = new ExampleClient( new URI( "ws://localhost:8887" ), httpHeaders);

‎src/main/example/ReconnectClientExample.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
*/
3434
public class ReconnectClientExample {
3535
public static void main( String[] args ) throws URISyntaxException, InterruptedException {
36-
WebSocketImpl.DEBUG = true;
3736
ExampleClient c = new ExampleClient( new URI( "ws://localhost:8887" ) );
3837
//Connect to a server normally
3938
c.connectBlocking();

‎src/main/example/SSLClientExample.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ public class SSLClientExample {
8080
*keytool -genkey -validity 3650 -keystore "keystore.jks" -storepass "storepassword" -keypass "keypassword" -alias "default" -dname "CN=127.0.0.1, OU=MyOrgUnit, O=MyOrg, L=MyCity, S=MyRegion, C=MyCountry"
8181
*/
8282
public static void main( String[] args ) throws Exception {
83-
WebSocketImpl.DEBUG = true;
84-
8583
WebSocketChatClient chatclient = new WebSocketChatClient( new URI( "wss://localhost:8887" ) );
8684

8785
// load up the key store

‎src/main/example/SSLServerCustomWebsocketFactoryExample.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ public class SSLServerCustomWebsocketFactoryExample {
4848
*keytool -genkey -validity 3650 -keystore "keystore.jks" -storepass "storepassword" -keypass "keypassword" -alias "default" -dname "CN=127.0.0.1, OU=MyOrgUnit, O=MyOrg, L=MyCity, S=MyRegion, C=MyCountry"
4949
*/
5050
public static void main(String[] args) throws Exception {
51-
WebSocketImpl.DEBUG = true;
52-
5351
ChatServer chatserver = new ChatServer(8887); // Firefox does allow multible ssl connection only via port 443 //tested on FF16
5452

5553
// load up the key store

‎src/main/example/SSLServerExample.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ public class SSLServerExample {
4444
*keytool -genkey -validity 3650 -keystore "keystore.jks" -storepass "storepassword" -keypass "keypassword" -alias "default" -dname "CN=127.0.0.1, OU=MyOrgUnit, O=MyOrg, L=MyCity, S=MyRegion, C=MyCountry"
4545
*/
4646
public static void main( String[] args ) throws Exception {
47-
WebSocketImpl.DEBUG = true;
48-
4947
ChatServer chatserver = new ChatServer( 8887 ); // Firefox does allow multible ssl connection only via port 443 //tested on FF16
5048

5149
// load up the key store

‎src/main/example/SSLServerLetsEncryptExample.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@
5353
public class SSLServerLetsEncryptExample {
5454

5555
public static void main( String[] args ) throws Exception {
56-
WebSocketImpl.DEBUG = true;
57-
5856
ChatServer chatserver = new ChatServer( 8887 );
5957

6058
SSLContext context = getContext();

0 commit comments

Comments
 (0)