Merge pull request #8 from nectarine/v2.0.0-CR1

V2.0.0 cr1

.gitignore

@@ -10,3 +10,4 @@ bin
 build
 out
 node_modules
+classes/

build.gradle

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+apply from: 'gradle/setup.gradle'
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'eclipse'
@@ -39,19 +40,28 @@ dependencies {
     compile "org.springframework:spring-beans:$springVersion"
     compile "org.slf4j:slf4j-api:$slf4jVersion"
     compile "ch.qos.logback:logback-classic:1.0.6"
-    compile "org.vert-x:vertx-core:$vertxVersion"
-    compile "org.vert-x:vertx-platform:$vertxVersion"
+    compile "io.vertx:vertx-core:$vertxVersion"
+    compile "io.vertx:vertx-platform:$vertxVersion"
 
-    testCompile "org.vert-x:vertx-lang-java:$vertxVersion"
-    testCompile "org.vert-x:vertx-lang-rhino:$vertxVersion"
-    testCompile("org.vert-x:vertx-testframework:$vertxVersion") {
-        transitive = false
-    }
+    testCompile "io.vertx:testtools:$toolsVersion"
     testCompile "org.mozilla:rhino:$rhinoVersion"
     testCompile "junit:junit:$junitVersion"
     testCompile "org.mockito:mockito-all:1.9.0"
 }
 
+buildscript {
+
+    repositories {
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "io.vertx:vertx-core:$vertxVersion"
+        classpath "io.vertx:vertx-platform:$vertxVersion"
+    }
+}
+
 sourceSets {
     main {
         compileClasspath = compileClasspath + configurations.provided

conf/META-INF/services/org.vertx.java.platform.PlatformManagerFactory

@@ -0,0 +1 @@
+org.vertx.java.platform.impl.DefaultPlatformManagerFactory

conf/cluster.xml

@@ -0,0 +1,133 @@
+<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-basic.xsd"
+           xmlns="http://www.hazelcast.com/schema/config"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<properties>
+	    <property name="hazelcast.mancenter.enabled">false</property>
+	    <property name="hazelcast.memcache.enabled">false</property>
+	    <property name="hazelcast.rest.enabled">false</property>
+	    <property name="hazelcast.wait.seconds.before.join">0</property>
+	    <property name="hazelcast.logging.type">jdk</property>
+	</properties>
+    <group>
+        <name>dev</name>
+        <password>dev-pass</password>
+    </group>
+    <network>
+        <port auto-increment="true">5701</port>
+        <join>
+            <multicast enabled="true">
+                <multicast-group>224.2.2.3</multicast-group>
+                <multicast-port>54327</multicast-port>
+            </multicast>
+            <tcp-ip enabled="false">
+                <interface>192.168.1.28</interface>
+            </tcp-ip>
+            <aws enabled="false">
+                <access-key>my-access-key</access-key>
+                <secret-key>my-secret-key</secret-key>
+                <region>us-east-1</region>
+            </aws>
+        </join>
+        <!--
+        If you have more than one network interface, edit this to select which
+        one you want to use
+        <interfaces enabled="true">
+            <interface>192.168.1.16</interface>
+        </interfaces>
+        -->
+
+        <symmetric-encryption enabled="false">
+            <!--
+               encryption algorithm such as DES/ECB/PKCS5Padding, PBEWithMD5AndDES,
+               AES/CBC/PKCS5Padding, Blowfish, DESede
+            -->
+            <algorithm>PBEWithMD5AndDES</algorithm>
+            <!-- salt value to use when generating the secret key -->
+            <salt>thesalt</salt>
+            <!-- pass phrase to use when generating the secret key -->
+            <password>thepass</password>
+            <!-- iteration count to use when generating the secret key -->
+            <iteration-count>19</iteration-count>
+        </symmetric-encryption>
+        <asymmetric-encryption enabled="false">
+            <!-- encryption algorithm -->
+            <algorithm>RSA/NONE/PKCS1PADDING</algorithm>
+            <!-- private key password -->
+            <keyPassword>thekeypass</keyPassword>
+            <!-- private key alias -->
+            <keyAlias>local</keyAlias>
+            <!-- key store type -->
+            <storeType>JKS</storeType>
+            <!-- key store password -->
+            <storePassword>thestorepass</storePassword>
+            <!-- path to the key store -->
+            <storePath>keystore</storePath>
+        </asymmetric-encryption>
+    </network>
+    <executor-service>
+        <core-pool-size>4</core-pool-size>
+        <max-pool-size>20</max-pool-size>
+        <keep-alive-seconds>60</keep-alive-seconds>
+    </executor-service>
+    <map name="subs">
+        <!--
+            Number of backups. If 1 is set as the backup-count for example, then all entries of
+            the map will be copied to another JVM for fail-safety. 0 means no backup.
+        -->
+        <backup-count>1</backup-count>
+        <!--
+            Maximum number of seconds for each entry to stay in the map. Entries that are
+            older than <time-to-live-seconds> and not updated for <time-to-live-seconds>
+            will get automatically evicted from the map.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+        -->
+        <time-to-live-seconds>0</time-to-live-seconds>
+        <!--
+            Maximum number of seconds for each entry to stay idle in the map. Entries that are
+            idle(not touched) for more than <max-idle-seconds> will get
+            automatically evicted from the map. Entry is touched if get, put or containsKey is called.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+        -->
+        <max-idle-seconds>0</max-idle-seconds>
+        <!--
+            Valid values are:
+            NONE (no eviction),
+            LRU (Least Recently Used),
+            LFU (Least Frequently Used).
+            NONE is the default.
+        -->
+        <eviction-policy>NONE</eviction-policy>
+        <!--
+            Maximum size of the map. When max size is reached,
+            map is evicted based on the policy defined.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means
+            Integer.MAX_VALUE. Default is 0.
+        -->
+        <max-size policy="cluster_wide_map_size">0</max-size>
+        <!--
+            When max. size is reached, specified percentage of
+            the map will be evicted. Any integer between 0 and 100.
+            If 25 is set for example, 25% of the entries will
+            get evicted.
+        -->
+        <eviction-percentage>25</eviction-percentage>
+        <!--
+            While recovering from split-brain (network partitioning),
+            map entries in the small cluster will merge into the bigger cluster
+            based on the policy set here. When an entry merge into the
+            cluster, there might an existing entry with the same key already.
+            Values of these entries might be different for that same key.
+            Which value should be set for the key? Conflict is resolved by
+            the policy set here. Default policy is hz.ADD_NEW_ENTRY
+
+            There are built-in merge policies such as
+            hz.NO_MERGE      ; no entry will merge.
+            hz.ADD_NEW_ENTRY ; entry will be added if the merging entry's key
+                               doesn't exist in the cluster.
+            hz.HIGHER_HITS   ; entry with the higher hits wins.
+            hz.LATEST_UPDATE ; entry with the latest update wins.
+        -->
+        <merge-policy>hz.LATEST_UPDATE</merge-policy>
+
+    </map>
+</hazelcast>

conf/langs.properties

@@ -0,0 +1,31 @@
+# Language run-times
+# <runtime_name>=[implementing module name:]<FQCN of verticle factory>
+rhino=io.vertx~lang-rhino~2.0.0-CR1:org.vertx.java.platform.impl.RhinoVerticleFactory
+dynjs=org.dynjs~lang-dynjs~1.0.0-SNAPSHOT:org.dynjs.vertx.DynJSVerticleFactory
+jruby=io.vertx~lang-jruby~2.0.0-CR1:org.vertx.java.platform.impl.JRubyVerticleFactory
+groovy=io.vertx~lang-groovy~2.0.0-CR1:org.vertx.groovy.platform.impl.GroovyVerticleFactory
+jython=io.vertx~lang-jython~2.0.0-CR1:org.vertx.java.platform.impl.JythonVerticleFactory
+
+# Mapping of file extension to language runtime
+# If the main is specified without a runtime prefix the file extension will be used to determine
+# which runtime to use
+# If a prefix is used e.g. 'groovy:org.foo.MyMainClass' then the prefix will be used to determine the
+# runtime instead
+.js=rhino
+.coffee=rhino
+.rb=jruby
+.py=jython
+.groovy=groovy
+.class=java
+.java=java
+
+# The default runtime - if no prefix is specified and the main does not match any of the file extensions above
+# then the default will be used
+.=java
+
+
+
+
+
+
+

conf/logging.properties

@@ -0,0 +1,31 @@
+#
+# Copyright 2011 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+handlers=java.util.logging.ConsoleHandler,java.util.logging.FileHandler
+java.util.logging.SimpleFormatter.format=%5$s %6$s\n
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.ConsoleHandler.level=INFO
+java.util.logging.FileHandler.level=INFO
+java.util.logging.FileHandler.formatter=org.vertx.java.core.logging.impl.VertxLoggerFormatter
+
+# Put the log in the system temporary directory
+java.util.logging.FileHandler.pattern=%t/vertx.log
+
+.level=INFO
+org.vertx.level=INFO
+com.hazelcast.level=SEVERE
+io.netty.util.internal.PlatformDependent.level=SEVERE
+

conf/repos.txt

@@ -0,0 +1,11 @@
+# Local Maven repo on filesystem
+mavenLocal:~/.m2/repository
+
+# Maven central
+maven:http://repo2.maven.org/maven2
+
+# Sonatype snapshots
+maven:http://oss.sonatype.org/content/repositories/snapshots
+
+# Bintray
+bintray:http://dl.bintray.com

gradle.properties

@@ -1,8 +1,9 @@
 modulename=com.nhncorp.socket-io
-version=1.0.0
+version=1.1.0
 group=com.nhncorp
-gradleVersion=1.1
-vertxVersion=1.3.1.final
+gradleVersion=1.6
+vertxVersion=2.0.0-CR1
+toolsVersion=2.0.0-CR1
 springVersion=3.1.1.RELEASE
 junitVersion=4.10
 rhinoVersion=1.7R4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Jul 07 10:05:19 BST 2012
+#Wed Jun 19 16:15:54 KST 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip