Index: maven-generator-plugin/src/java/org/codelutin/generator/plugin/CopyVersionFiles.java
diff -u maven-generator-plugin/src/java/org/codelutin/generator/plugin/CopyVersionFiles.java:1.1 maven-generator-plugin/src/java/org/codelutin/generator/plugin/CopyVersionFiles.java:1.2
--- maven-generator-plugin/src/java/org/codelutin/generator/plugin/CopyVersionFiles.java:1.1	Fri Apr 20 08:40:35 2007
+++ maven-generator-plugin/src/java/org/codelutin/generator/plugin/CopyVersionFiles.java	Thu Apr 26 15:16:44 2007
@@ -40,9 +40,9 @@
  * 
  * @author chatellier
  * 
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  * 
- * Last update : $Date: 2007/04/20 08:40:35 $ By : $Author: chatellier $
+ * Last update : $Date: 2007/04/26 15:16:44 $ By : $Author: chatellier $
  */
 /**
  * CopyVersionFiles.java
@@ -106,6 +106,11 @@
 	protected String versionFound = null;
 
 	/**
+	 * Nom du model sauvegarde
+	 */
+	protected String modelNameFound = null;
+
+	/**
 	 * Maven logger
 	 */
 	protected Log logger;
@@ -125,8 +130,8 @@
 		// get log
 		logger = getLog();
 
-		// find version
-		findVersion();
+		// find version and model name
+		findVersionAndModelName();
 
 		if (versionFound == null || !versionFound.matches("[0-9]+(\\.[0-9]+)*")) {
 			versionFound = "0";
@@ -137,7 +142,8 @@
 					+ "' found in model description");
 		}
 
-		String destDir = copyVersionDir + File.separator + versionFound;
+		String destDir = copyVersionDir.replace("%MODELNAME%", modelNameFound)
+				+ File.separator + versionFound;
 		fVersionDir = new File(destDir);
 
 		boolean doCopy = true;
@@ -158,7 +164,8 @@
 
 		if (fVersionDir.exists() && fVersionDir.listFiles().length > 0) {
 			logger.warn("[COPY] Warning saved files for version '"
-					+ versionFound + "' already exists");
+					+ versionFound + "' and name '" + modelNameFound
+					+ "' already exists");
 			logger.warn("[COPY] Copy won't be done unless copyOverwrite "
 					+ "parameter is set to 'true' or version is updated");
 
@@ -199,9 +206,9 @@
 	}
 
 	/**
-	 * Find version in object model files
+	 * Find version and name in object model files
 	 */
-	protected void findVersion() {
+	protected void findVersionAndModelName() {
 
 		File srcModelDir = srcDirGen;
 
@@ -217,6 +224,10 @@
 				if (node != null) {
 					versionFound = node.getStringValue();
 				}
+				node = document.selectSingleNode("/objectModel/@name");
+				if (node != null) {
+					modelNameFound = node.getStringValue();
+				}
 			} catch (DocumentException e) {
 				logger.error("Can't read document", e);
 			}