complete refactoring of modbus plugin - introduced serial port wrappe…

…r - introduced support for rtu over tcp mode - test scaffolding
freedomotic · Jul 16, 2016 · a4967cd · a4967cd
1 parent f87f050
commit a4967cd
Show file tree

Hide file tree

Showing 17 changed files with 1,201 additions and 472 deletions.
diff --git a/plugins/devices/modbus/pom.xml b/plugins/devices/modbus/pom.xml
@@ -1,11 +1,12 @@
+
 <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>
         <groupId>com.freedomotic</groupId>
-        <artifactId>freedomotic</artifactId>
+        <artifactId>freedomotic-plugins</artifactId>
         <version>5.6-SNAPSHOT</version>
-        <relativePath>../../../</relativePath>
+        <relativePath>../../</relativePath>
     </parent>    
     <artifactId>modbus</artifactId>
     <packaging>jar</packaging>
@@ -45,6 +46,20 @@
         <freedomotic.marketplace.password></freedomotic.marketplace.password>
 
     </properties>
+    <repositories>
+        <repository>
+            <releases>
+                <enabled>true</enabled>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>modbus-data-source</id>
+            <name>Modbus Dependencies</name>
+            <url>http://mangoautomation.net:9902/maven-repo/</url>
+        </repository>
+    </repositories>
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -58,15 +73,11 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.serotonin</groupId>
+            <groupId>com.infiniteautomation</groupId>
             <artifactId>modbus4j</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.serotonin</groupId>
-            <artifactId>seroutil</artifactId>
-            <version>1.1</version>
+            <version>3.0.0</version>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -122,5 +133,5 @@
             </plugin>
         </plugins>
     </build>
- </project>
+</project>
 
diff --git a/...ces/modbus/src/main/java/com/freedomotic/plugins/devices/modbus/FreedomModbusLocator.java b/...ces/modbus/src/main/java/com/freedomotic/plugins/devices/modbus/FreedomModbusLocator.java