Merge branch 'updates' into 'master'

jacek-marchwicki · jacek-marchwicki · commit 28a671cbf9f7 · 2016-04-21T20:05:02.000+02:00
Updates in plugin + docker file



See merge request !7
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip
diff --git a/websockets-rxjava-example/build.gradle b/websockets-rxjava-example/build.gradle
@@ -1,16 +1,18 @@
 buildscript {
     repositories {
         mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.0-beta1'
     }
 }
 
 apply plugin: 'com.android.application'
 
 repositories {
     mavenCentral()
+    jcenter()
     maven { url 'https://commondatastorage.googleapis.com/maven-repository/' }
 }
 
@@ -45,4 +47,9 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
diff --git a/websockets-rxjava-example/src/main/java/com/appunite/socket/MainActivity.java b/websockets-rxjava-example/src/main/java/com/appunite/socket/MainActivity.java
@@ -148,7 +148,7 @@ public RetentionFragment() {
 			final OkHttpClient okHttpClient = new OkHttpClient();
 			final RxWebSockets webSockets = new RxWebSockets(okHttpClient, new Request.Builder()
 					.get()
-					.url("ws://10.10.0.2:8080/ws")
+					.url("ws://130.211.87.140:80/ws")
 					.addHeader("Sec-WebSocket-Protocol", "chat")
 					.build());
 			final GsonObjectSerializer serializer = new GsonObjectSerializer(gson, Message.class);
diff --git a/websockets-rxjava/build.gradle b/websockets-rxjava/build.gradle
@@ -1,18 +1,23 @@
 buildscript {
     repositories {
         mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.0-beta1'
     }
 }
 
 apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'signing'
 
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 repositories {
     mavenCentral()
+    jcenter()
 }
 
 dependencies {
diff --git a/websockets-server/Dockerfile b/websockets-server/Dockerfile
@@ -0,0 +1,8 @@
+FROM python:2.7.10
+MAINTAINER Jacek Marchwicki "jacek.marchwicki@gmail.com"
+
+COPY server server
+RUN cd server && python setup.py install
+
+EXPOSE 80
+CMD websockets-server --host 0.0.0.0 --port 80 --stdio
diff --git a/websockets-server/server/example/hub/websocket.py b/websockets-server/server/example/hub/websocket.py
@@ -25,8 +25,10 @@
 from twisted.web.resource import Resource
 from autobahn.twisted.websocket import WebSocketServerFactory, \
     WebSocketServerProtocol
-from autobahn.twisted.resource import WebSocketResource, HTTPChannelHixie76Aware
+from autobahn.twisted.resource import WebSocketResource
 
+import txaio
+txaio.use_twisted()
 
 DELTA = timedelta(weeks=1)
 SAFE_WAIT = 3
@@ -58,7 +60,7 @@ def send_to_all(msg, except_connection=None):
     class EchoServerProtocol(WebSocketServerProtocol):
 
         def __init__(self):
-            pass
+            super(EchoServerProtocol, self).__init__()
 
         def send_error(self, error_message):
             logger.error(error_message)
@@ -122,8 +124,8 @@ def onOpen(self):
 
     url = "ws://%s:%d" % (host, port)
 
-    factory = WebSocketServerFactory(url)
-    factory.protocol = EchoServerProtocol
+    factory = WebSocketServerFactory(url, debug=True, debugCodePaths=True)
+    factory.protocol = lambda: EchoServerProtocol()
     factory.setProtocolOptions(allowHixie76=True)
 
     resource = WebSocketResource(factory)
diff --git a/websockets-server/server/setup.py b/websockets-server/server/setup.py
@@ -21,7 +21,7 @@
   author_email = "jacek.marchwicki@gmail.com",
   packages = find_packages(),
   license = "Apache 2.0",
-  install_requires = ['autobahn==0.10.7', 'twisted==15.4.0', 'pyasn1', 'SQLAlchemy', 'python-daemon', 'service_identity'],
+  install_requires = ['autobahn==0.10.7', 'twisted==15.4.0', 'pyasn1', 'SQLAlchemy', 'python-daemon', 'service_identity==14.0.0'],
   entry_points = {
     "console_scripts": [
       'websockets-server = example.hub:main',

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,18 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`repositories {`
`3`	`3`	`mavenCentral()`
	`4`	`+ jcenter()`
`4`	`5`	`}`
`5`	`6`	`dependencies {`
`6`		`- classpath 'com.android.tools.build:gradle:1.1.0'`
	`7`	`+ classpath 'com.android.tools.build:gradle:2.1.0-beta1'`
`7`	`8`	`}`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`apply plugin: 'com.android.application'`
`11`	`12`
`12`	`13`	`repositories {`
`13`	`14`	`mavenCentral()`
	`15`	`+ jcenter()`
`14`	`16`	`maven { url 'https://commondatastorage.googleapis.com/maven-repository/' }`
`15`	`17`	`}`
`16`	`18`
`@@ -45,4 +47,9 @@ android {`
`45`	`47`	`lintOptions {`
`46`	`48`	`disable 'InvalidPackage'`
`47`	`49`	`}`
	`50`	`+`
	`51`	`+ compileOptions {`
	`52`	`+ sourceCompatibility JavaVersion.VERSION_1_7`
	`53`	`+ targetCompatibility JavaVersion.VERSION_1_7`
	`54`	`+ }`
`48`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,23 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`repositories {`
`3`	`3`	`mavenCentral()`
	`4`	`+ jcenter()`
`4`	`5`	`}`
`5`	`6`	`dependencies {`
`6`		`- classpath 'com.android.tools.build:gradle:1.1.0'`
	`7`	`+ classpath 'com.android.tools.build:gradle:2.1.0-beta1'`
`7`	`8`	`}`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`apply plugin: 'java'`
`11`	`12`	`apply plugin: 'maven'`
`12`	`13`	`apply plugin: 'signing'`
`13`	`14`
	`15`	`+sourceCompatibility = 1.7`
	`16`	`+targetCompatibility = 1.7`
	`17`	`+`
`14`	`18`	`repositories {`
`15`	`19`	`mavenCentral()`
	`20`	`+ jcenter()`
`16`	`21`	`}`
`17`	`22`
`18`	`23`	`dependencies {`