From 2886aa0babf703ab5fc7bd0ddc000ac796cd2648 Mon Sep 17 00:00:00 2001
From: andrea <andrea@samarcanda>
Date: Tue, 10 Sep 2013 15:00:18 +0200
Subject: [PATCH] Extracted common pojo messages definitions

---
 .gitignore                                    |  1 +
 parser/pom.xml                                |  6 ++
 parser_commons/pom.xml                        | 86 +++++++++++++++++++
 .../proto/messages/AbstractMessage.java       |  0
 .../proto/messages/ConnAckMessage.java        |  0
 .../proto/messages/ConnectMessage.java        |  0
 .../proto/messages/DisconnectMessage.java     |  0
 .../proto/messages/MessageIDMessage.java      |  0
 .../proto/messages/PingReqMessage.java        |  0
 .../proto/messages/PingRespMessage.java       |  0
 .../proto/messages/PubAckMessage.java         |  0
 .../proto/messages/PubRecMessage.java         |  0
 .../proto/messages/PubRelMessage.java         |  0
 .../proto/messages/PublishMessage.java        |  0
 .../proto/messages/SubAckMessage.java         |  0
 .../proto/messages/SubscribeMessage.java      |  0
 .../proto/messages/UnsubAckMessage.java       |  0
 .../proto/messages/UnsubscribeMessage.java    |  0
 .../proto/messages/ZeroLengthMessage.java     |  0
 pom.xml                                       |  2 +
 20 files changed, 95 insertions(+)
 create mode 100644 parser_commons/pom.xml
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/AbstractMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnAckMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnectMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/DisconnectMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/PingReqMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/PingRespMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/PubAckMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRecMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRelMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/SubAckMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/SubscribeMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubAckMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubscribeMessage.java (100%)
 rename {parser => parser_commons}/src/main/java/org/dna/mqtt/moquette/proto/messages/ZeroLengthMessage.java (100%)

diff --git a/.gitignore b/.gitignore
index b00a78f7..2bbda7ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 *.iml
 broker/target/
 client/target/
+/parser_commons/target/
\ No newline at end of file
diff --git a/parser/pom.xml b/parser/pom.xml
index 999fc9f1..7609c266 100644
--- a/parser/pom.xml
+++ b/parser/pom.xml
@@ -25,6 +25,12 @@
             <version>2.0.4</version>
         </dependency>
         
+        <dependency>
+            <groupId>org.dna.mqtt</groupId>
+            <artifactId>moquette-parser-commons</artifactId>
+            <version>0.2</version>
+        </dependency>
+        
         <!--dependency>
             <groupId>com.googlecode.disruptor</groupId>
             <artifactId>disruptor</artifactId>
diff --git a/parser_commons/pom.xml b/parser_commons/pom.xml
new file mode 100644
index 00000000..7bcfdf9a
--- /dev/null
+++ b/parser_commons/pom.xml
@@ -0,0 +1,86 @@
+
+<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>
+    <parent>
+        <relativePath>../pom.xml</relativePath>
+        <artifactId>moquette-parent</artifactId>
+        <groupId>org.dna.mqtt</groupId>
+        <version>0.2</version>
+    </parent>
+
+    <artifactId>moquette-parser-commons</artifactId>
+    <packaging>jar</packaging>
+    <version>0.2</version>
+    <name>Moquette - Parser Commons</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.6.4</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.2</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <!-- needs extra dependencies: objenesis & hamcrest -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>  
+            <version>1.9.0</version> 
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude>
+                        <exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+    
+    <repositories>
+<!--        <repository>
+            <id>Fusesource Releases</id>
+            <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
+        </repository>-->
+<!--        <repository>
+            <id>fusesource.snapshots</id>
+            <name>FuseSource Snapshot Repository</name>
+            <url>http://repo.fusesource.com/nexus/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>-->
+    </repositories>
+</project>
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/AbstractMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/AbstractMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/AbstractMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/AbstractMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnAckMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnAckMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnAckMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnAckMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnectMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnectMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnectMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ConnectMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/DisconnectMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/DisconnectMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/DisconnectMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/DisconnectMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PingReqMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PingReqMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PingReqMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PingReqMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PingRespMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PingRespMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PingRespMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PingRespMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PubAckMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubAckMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PubAckMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubAckMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRecMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRecMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRecMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRecMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRelMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRelMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRelMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubRelMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/SubAckMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/SubAckMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/SubAckMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/SubAckMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/SubscribeMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/SubscribeMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/SubscribeMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/SubscribeMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubAckMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubAckMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubAckMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubAckMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubscribeMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubscribeMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubscribeMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/UnsubscribeMessage.java
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/ZeroLengthMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ZeroLengthMessage.java
similarity index 100%
rename from parser/src/main/java/org/dna/mqtt/moquette/proto/messages/ZeroLengthMessage.java
rename to parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/ZeroLengthMessage.java
diff --git a/pom.xml b/pom.xml
index 798ec1bb..a9a4e809 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,10 +16,12 @@
     
 
     <modules>
+        <module>parser_commons</module>
         <module>parser</module>
         <module>netty_parser</module>
         <module>broker</module>
         <module>benchmarking</module>
+        <module>parser_commons</module>
     </modules>
 
 </project>