Merge pull request #237 from openworm/development

Release 0.2.0

.project

@@ -21,8 +21,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
 			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/org.springframework.ide.eclipse.core.springbuilder.launch</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 		<buildCommand>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "org.geppetto.frontend",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-cli": "~0.1.13",

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.geppetto</groupId>
 	<artifactId>frontend</artifactId>
-	<version>0.1.9</version>
+	<version>0.2.0</version>
 	<name>Geppetto Frontend</name>
 	<packaging>war</packaging>
 	<properties>

src/main/java/org/geppetto/frontend/Resources.java

@@ -17,7 +17,7 @@ public enum Resources {
 						" - you can join the ongoing simulation as an observer "),
 	SERVER_AVAILABLE("The current operator left the control of Geppetto." +
 						" Refresh your browser to attempt to assume control (first come, first served).");
-
+	
 	private Resources(final String text) {
 		this.text = text;
 	}

src/main/java/org/geppetto/frontend/TransportMessageFactory.java

@@ -88,7 +88,7 @@ public static GeppettoTransportMessage getTransportMessage(String requestID, OUT
 				params.add(new SimpleEntry<String, String>("message", Resources.SERVER_AVAILABLE.toString()));
 				break;
 			case SIMULATOR_FULL:
-				params.add(new SimpleEntry<String, String>("simulatorFull",  (update!=null) ? update : EMPTY_STRING));
+				params.add(new SimpleEntry<String, String>("message",  (update!=null) ? update : EMPTY_STRING));
 				break;
 			case SIMULATION_LOADED:
 				params.add(new SimpleEntry<String, String>(OUTBOUND_MESSAGE_TYPES.SIMULATION_LOADED.toString(),  (update!=null) ? update : EMPTY_STRING));