Merge pull request #79 from warmachine64/master

Revert "Revert "Revert "Refractored so that msl can now be invoked fr…
FINRAOS · Aug 30, 2016 · 9f70c3c · 9f70c3c
2 parents 67677b9 + 0c8a519
commit 9f70c3c
Show file tree

Hide file tree

Showing 4 changed files with 416 additions and 397 deletions.
diff --git a/msl-client-java/pom.xml b/msl-client-java/pom.xml
@@ -94,6 +94,17 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+  				<groupId>org.jacoco</groupId> 
+  				<artifactId>jacoco-maven-plugin</artifactId>
+  				<version>${jacoco.version}</version>
+  				<configuration>
+  				<excludes>
+    				<exclude>**com.steadystate*</exclude>
+  				</excludes>
+  				</configuration>
+  			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>

diff --git a/msl-server-node/bin/msl b/msl-server-node/bin/msl
@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require('../web-server')();
+require('../web-server');