From 14a8e1f5a4ebe0bb505373d8eef1df4c78fe57f8 Mon Sep 17 00:00:00 2001
From: Vincent Siveton <vsiveton@apache.org>
Date: Mon, 22 Jan 2007 13:30:58 +0000
Subject: [PATCH] MNG-967: maven.mdo, settings.mdo, and generated-sources
 Merged from: r498608 (maven-2.0.x)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498611 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-model/pom.xml                            | 2 +-
 maven-model/project.properties                 | 2 +-
 maven-model/{ => src/main/mdo}/maven.mdo       | 0
 maven-settings/pom.xml                         | 2 +-
 maven-settings/{ => src/main/mdo}/settings.mdo | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename maven-model/{ => src/main/mdo}/maven.mdo (100%)
 rename maven-settings/{ => src/main/mdo}/settings.mdo (100%)

diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 72466fb778..c6c1fcf395 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -34,7 +34,7 @@
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
           <version>4.0.0</version>
-          <model>maven.mdo</model>
+          <model>src/main/mdo/maven.mdo</model>
         </configuration>
         <executions>
           <execution>
diff --git a/maven-model/project.properties b/maven-model/project.properties
index d925a54775..0d6ec60b6e 100644
--- a/maven-model/project.properties
+++ b/maven-model/project.properties
@@ -29,7 +29,7 @@ maven.compile.source=1.4
 maven.compile.target=1.4
 
 # Modello settings
-maven.modello.model=${basedir}/maven.mdo
+maven.modello.model=${basedir}/src/main/mdo/maven.mdo
 maven.modello.packageWithVersion=false
 maven.modello.version=3.0.0
 maven.modello.plugins=xpp3,stax,dom4j
diff --git a/maven-model/maven.mdo b/maven-model/src/main/mdo/maven.mdo
similarity index 100%
rename from maven-model/maven.mdo
rename to maven-model/src/main/mdo/maven.mdo
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 0157b0dd9f..555ab79bea 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -33,7 +33,7 @@
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
           <version>1.0.0</version>
-          <model>settings.mdo</model>
+          <model>src/main/mdo/settings.mdo</model>
         </configuration>
         <executions>
           <execution>
diff --git a/maven-settings/settings.mdo b/maven-settings/src/main/mdo/settings.mdo
similarity index 100%
rename from maven-settings/settings.mdo
rename to maven-settings/src/main/mdo/settings.mdo