Merge branch 'develop'

anyflow · Sep 11, 2016 · 82ae2a8 · 82ae2a8
2 parents 8576375 + c9e794f
commit 82ae2a8
Show file tree

Hide file tree

Showing 88 changed files with 1,757 additions and 1,016 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@
 **/.settings
 **/.classpath
 **/.project
+**/.pmd
 
 #buildinfo
 **/buildinfo.properties

diff --git a/.travis.yml b/.travis.yml
@@ -2,3 +2,5 @@ language: java
 script: mvn clean install
 jdk:
 - oraclejdk8
+git:
+  depth: 500
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,26 @@
+FROM anyflow/javaserver
+MAINTAINER Park Hyunjeong <anyflow@gmail.com>
+
+RUN mkdir /opt/lannister/
+RUN mkdir /opt/lannister/logs
+RUN touch /opt/lannister/logs/application.log
+RUN touch /opt/lannister/logs/output.log
+
+ADD server/target/*.jar   /opt/lannister/
+ADD server/target/bin/*   /opt/lannister/bin/
+ADD server/target/conf/*  /opt/lannister/conf/
+ADD server/target/lib/*   /opt/lannister/lib/
+
+
+RUN chmod 700 /opt/lannister/bin/startup.sh
+RUN chmod 700 /opt/lannister/bin/shutdown.sh
+
+RUN ln -s /opt/lannister/bin/startup.sh startup
+RUN ln -s /opt/lannister/bin/shutdown.sh shutdown
+RUN ln -s /opt/lannister/logs/application.log application.log
+RUN ln -s /opt/lannister/logs/output.log output.log
+
+EXPOSE 1883
+EXPOSE 8883
+EXPOSE 9001
+EXPOSE 9002
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ High performance MQTT broker w/ full specifications support, Clustering, WebSock
 3. Clustering
    * Topic / Message / Message Status / Session redundant
    * No SPOF(peer-to-peer based : No master and slave)
-   * Easy Scaling out   
+   * Easy Scaling out
 4. WebSocket
 5. SSL (TCP / WebSocket both)
 6. $SYS
@@ -38,17 +38,31 @@ Lannister is **under CONSTRUCTION**. But the most of features above are implemen
 
 # Clone lannister source
 git clone https://github.com/anyflow/lannister.git
+
 # Change directory to lannister
 cd lannister
 
 # Build all(interface, server, plugin-example) projects
 mvn install
-# Change directory to lannister server
-cd server
-# Run lannister server directed by lannister.cfg/log4j.xml files in conf directory
-mvn exec:java
+
+# Run lannister server directed by lannister.cfg/hazelcast.config.xml/log4j.xml files in conf directory
+mvn exec:java -pl server
 ```
 ## Version History
+##### version 0.9.5.1 / Sep 11, 2016
+- Externalize Hazelcast config - Add hazelcast.config.xml
+- Add docker file and docker property - Run maven with profile (mvn install -Plannister.docker)
+- Add null checker in hazelcast serialization logics
+- Change WebSocket(ssl) ports to 9001(9002)
+- Update Hazelcast version to 3.7.1
+- Update Netty version to 4.1.5
+- Add PMD / Findbugs / Jacoco / surefire reports
+- Start clustering TEST/FIX
+  - Fix subscription failing on existing topic in clustered state
+- Fix subscriptions remaining on disposing (clean) session
+- Fix reconnect failing persisted session  
+- Fix remaining no subscriber topic
+
 ##### version 0.9.5.0 / May 21, 2016
 - Code Review, Test based on chapter 3.2 of Spec v3.1.1 Mandatory normative statements
 - Add $SYS Required Topics
@@ -66,4 +80,4 @@ mvn exec:java
 Park Hyunjeong / <anyflow@gmail.com>
 
 ## License
-Lannister is released under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).
+Lannister is released under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/interface/pom.xml b/interface/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.anyflow</groupId>
 		<artifactId>lannister</artifactId>
-		<version>0.9.5.0-SNAPSHOT</version>
+		<version>0.9.5.1-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 

diff --git a/interface/src/main/java/net/anyflow/lannister/plugin/Plugin.java b/interface/src/main/java/net/anyflow/lannister/plugin/Plugin.java
@@ -16,6 +16,6 @@
 
 package net.anyflow.lannister.plugin;
 
-public interface Plugin {
+public interface Plugin extends Cloneable {
 	Plugin clone();
 }
diff --git a/plugin-example/pom.xml b/plugin-example/pom.xml
@@ -4,10 +4,12 @@
 	<parent>
 		<groupId>net.anyflow</groupId>
 		<artifactId>lannister</artifactId>
-		<version>0.9.5.0-SNAPSHOT</version>
+		<version>0.9.5.1-SNAPSHOT</version>
 	</parent>
+
 	<artifactId>lannister-plugin-example</artifactId>
 	<name>lannister plugin example</name>
+
 	<packaging>jar</packaging>
 
 	<repositories>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>net.anyflow</groupId>
 	<artifactId>lannister</artifactId>
-	<version>0.9.5.0-SNAPSHOT</version>
+	<version>0.9.5.1-SNAPSHOT</version>
 	<name>lannister</name>
 	<description>MQTT broker with full spec support and Clustering/WebSocket/SSL based on Java - Netty/Hazelcast</description>
 	<packaging>pom</packaging>
@@ -38,9 +38,8 @@
 
 
 	<profiles>
-		<!-- Just for fixing compile time error on pom.xml -->
 		<profile>
-			<id>dummy.profile</id>
+			<id>lannister.local</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
@@ -49,6 +48,13 @@
 				<github.global.server>github</github.global.server>
 			</properties>
 		</profile>
+		<profile>
+			<id>lannister.docker</id>
+			<properties>
+				<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+				<github.global.server>github</github.global.server>
+			</properties>
+		</profile>		
 	</profiles>
 
 	<dependencies>
@@ -79,7 +85,7 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
-			<version>4.1.0.CR7</version>
+			<version>4.1.5.Final</version>
 		</dependency>
 	</dependencies>
 
@@ -131,7 +137,7 @@
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.1.7</version>
+				<version>2.2.1</version>
 				<executions>
 					<execution>
 						<goals>
@@ -140,6 +146,7 @@
 					</execution>
 				</executions>
 				<configuration>
+					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
 					<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
 					<generateGitPropertiesFile>true</generateGitPropertiesFile>
 					<failOnNoGitDirectory>false</failOnNoGitDirectory>
@@ -160,6 +167,59 @@
 					<altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
 				</configuration>
 			</plugin>
+
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-pmd-plugin</artifactId>
+				<version>3.6</version>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<version>3.0.3</version>
+				<configuration>
+					<xmlOutput>true</xmlOutput>
+					<xmlOutputDirectory>target/site</xmlOutputDirectory>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.5.1</version>
+				<configuration>
+					<reportPlugins>
+						<plugin>
+							<groupId>org.codehaus.mojo</groupId>
+							<artifactId>findbugs-maven-plugin</artifactId>
+						</plugin>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-pmd-plugin</artifactId>
+						</plugin>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-checkstyle-plugin</artifactId>
+						</plugin>
+						<plugin>
+							<groupId>org.jacoco</groupId>
+							<artifactId>jacoco-maven-plugin</artifactId>
+						</plugin>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-surefire-report-plugin</artifactId>
+						</plugin>
+					</reportPlugins>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/server/pom.xml b/server/pom.xml
@@ -1,14 +1,37 @@
-<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">
+<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">
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>lannister-server</artifactId>
 	<name>lannister server</name>
+
 	<parent>
 		<groupId>net.anyflow</groupId>
 		<artifactId>lannister</artifactId>
-		<version>0.9.5.0-SNAPSHOT</version>
+		<version>0.9.5.1-SNAPSHOT</version>
 	</parent>
 
+	<profiles>
+		<profile>
+			<id>lannister.local</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<env>local</env>
+				<lannister.home>${project.build.directory}</lannister.home>
+				<log.path>${project.build.directory}/logs</log.path>
+			</properties>
+		</profile>
+
+		<profile>
+			<id>lannister.docker</id>
+			<properties>
+				<env>docker</env>
+			</properties>
+		</profile>
+	</profiles>
+
 	<dependencies>
 		<dependency>
 			<groupId>net.anyflow</groupId>
@@ -19,7 +42,7 @@
 		<dependency>
 			<groupId>com.hazelcast</groupId>
 			<artifactId>hazelcast</artifactId>
-			<version>3.6.2</version>
+			<version>3.7.1</version>
 		</dependency>
 
 		<dependency>
@@ -53,13 +76,13 @@
 			<artifactId>jackson-dataformat-smile</artifactId>
 			<version>2.7.4</version>
 		</dependency>
-		<!-- for menton -->
+		<!-- for lannister.web -->
 		<dependency>
 			<groupId>net.sf.jtidy</groupId>
 			<artifactId>jtidy</artifactId>
 			<version>r938</version>
 		</dependency>
-		<!-- for menton -->
+		<!-- for lannister.web -->
 		<dependency>
 			<groupId>org.reflections</groupId>
 			<artifactId>reflections</artifactId>
@@ -69,14 +92,20 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-tcnative-boringssl-static</artifactId>
-			<version>1.1.33.Fork15</version>
+			<version>1.1.33.Fork22</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.javassist</groupId>
 			<artifactId>javassist</artifactId>
 			<version>3.19.0-GA</version>
 		</dependency>
+
+		<dependency>
+			<groupId>com.jayway.jsonpath</groupId>
+			<artifactId>json-path</artifactId>
+			<version>2.2.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -91,6 +120,7 @@
 				<targetPath>../conf/</targetPath>
 				<includes>
 					<include>lannister.cfg</include>
+					<include>hazelcast.config.xml</include>					
 					<include>log4j.xml</include>
 				</includes>
 			</resource>
@@ -112,6 +142,7 @@
 				<directory>src/test/resources</directory>
 				<includes>
 					<include>lannister.cfg</include>
+					<include>hazelcast.config.xml</include>					
 					<include>log4j.xml</include>
 				</includes>
 			</testResource>

diff --git a/server/src/main/filters/docker.properties b/server/src/main/filters/docker.properties
@@ -0,0 +1,17 @@
+log.level=DEBUG
+
+lannister.home=/opt/lannister
+log.path=/opt/lannister/logs
+
+hazelcast.port=5701
+hazelcast.port-count=1
+
+hazelcast.multicast.enabled=false
+hazelcast.multicast-group=224.2.2.3
+hazelcast.multicast-port=54327
+
+hazelcast.tcp-ip.enabled=true
+hazelcast.member1=172.20.0.2
+hazelcast.member2=172.20.0.3
+
+project.build.startOption=
diff --git a/server/src/main/filters/local.properties b/server/src/main/filters/local.properties
@@ -1,4 +1,14 @@
 log.level=DEBUG
 
-project.build.startOption=
-#log.path=/Users/anyflow/SourceCodes/lannister/logs
+hazelcast.port=5701
+hazelcast.port-count=1
+
+hazelcast.multicast.enabled=true
+hazelcast.multicast-group=224.2.2.3
+hazelcast.multicast-port=54327
+
+hazelcast.tcp-ip.enabled=false
+hazelcast.member1=127.0.0.1
+hazelcast.member2=127.0.0.1
+
+project.build.startOption=