Deprecated newModel() method without URI (Bug # 136107)

diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ACTInterpreter.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ACTInterpreter.java
index 5d7f7ea..ccada6c 100644
--- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ACTInterpreter.java
+++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ACTInterpreter.java

@@ -217,7 +217,7 @@
 //								System.out.println("ERROR: model " + l.metaModel + " not loaded yet.");
 //								System.exit(1);
 							}
-							m = ml.newModel(l.model, mm);
+							m = ml.newModel(l.model, (String)params.get(l.name), mm);
 						}
 						env.addModel(l.name, m);
 						models.put(l.model, m);
@@ -308,7 +308,7 @@
 //								System.out.println("ERROR: model " + l.metaModel + " not loaded yet.");
 //								System.exit(1);
 							}
-							m = ml.newModel(l.model, mm);
+							m = ml.newModel(l.model, (String)params.get(l.name), mm);
 						}
 						env.addModel(l.name, m);
 						models.put(l.model, m);

diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInterpreter.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInterpreter.java
index beede2a..f341ba7 100644
--- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInterpreter.java
+++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ASMInterpreter.java

@@ -390,9 +390,10 @@
 				env.addModel(ml.loadModel(mAndMm[1], env.getModel("MOF"), url));
 			}
 			if(isTarget) {
+				String url = getURL(params, mAndMm[0]);
 				logger.info("Creating model " + mAndMm[0] + " : " + mAndMm[1]);
 //				System.out.println("Creating model " + mAndMm[0] + " : " + mAndMm[1]);
-				env.addModel(ml.newModel(mAndMm[0], env.getModel(mAndMm[1])));
+				env.addModel(ml.newModel(mAndMm[0], url, env.getModel(mAndMm[1])));
 			} else {
 				String url = getURL(params, mAndMm[0]);
 				logger.info("Loading model " + mAndMm[0] + " : " + mAndMm[1] + " from \"" + url + "\".");

diff --git a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ModelLoader.java b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ModelLoader.java
index 394360a..7f6c313 100644
--- a/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ModelLoader.java
+++ b/plugins/org.eclipse.m2m.atl.engine.vm/src/org/eclipse/m2m/atl/engine/vm/ModelLoader.java

@@ -65,7 +65,7 @@
 			String url = ss[ss.length - 1];
 			ret = realLoadModel(name, metamodel, url);
 		} else {
-			ret = newModel(name, metamodel);
+			ret = newModel(name, ss[ss.length - 1], metamodel);
 			inject(ret, ss[0], (ss.length == 3) ? ss[1] : null, ss[ss.length - 1], null);
 		}
 		
@@ -142,10 +142,22 @@
  			return root;
 	}
 
-
-
+	/**
+	 * @param name
+	 * @param metamodel
+	 * @return A new ASMModel
+	 * @deprecated Use {@link #newModel(String, String, ASMModel)} instead  
+	 */
 	public abstract ASMModel newModel(String name, ASMModel metamodel);
 
+	/**
+	 * @param name
+	 * @param uri
+	 * @param metamodel
+	 * @return A new ASMModel
+	 */
+	public abstract ASMModel newModel(String name, String uri, ASMModel metamodel);
+
 	protected abstract void setParameter(String name, Object value);
 
 	protected abstract void realSave(ASMModel model, String href);