diff --git a/fr.inria.diverse.cloning.benchmark.common/META-INF/MANIFEST.MF b/fr.inria.diverse.cloning.benchmark.common/META-INF/MANIFEST.MF
index 08a02ece53ee9dd8721cb3c559f87586418e9d08..dba4a3ded83717205e96c11359ba963feb5176a9 100644
--- a/fr.inria.diverse.cloning.benchmark.common/META-INF/MANIFEST.MF
+++ b/fr.inria.diverse.cloning.benchmark.common/META-INF/MANIFEST.MF
@@ -5,6 +5,6 @@ Bundle-SymbolicName: fr.inria.diverse.cloning.benchmark.common
Bundle-Version: 0.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: fr.inria.diverse.cloning.benchmark.common
-Require-Bundle: org.eclipse.emf.ecore,
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.9.1",
fr.inria.diverse.cloning.runtime;bundle-version="0.1.0"
Import-Package: fr.inria.diverse.cloning.runtime.common
diff --git a/fr.inria.diverse.cloning.benchmark.common/pom.xml b/fr.inria.diverse.cloning.benchmark.common/pom.xml
index 00f0255e7f9d1453eddf313373c11bb2f0447dae..dd1c4813d9ebc871cf14d3472864405a286caad2 100644
--- a/fr.inria.diverse.cloning.benchmark.common/pom.xml
+++ b/fr.inria.diverse.cloning.benchmark.common/pom.xml
@@ -7,32 +7,11 @@
0.1.0-SNAPSHOT
eclipse-plugin
-
-
- 0.20.0
-
- http://download.eclipse.org/releases/kepler
-
-
-
-
- kepler
- ${kepler-repo.url}
- p2
-
-
-
-
-
-
-
- org.eclipse.tycho
- tycho-maven-plugin
- ${tycho.version}
- true
-
-
-
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
diff --git a/fr.inria.diverse.cloning.benchmark.common/pom.xml~ b/fr.inria.diverse.cloning.benchmark.common/pom.xml~
index 0003c998873e8976d693e14669bfea1dd33b1042..cee1da2df7fdc099b3d90ddfb96552dbe0ab6156 100644
--- a/fr.inria.diverse.cloning.benchmark.common/pom.xml~
+++ b/fr.inria.diverse.cloning.benchmark.common/pom.xml~
@@ -7,32 +7,11 @@
0.1.0-SNAPSHOT
eclipse-plugin
-
-
- 0.20.0
-
- http://download.eclipse.org/releases/kepler
-
-
-
-
- kepler
- ${kepler-repo.url}
- p2
-
-
-
-
-
-
-
- org.eclipse.tycho
- tycho-maven-plugin
- ${tycho.version}
- true
-
-
-
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
diff --git a/fr.inria.diverse.cloning.benchmark.materialgenerator.product/.project b/fr.inria.diverse.cloning.benchmark.materialgenerator.product/.project
new file mode 100644
index 0000000000000000000000000000000000000000..6f2bffb43dd661e77244e05baf56acd6a3809826
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.materialgenerator.product/.project
@@ -0,0 +1,11 @@
+
+
+ fr.inria.diverse.cloning.benchmark.materialgenerator.product
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.materialgenerator.product/main.product b/fr.inria.diverse.cloning.benchmark.materialgenerator.product/main.product
new file mode 100644
index 0000000000000000000000000000000000000000..70efbef9e77fcc034f6daafa13780f95c77c36ad
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.materialgenerator.product/main.product
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+ -Xms128m -Xmx4096m
+ -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+
+
+
+
+
+
+
+
+
+
+
+
+ org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.materialgenerator.product/pom.xml b/fr.inria.diverse.cloning.benchmark.materialgenerator.product/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1c6994813d85d9649fec7a3dc65aa69627747ef8
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.materialgenerator.product/pom.xml
@@ -0,0 +1,38 @@
+
+
+ 4.0.0
+ fr.inria.diverse.cloning.benchmark
+ fr.inria.diverse.cloning.benchmark.materialgenerator.product
+ 0.1.0-SNAPSHOT
+ eclipse-repository
+
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
+
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-p2-director-plugin
+ ${tycho.version}
+
+
+ create-product-distributions
+
+ materialize-products
+ archive-products
+
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.materialgenerator.product/pom.xml~ b/fr.inria.diverse.cloning.benchmark.materialgenerator.product/pom.xml~
new file mode 100644
index 0000000000000000000000000000000000000000..041034428d798d28f78d9ea9572fc54f54e6f781
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.materialgenerator.product/pom.xml~
@@ -0,0 +1,38 @@
+
+
+ 4.0.0
+ fr.inria.diverse.cloning.benchmark
+ fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product
+ 0.1.0-SNAPSHOT
+ eclipse-repository
+
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
+
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-p2-director-plugin
+ ${tycho.version}
+
+
+ create-product-distributions
+
+ materialize-products
+ archive-products
+
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.materialgenerator/META-INF/MANIFEST.MF b/fr.inria.diverse.cloning.benchmark.materialgenerator/META-INF/MANIFEST.MF
index 9009a7d0b3da4cc7ae8e4a48d4659695088c0abc..ba306e8b73b3904c474b902fd7dbb61c5859d5a0 100644
--- a/fr.inria.diverse.cloning.benchmark.materialgenerator/META-INF/MANIFEST.MF
+++ b/fr.inria.diverse.cloning.benchmark.materialgenerator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BenchmarkGenerator
Bundle-SymbolicName: fr.inria.diverse.cloning.benchmark.materialgenerator;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.1.0.qualifier
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
org.eclipse.core.resources;bundle-version="3.8.101",
org.eclipse.emf.codegen.ecore;bundle-version="2.9.1",
diff --git a/fr.inria.diverse.cloning.benchmark.materialgenerator/ivy.xml b/fr.inria.diverse.cloning.benchmark.materialgenerator/ivy.xml
deleted file mode 100644
index 5cdd07df061ec141d9bdf16b9f50c259e4348310..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.materialgenerator/ivy.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fr.inria.diverse.cloning.benchmark.materialgenerator/main.product b/fr.inria.diverse.cloning.benchmark.materialgenerator/main.product
deleted file mode 100644
index c1007834c25599725508018ef46f2fe044a90231..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.materialgenerator/main.product
+++ /dev/null
@@ -1,393 +0,0 @@
-
-
-
-
-
-
-
-
-
- -Xms128m -Xmx4096m
- -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-
-
-
-
-
-
-
-
-
-
-
-
- org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fr.inria.diverse.cloning.benchmark.materialgenerator/pom.xml b/fr.inria.diverse.cloning.benchmark.materialgenerator/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2d7d3104d739766f79033c8210eeaf2c4b28408a
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.materialgenerator/pom.xml
@@ -0,0 +1,17 @@
+
+
+ 4.0.0
+ fr.inria.diverse.cloning.benchmark
+ fr.inria.diverse.cloning.benchmark.materialgenerator
+ 0.1.0-SNAPSHOT
+ eclipse-plugin
+
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.materialgenerator/target/.gitignore b/fr.inria.diverse.cloning.benchmark.materialgenerator/target/.gitignore
deleted file mode 100644
index 8ba548b51c98b72f928cce0ceb0287eebdfa6b57..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.materialgenerator/target/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/classes
diff --git a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/.project b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/.project
new file mode 100644
index 0000000000000000000000000000000000000000..f0a8a7dbc4bb39d931b4e59e6a8fcbd1f39846ba
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/.project
@@ -0,0 +1,11 @@
+
+
+ fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/main.product b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/main.product
new file mode 100644
index 0000000000000000000000000000000000000000..8edf199162d6c081a64192ea0ea97b51689b7c62
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/main.product
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+ -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/pom.xml b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..041034428d798d28f78d9ea9572fc54f54e6f781
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/pom.xml
@@ -0,0 +1,38 @@
+
+
+ 4.0.0
+ fr.inria.diverse.cloning.benchmark
+ fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product
+ 0.1.0-SNAPSHOT
+ eclipse-repository
+
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
+
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-p2-director-plugin
+ ${tycho.version}
+
+
+ create-product-distributions
+
+ materialize-products
+ archive-products
+
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/pom.xml~ b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/pom.xml~
new file mode 100644
index 0000000000000000000000000000000000000000..e38f4fe55f8d4262cdfeeabde674faca06d3305b
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/pom.xml~
@@ -0,0 +1,38 @@
+
+
+ 4.0.0
+ fr.inria.diverse.cloning
+ fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product
+ 0.1.0-SNAPSHOT
+ eclipse-repository
+
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
+
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-p2-director-plugin
+ ${tycho.version}
+
+
+ create-product-distributions
+
+ materialize-products
+ archive-products
+
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/META-INF/MANIFEST.MF b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/META-INF/MANIFEST.MF
index f897a30cb6c4a4d1a0ba3df45fcbeb59d716e052..6b52b037767a325e87681fad521ee0bac3720a3a 100644
--- a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/META-INF/MANIFEST.MF
+++ b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BenchmarkMetamodelsGenerator
Bundle-SymbolicName: fr.inria.diverse.cloning.benchmark.metamodelsgenerator;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
+Bundle-Version: 0.1.0.qualifier
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
org.eclipse.emf.ecore;bundle-version="2.9.1",
org.eclipse.emf.ecoretools.diagram;bundle-version="1.2.0",
org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.7.0",
org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
- fr.inria.diverse.cloning.materialgenerator;bundle-version="0.1.0"
+ fr.inria.diverse.cloning.materialgenerator;bundle-version="0.1.0",
+ fr.inria.diverse.cloning.runtime;bundle-version="0.1.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: fr.inria.diverse.cloning.runtime.util
Bundle-ClassPath: lib/jopt-simple-4.6.jar,
.
diff --git a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/main.product b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/main.product
deleted file mode 100644
index 30984e2223ba91e43922781f3d11565335b34d05..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/main.product
+++ /dev/null
@@ -1,379 +0,0 @@
-
-
-
-
-
-
-
-
-
- -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/pom.xml b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c11cecf3a0ad455048a8bc8e50da17913d816362
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/pom.xml
@@ -0,0 +1,17 @@
+
+
+ 4.0.0
+ fr.inria.diverse.cloning.benchmark
+ fr.inria.diverse.cloning.benchmark.metamodelsgenerator
+ 0.1.0-SNAPSHOT
+ eclipse-plugin
+
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
+
+
+
diff --git a/fr.inria.diverse.cloning.materialgenerator/pom.xml~ b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/pom.xml~
similarity index 79%
rename from fr.inria.diverse.cloning.materialgenerator/pom.xml~
rename to fr.inria.diverse.cloning.benchmark.metamodelsgenerator/pom.xml~
index db608f9b31f23976d5d7b4eea2dd7445e0b377a7..b5b3aef760aaec211b53e4012732d63fdcc423e0 100644
--- a/fr.inria.diverse.cloning.materialgenerator/pom.xml~
+++ b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/pom.xml~
@@ -3,16 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4.0.0
fr.inria.diverse.cloning
- fr.inria.diverse.cloning.materialgenerator
+ fr.inria.diverse.cloning.benchmark.metamodelsgenerator
0.1.0-SNAPSHOT
eclipse-plugin
-
fr.inria.diverse.cloning
parent
0.1.0-SNAPSHOT
- ../fr.inria.diverse.cloning.master/pom.xml
diff --git a/fr.inria.diverse.cloning.benchmark.tool.product/.project b/fr.inria.diverse.cloning.benchmark.tool.product/.project
new file mode 100644
index 0000000000000000000000000000000000000000..1960df842e785c2b2d6ea50c5678b5c13f0fa24a
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.tool.product/.project
@@ -0,0 +1,11 @@
+
+
+ fr.inria.diverse.cloning.benchmark.tool.product
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.tool.product/main.product b/fr.inria.diverse.cloning.benchmark.tool.product/main.product
new file mode 100644
index 0000000000000000000000000000000000000000..2da3e7a66c8f29466245e4fcacc20660b43cff1b
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.tool.product/main.product
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+ -Xms128m -Xmx2048m
+-agentlib:jdwp=transport=dt_socket,server=y,suspend=n
+ -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.tool.product/pom.xml b/fr.inria.diverse.cloning.benchmark.tool.product/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..72da72730d26a462327078dba53c6f683b4b6fa8
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.tool.product/pom.xml
@@ -0,0 +1,38 @@
+
+
+ 4.0.0
+ fr.inria.diverse.cloning.benchmark
+ fr.inria.diverse.cloning.benchmark.tool.product
+ 0.1.0-SNAPSHOT
+ eclipse-repository
+
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
+
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-p2-director-plugin
+ ${tycho.version}
+
+
+ create-product-distributions
+
+ materialize-products
+ archive-products
+
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.tool/META-INF/MANIFEST.MF b/fr.inria.diverse.cloning.benchmark.tool/META-INF/MANIFEST.MF
index 3fb5858fe470dbcbd434091bf56e8fe4df99dd20..6f09fcc86bf2d2e50e3d59c86e1443f530d7a5b2 100644
--- a/fr.inria.diverse.cloning.benchmark.tool/META-INF/MANIFEST.MF
+++ b/fr.inria.diverse.cloning.benchmark.tool/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BenchmarkTool
Bundle-SymbolicName: fr.inria.diverse.cloning.benchmark.tool;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
+Bundle-Version: 0.1.0.qualifier
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
fr.inria.diverse.cloning.benchmark.common;bundle-version="0.1.0",
- fr.inria.diverse.cloning.runtime,
+ fr.inria.diverse.cloning.runtime;bundle-version="0.1.0",
org.eclipse.emf.ecore;bundle-version="2.9.1",
org.eclipse.mat.api;bundle-version="1.3.0",
org.eclipse.mat.parser;bundle-version="1.3.0",
diff --git a/fr.inria.diverse.cloning.benchmark.tool/ivy.xml b/fr.inria.diverse.cloning.benchmark.tool/ivy.xml
deleted file mode 100644
index 3cff9e083539ad90390364dbca1e2726dbbcfcb7..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.tool/ivy.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fr.inria.diverse.cloning.benchmark.tool/main.product b/fr.inria.diverse.cloning.benchmark.tool/main.product
deleted file mode 100644
index 7d6a9f3cfa1af6d2a523aa379f1594d34da27222..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.tool/main.product
+++ /dev/null
@@ -1,217 +0,0 @@
-
-
-
-
-
-
-
-
-
- -Xms128m -Xmx2048m
--agentlib:jdwp=transport=dt_socket,server=y,suspend=n
- -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fr.inria.diverse.cloning.benchmark.tool/pom.xml b/fr.inria.diverse.cloning.benchmark.tool/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..df13d81d868b0fa828db66c9ef51748105e2f6e9
--- /dev/null
+++ b/fr.inria.diverse.cloning.benchmark.tool/pom.xml
@@ -0,0 +1,16 @@
+
+
+ 4.0.0
+ fr.inria.diverse.cloning.benchmark
+ fr.inria.diverse.cloning.benchmark.tool
+ 0.1.0-SNAPSHOT
+ eclipse-plugin
+
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
+
+
diff --git a/fr.inria.diverse.cloning.benchmark.tool/runtime-BenchmarkTool/.metadata/.log b/fr.inria.diverse.cloning.benchmark.tool/runtime-BenchmarkTool/.metadata/.log
deleted file mode 100644
index 7133771c0ad00b96095362b3cdcccf1dbe800f69..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.tool/runtime-BenchmarkTool/.metadata/.log
+++ /dev/null
@@ -1,10 +0,0 @@
-!SESSION 2014-03-31 15:17:24.725 -----------------------------------------------
-eclipse.buildId=unknown
-java.version=1.7.0_51
-java.vendor=Oracle Corporation
-BootLoader constants: OS=linux, ARCH=x86_64, WS=gtk, NL=fr_FR
-Framework arguments: -application fr.inria.diverse.cloning.benchmark.tool.application --benchmarkMetamodels=/tmp/bundle.jar --metamodels=mm8 --nbClones 100 --nbtries 1 --outputFile=/tmp/results.csv
-Command-line arguments: -application fr.inria.diverse.cloning.benchmark.tool.application -data /home/ebousse/Dev/modelCloning/emf/fr.inria.diverse.cloning.benchmark.tool/runtime-BenchmarkTool -dev file:/home/ebousse/Dev/modelCloning/emf/.metadata/.plugins/org.eclipse.pde.core/BenchmarkTool dummy/dev.properties -os linux -ws gtk -arch x86_64 -consoleLog --benchmarkMetamodels=/tmp/bundle.jar --metamodels=mm8 --nbClones 100 --nbtries 1 --outputFile=/tmp/results.csv
-
-!ENTRY org.eclipse.osgi 2 1 2014-03-31 15:17:27.240
-!MESSAGE NLS unused message: line_separator_platform_mac_os_9 in: org.eclipse.core.internal.runtime.messages
diff --git a/fr.inria.diverse.cloning.benchmark.tool/runtime-BenchmarkTool/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/fr.inria.diverse.cloning.benchmark.tool/runtime-BenchmarkTool/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
deleted file mode 100644
index 6b2aaa7640726588bcd3d57e1de4b1315b7f315e..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.tool/runtime-BenchmarkTool/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/fr.inria.diverse.cloning.benchmark.tool/runtime-BenchmarkTool/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/fr.inria.diverse.cloning.benchmark.tool/runtime-BenchmarkTool/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index dffc6b51349681ffb272ab899b3ef7c402cf49f9..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.tool/runtime-BenchmarkTool/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-version=1
diff --git a/fr.inria.diverse.cloning.benchmark.tool/target/classes/benchmark/Benchmark.class b/fr.inria.diverse.cloning.benchmark.tool/target/classes/benchmark/Benchmark.class
deleted file mode 100644
index a50faab024dd01cfa0c6111903e299c43aa5c4c9..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.benchmark.tool/target/classes/benchmark/Benchmark.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.benchmark.tool/target/classes/benchmark/BenchmarkResults.class b/fr.inria.diverse.cloning.benchmark.tool/target/classes/benchmark/BenchmarkResults.class
deleted file mode 100644
index 6350d0516c2ee6d9220cc4033d52869c83d65580..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.benchmark.tool/target/classes/benchmark/BenchmarkResults.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.benchmark.tool/target/classes/data/CSVFile.class b/fr.inria.diverse.cloning.benchmark.tool/target/classes/data/CSVFile.class
deleted file mode 100644
index 7b066f478779cf046fc89ad73c491bf2a8b3ddcf..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.benchmark.tool/target/classes/data/CSVFile.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.benchmark.tool/target/classes/main/Application.class b/fr.inria.diverse.cloning.benchmark.tool/target/classes/main/Application.class
deleted file mode 100644
index 6a7acd2cf0fcafa0247c115dd90d8992f3bd4777..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.benchmark.tool/target/classes/main/Application.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.benchmark.tool/target/classes/main/BundleLoader.class b/fr.inria.diverse.cloning.benchmark.tool/target/classes/main/BundleLoader.class
deleted file mode 100644
index 80c907548be0083e00bc53df6500731e47389612..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.benchmark.tool/target/classes/main/BundleLoader.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.benchmark.tool/target/classes/memoryanalysis/HeapDump.class b/fr.inria.diverse.cloning.benchmark.tool/target/classes/memoryanalysis/HeapDump.class
deleted file mode 100644
index b3d440e846f7ef3ac7cdad6ee49b59fe83bba77f..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.benchmark.tool/target/classes/memoryanalysis/HeapDump.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.benchmark.tool/target/classes/memoryanalysis/MemoryAnalyzer.class b/fr.inria.diverse.cloning.benchmark.tool/target/classes/memoryanalysis/MemoryAnalyzer.class
deleted file mode 100644
index 72ed8e23020c50c1cf141a69777087dd1bc4825f..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.benchmark.tool/target/classes/memoryanalysis/MemoryAnalyzer.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli.product/.project b/fr.inria.diverse.cloning.materialgenerator.cli.product/.project
new file mode 100644
index 0000000000000000000000000000000000000000..aae38ee7204d2829ae5e9b1b390dded9954d2019
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli.product/.project
@@ -0,0 +1,11 @@
+
+
+ fr.inria.diverse.cloning.materialgenerator.cli.product
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli.product/main.product b/fr.inria.diverse.cloning.materialgenerator.cli.product/main.product
new file mode 100644
index 0000000000000000000000000000000000000000..8be1e142cf3f816fb302926fd445f562379d4847
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli.product/main.product
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+ -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli.product/pom.xml b/fr.inria.diverse.cloning.materialgenerator.cli.product/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..781bd0b309728e299cf221f913233b92dd99d758
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli.product/pom.xml
@@ -0,0 +1,38 @@
+
+
+ 4.0.0
+ fr.inria.diverse.cloning
+ fr.inria.diverse.cloning.materialgenerator.cli.product
+ 0.1.0-SNAPSHOT
+ eclipse-repository
+
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
+
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-p2-director-plugin
+ ${tycho.version}
+
+
+ create-product-distributions
+
+ materialize-products
+ archive-products
+
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli.product/pom.xml~ b/fr.inria.diverse.cloning.materialgenerator.cli.product/pom.xml~
new file mode 100644
index 0000000000000000000000000000000000000000..0d5375f30d278220f2a1b3b2bbc5a842ea1414a2
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli.product/pom.xml~
@@ -0,0 +1,38 @@
+
+
+ 4.0.0
+ fr.inria.diverse.cloning.benchmark
+ fr.inria.diverse.cloning.materialgenerator.cli.product
+ 0.1.0-SNAPSHOT
+ eclipse-repository
+
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
+
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-p2-director-plugin
+ ${tycho.version}
+
+
+ create-product-distributions
+
+ materialize-products
+ archive-products
+
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli/.classpath b/fr.inria.diverse.cloning.materialgenerator.cli/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..1cc8d614e77b65a1680c369331e1837d495436d0
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli/.gitignore b/fr.inria.diverse.cloning.materialgenerator.cli/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..5e56e040ec0902e58df8573adaec65c5da6e9304
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli/.project b/fr.inria.diverse.cloning.materialgenerator.cli/.project
new file mode 100644
index 0000000000000000000000000000000000000000..8a18f018784a0cd7d1cb25686bd04a4893c56f9a
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli/.project
@@ -0,0 +1,28 @@
+
+
+ fr.inria.diverse.cloning.materialgenerator.cli
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli/.settings/org.eclipse.jdt.core.prefs b/fr.inria.diverse.cloning.materialgenerator.cli/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f42de363afaae68bbd968318f1d331877f5514fc
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli/META-INF/MANIFEST.MF b/fr.inria.diverse.cloning.materialgenerator.cli/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..36a6172f79250bfaf6856387d70f92c444f7e741
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: App
+Bundle-SymbolicName: fr.inria.diverse.cloning.materialgenerator.cli;singleton:=true
+Bundle-Version: 0.1.0.qualifier
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.jdt.core,
+ fr.inria.diverse.cloning.materialgenerator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ClassPath: lib/jopt-simple-4.6.jar,
+ .
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli/build.properties b/fr.inria.diverse.cloning.materialgenerator.cli/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..88cc19176570ee4696cd54cb537edefe12141de0
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli/build.properties
@@ -0,0 +1,6 @@
+output.. = bin/
+bin.includes = plugin.xml,\
+ META-INF/,\
+ lib/jopt-simple-4.6.jar,\
+ .
+source.. = src/
diff --git a/fr.inria.diverse.cloning.materialgenerator/lib/jopt-simple-4.6-javadoc.jar b/fr.inria.diverse.cloning.materialgenerator.cli/lib/jopt-simple-4.6-javadoc.jar
similarity index 100%
rename from fr.inria.diverse.cloning.materialgenerator/lib/jopt-simple-4.6-javadoc.jar
rename to fr.inria.diverse.cloning.materialgenerator.cli/lib/jopt-simple-4.6-javadoc.jar
diff --git a/fr.inria.diverse.cloning.materialgenerator/lib/jopt-simple-4.6-sources.jar b/fr.inria.diverse.cloning.materialgenerator.cli/lib/jopt-simple-4.6-sources.jar
similarity index 100%
rename from fr.inria.diverse.cloning.materialgenerator/lib/jopt-simple-4.6-sources.jar
rename to fr.inria.diverse.cloning.materialgenerator.cli/lib/jopt-simple-4.6-sources.jar
diff --git a/fr.inria.diverse.cloning.materialgenerator/lib/jopt-simple-4.6.jar b/fr.inria.diverse.cloning.materialgenerator.cli/lib/jopt-simple-4.6.jar
similarity index 100%
rename from fr.inria.diverse.cloning.materialgenerator/lib/jopt-simple-4.6.jar
rename to fr.inria.diverse.cloning.materialgenerator.cli/lib/jopt-simple-4.6.jar
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli/plugin.xml b/fr.inria.diverse.cloning.materialgenerator.cli/plugin.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e750e0b7fc67c1e39eff6de14a71ffdafc81cc0e
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli/plugin.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli/pom.xml b/fr.inria.diverse.cloning.materialgenerator.cli/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..51ea0e4c87fd44f3990ed1eaad718c9a8dbf8730
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli/pom.xml
@@ -0,0 +1,17 @@
+
+
+ 4.0.0
+ fr.inria.diverse.cloning
+ fr.inria.diverse.cloning.materialgenerator.cli
+ 0.1.0-SNAPSHOT
+ eclipse-plugin
+
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
+
+
+
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli/pom.xml~ b/fr.inria.diverse.cloning.materialgenerator.cli/pom.xml~
new file mode 100644
index 0000000000000000000000000000000000000000..4db351b1d244ea2e3b1687a9b6aa5cb73be366a7
--- /dev/null
+++ b/fr.inria.diverse.cloning.materialgenerator.cli/pom.xml~
@@ -0,0 +1,17 @@
+
+
+ 4.0.0
+ fr.inria.diverse.cloning
+ fr.inria.diverse.cloning.materialgenerator.app
+ 0.1.0-SNAPSHOT
+ eclipse-plugin
+
+
+ fr.inria.diverse.cloning
+ parent
+ 0.1.0-SNAPSHOT
+
+
+
+
diff --git a/fr.inria.diverse.cloning.materialgenerator/src/fr/inria/diverse/cloning/materialgenerator/application/Application.java b/fr.inria.diverse.cloning.materialgenerator.cli/src/fr/inria/diverse/cloning/materialgenerator/cli/Application.java
similarity index 98%
rename from fr.inria.diverse.cloning.materialgenerator/src/fr/inria/diverse/cloning/materialgenerator/application/Application.java
rename to fr.inria.diverse.cloning.materialgenerator.cli/src/fr/inria/diverse/cloning/materialgenerator/cli/Application.java
index 9b55d31438a66a2182955aefceb84d040f90958d..86ed02d3b47be199c8c259010b55b0ef57b0354a 100644
--- a/fr.inria.diverse.cloning.materialgenerator/src/fr/inria/diverse/cloning/materialgenerator/application/Application.java
+++ b/fr.inria.diverse.cloning.materialgenerator.cli/src/fr/inria/diverse/cloning/materialgenerator/cli/Application.java
@@ -1,4 +1,4 @@
-package fr.inria.diverse.cloning.materialgenerator.application;
+package fr.inria.diverse.cloning.materialgenerator.cli;
import java.io.File;
import java.util.HashSet;
diff --git a/fr.inria.diverse.cloning.materialgenerator/.classpath b/fr.inria.diverse.cloning.materialgenerator/.classpath
index 87e7ff119fee5f3dba1767e4cdc070eeea80b02f..db3449225d861a2829a4297e48cb62048f162ef0 100644
--- a/fr.inria.diverse.cloning.materialgenerator/.classpath
+++ b/fr.inria.diverse.cloning.materialgenerator/.classpath
@@ -1,6 +1,5 @@
-
diff --git a/fr.inria.diverse.cloning.materialgenerator/META-INF/MANIFEST.MF b/fr.inria.diverse.cloning.materialgenerator/META-INF/MANIFEST.MF
index 556b044a94e70ba97c2b1010d95d13cf646402ec..cd758ad88eba239b27559fa853853269b1c0cdc6 100644
--- a/fr.inria.diverse.cloning.materialgenerator/META-INF/MANIFEST.MF
+++ b/fr.inria.diverse.cloning.materialgenerator/META-INF/MANIFEST.MF
@@ -30,8 +30,8 @@ Require-Bundle: org.eclipse.core.runtime,
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: fr.inria.diverse.cloning.materialgenerator.generators,
fr.inria.diverse.cloning.materialgenerator.metrics,
+ fr.inria.diverse.cloning.materialgenerator.start,
fr.inria.diverse.cloning.materialgenerator.tagger,
fr.inria.diverse.cloning.materialgenerator.tagger.impl,
fr.inria.diverse.cloning.materialgenerator.util
-Bundle-ClassPath: .,
- lib/jopt-simple-4.6.jar
+Bundle-ClassPath: .
diff --git a/fr.inria.diverse.cloning.materialgenerator/build.properties b/fr.inria.diverse.cloning.materialgenerator/build.properties
index ba12e985e8a056cc958f48da2e34ec0ba4191f73..2b0d95b6b02b49d14dbb5f6940aa13b6f13bce29 100644
--- a/fr.inria.diverse.cloning.materialgenerator/build.properties
+++ b/fr.inria.diverse.cloning.materialgenerator/build.properties
@@ -2,5 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
- .,\
- lib/jopt-simple-4.6.jar
+ .
diff --git a/fr.inria.diverse.cloning.materialgenerator/ivy.xml b/fr.inria.diverse.cloning.materialgenerator/ivy.xml
deleted file mode 100644
index c5afdae35a3383a4808a499a916efbf758e6a8aa..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.materialgenerator/ivy.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fr.inria.diverse.cloning.materialgenerator/plugin.xml b/fr.inria.diverse.cloning.materialgenerator/plugin.xml
index 09f3c10221aead262d89e41bde92e91c59c0644b..1ba757994fbfa1f064ccccddad75efa712b532e3 100644
--- a/fr.inria.diverse.cloning.materialgenerator/plugin.xml
+++ b/fr.inria.diverse.cloning.materialgenerator/plugin.xml
@@ -6,17 +6,8 @@
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fr.inria.diverse.cloning.materialgenerator/target/p2content.xml b/fr.inria.diverse.cloning.materialgenerator/target/p2content.xml
deleted file mode 100644
index e418a4192701988e23568c155c368e1c380132e1..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.materialgenerator/target/p2content.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Bundle-SymbolicName: fr.inria.diverse.cloning.materialgenerator;singleton:=true
Bundle-Version: 0.1.0.201404010852
-
-
-
-
-
diff --git a/fr.inria.diverse.cloning.runtime/target/MANIFEST.MF b/fr.inria.diverse.cloning.runtime/target/MANIFEST.MF
deleted file mode 100644
index 855ea2ff016762500beb8f280ef14f7fe5cefb19..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.runtime/target/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: fr.inria.diverse.cloning.runtime.cloner,fr.inria.diver
- se.cloning.runtime.cloner.impl,fr.inria.diverse.cloning.runtime.commo
- n,fr.inria.diverse.cloning.runtime.emfextension,fr.inria.diverse.clon
- ing.runtime.emfextension.impl,fr.inria.diverse.cloning.runtime.util
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.9.1",org.eclip
- se.emf.ecore.xmi;bundle-version="2.9.1",org.eclipse.ui.console;bundle
- -version="3.5.200",org.eclipse.jface;bundle-version="3.9.1",org.eclip
- se.ui;bundle-version="3.105.0"
-Bundle-ClassPath: .
-Bundle-Version: 0.1.0.201404010852
-Bundle-Name: fr.inria.diverse.cloning.base
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: fr.inria.diverse.cloning.runtime;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/cloner/Cloner.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/cloner/Cloner.class
deleted file mode 100644
index 61e0454baf031c995ee64a0d062fec5b7bdd704a..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/cloner/Cloner.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/cloner/impl/ClonerImpl.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/cloner/impl/ClonerImpl.class
deleted file mode 100644
index 453e02e846953b669c0e09fcec377c2ab33fd691..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/cloner/impl/ClonerImpl.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/common/ClassTag.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/common/ClassTag.class
deleted file mode 100644
index 3ec5c0653df5f4df8c18af0a20684478dbbde052..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/common/ClassTag.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/common/CloningMaterial.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/common/CloningMaterial.class
deleted file mode 100644
index 25e2e48ad03497a6628d9cbe6e1d03940f616b4a..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/common/CloningMaterial.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/common/MetamodelTags.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/common/MetamodelTags.class
deleted file mode 100644
index 1b330349f2537e9da3b6cb7a70355468535ba1a7..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/common/MetamodelTags.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/ShareableEObject.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/ShareableEObject.class
deleted file mode 100644
index 7bc7cbbe67b2616489a32a8fff3320272b12d7c8..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/ShareableEObject.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/AbstractShareableEObject$ReadonlyContext.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/AbstractShareableEObject$ReadonlyContext.class
deleted file mode 100644
index 25e8167b1d5bdb7d5d8bd7a6cdbe94ccfc616ac0..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/AbstractShareableEObject$ReadonlyContext.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/AbstractShareableEObject.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/AbstractShareableEObject.class
deleted file mode 100644
index d267c1cee9ffa3a68e606b114b53aaafbaa77fae..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/AbstractShareableEObject.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/LooseCopier.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/LooseCopier.class
deleted file mode 100644
index f254300cd82b93e317eed8b5a0130d9d9debb121..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/LooseCopier.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/LooseResource$LooseContentsEList.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/LooseResource$LooseContentsEList.class
deleted file mode 100644
index 685c2bff14329aa17f224475157e658856745b64..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/LooseResource$LooseContentsEList.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/LooseResource.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/LooseResource.class
deleted file mode 100644
index 4ec6fafa26b1b685daf6a42bbcd60b17935b0372..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/emfextension/impl/LooseResource.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/Copy$TreeCopier.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/Copy$TreeCopier.class
deleted file mode 100644
index f51f892fdb239067d4c744fee5b1379f2ec47b15..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/Copy$TreeCopier.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/Copy.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/Copy.class
deleted file mode 100644
index ed51480c225c592161129765c05695d52a9af5d4..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/Copy.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/EcoreHelper$NoSingleRootException.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/EcoreHelper$NoSingleRootException.class
deleted file mode 100644
index 9dda5e69eaae5dcb8c53094324c8b9df182f27b2..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/EcoreHelper$NoSingleRootException.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/EcoreHelper.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/EcoreHelper.class
deleted file mode 100644
index 3542da41c31b62df7c79d77348962a794fa872e0..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/EcoreHelper.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/Log.class b/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/Log.class
deleted file mode 100644
index 37531705a3b38d76b2b06c80232dcf70023bcef5..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/classes/fr/inria/diverse/cloning/runtime/util/Log.class and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/fr.inria.diverse.cloning.runtime-0.1.0-SNAPSHOT.jar b/fr.inria.diverse.cloning.runtime/target/fr.inria.diverse.cloning.runtime-0.1.0-SNAPSHOT.jar
deleted file mode 100644
index 44eb9b6bd9bc45e8eb6ff6239a3b67ada75b1fc8..0000000000000000000000000000000000000000
Binary files a/fr.inria.diverse.cloning.runtime/target/fr.inria.diverse.cloning.runtime-0.1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/fr.inria.diverse.cloning.runtime/target/local-artifacts.properties b/fr.inria.diverse.cloning.runtime/target/local-artifacts.properties
deleted file mode 100644
index d8c957f11213fbf71ae5b014d0a11c59c5f101c5..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.runtime/target/local-artifacts.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Apr 01 10:52:48 CEST 2014
-artifact.attached.p2metadata=/home/ebousse/Dev/modelCloning/emf/fr.inria.diverse.cloning.runtime/target/p2content.xml
-artifact.main=/home/ebousse/Dev/modelCloning/emf/fr.inria.diverse.cloning.runtime/target/fr.inria.diverse.cloning.runtime-0.1.0-SNAPSHOT.jar
-artifact.attached.p2artifacts=/home/ebousse/Dev/modelCloning/emf/fr.inria.diverse.cloning.runtime/target/p2artifacts.xml
diff --git a/fr.inria.diverse.cloning.runtime/target/maven-archiver/pom.properties b/fr.inria.diverse.cloning.runtime/target/maven-archiver/pom.properties
deleted file mode 100644
index 7bd392cf21ab1e328519d65efec9603706cdd853..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.runtime/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Tue Apr 01 10:52:48 CEST 2014
-version=0.1.0-SNAPSHOT
-groupId=fr.inria.diverse.cloning
-artifactId=fr.inria.diverse.cloning.runtime
diff --git a/fr.inria.diverse.cloning.runtime/target/p2artifacts.xml b/fr.inria.diverse.cloning.runtime/target/p2artifacts.xml
deleted file mode 100644
index 2392ea48d318855bf8ac40e6fe516087b6300f8e..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.runtime/target/p2artifacts.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fr.inria.diverse.cloning.runtime/target/p2content.xml b/fr.inria.diverse.cloning.runtime/target/p2content.xml
deleted file mode 100644
index 9d1a0f7fb57fcb9f13dc7bbf73386d728893023d..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.runtime/target/p2content.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Bundle-SymbolicName: fr.inria.diverse.cloning.runtime;singleton:=true
Bundle-Version: 0.1.0.201404010852
-
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 5a0c79bd1980a9d51a20f20d91275c3aea525518..5b73a5d5b68e096fd98c0cb879f5e6ee0c25324b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,16 @@
fr.inria.diverse.cloning.runtime
fr.inria.diverse.cloning.materialgenerator
+ fr.inria.diverse.cloning.materialgenerator.cli
+ fr.inria.diverse.cloning.materialgenerator.cli.product
+ fr.inria.diverse.cloning.benchmark.common
+ fr.inria.diverse.cloning.benchmark.metamodelsgenerator
+ fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product
+ fr.inria.diverse.cloning.benchmark.materialgenerator
+ fr.inria.diverse.cloning.benchmark.materialgenerator.product
+ fr.inria.diverse.cloning.benchmark.tool
+ fr.inria.diverse.cloning.benchmark.tool.product
+
diff --git a/pom.xml~ b/pom.xml~
index 82ad4d42a365cc02c119ad8a555a02d7f5b5110b..c4195db84e791bd47cc469d859ce6b88a90049a3 100644
--- a/pom.xml~
+++ b/pom.xml~
@@ -1,6 +1,7 @@
+ 4.0.0
fr.inria.diverse.cloning
parent
0.1.0-SNAPSHOT
@@ -9,6 +10,15 @@
fr.inria.diverse.cloning.runtime
fr.inria.diverse.cloning.materialgenerator
+ fr.inria.diverse.cloning.materialgenerator.cli
+ fr.inria.diverse.cloning.materialgenerator.cli.product
+ fr.inria.diverse.cloning.benchmark.common
+ fr.inria.diverse.cloning.benchmark.metamodelsgenerator
+ fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product
+ fr.inria.diverse.cloning.benchmark.materialgenerator
+ fr.inria.diverse.cloning.benchmark.tool
+ fr.inria.diverse.cloning.benchmark.tool.product
+