Merge remote-tracking branch 'origin/Robert/Persitence' into 2.2.1

org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/entry/ExecutableEntry.java

@@ -147,6 +147,46 @@ public class ExecutableEntry extends DiscreteEntry {
 		}
 	}
 	
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ice.datastructures.entry.DiscreteEntry#clone()
+	 */
+	@Override
+	public Object clone() {
+		ExecutableEntry entry = new ExecutableEntry();
+		entry.copy(this);
+		return entry;
+	}
+	
+
+	/**
+	 * Copy the source entity's data into this object.
+	 * 
+	 * @param entity The Entry of which this object will be come a copy.
+	 */
+	public void copy(ExecutableEntry entity) {
+
+		// Return if null
+		if (entity == null) {
+			return;
+		}
+
+		//Copy all data members
+		super.copy(entity);
+		executableUri = entity.executableUri;
+		
+		//Clear the current map
+		allowedValueToURI.clear();
+		
+		//Copy in each value from the other map.
+		for(String value : entity.allowedValueToURI.keySet()){
+			allowedValueToURI.put(value, allowedValueToURI.get(value));
+		}
+		
+		return;
+	}
+	
 	/*
 	 * (non-Javadoc)
 	 * 

org.eclipse.ice.parent/pom.xml

@@ -4,7 +4,7 @@
 
 	<!-- Custom properties -->
 	<properties>
-		<releaseName>2.2.0</releaseName>
+		<releaseName>next</releaseName>
 		<tycho-version>0.24.0</tycho-version>
 		<tycho-extras-version>${tycho-version}</tycho-extras-version>
 		<cbi-plugins.version>1.1.3</cbi-plugins.version>

org.eclipse.ice.vibe/src/org/eclipse/ice/vibe/model/VibeModel.java

@@ -22,6 +22,7 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -58,6 +59,7 @@ public class VibeModel extends Model {
 	
 	private ArrayList<String> actionItems;
 
+	@XmlTransient
 	private IIOService ioService;