Author: vsiveton
Date: Mon Jan 22 05:26:30 2007
New Revision: 498608
URL: http://svn.apache.org/viewvc?view=rev&rev=498608
Log:
MNG-967: maven.mdo, settings.mdo, and generated-sources
o moved modello files in src/main/mdo
o updated Maven 1 & 2 build
Added:
maven/components/branches/maven-2.0.x/maven-model/src/main/
maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/
maven/components/branches/maven-2.0.x/maven-model/src/main/mdo/maven.mdo
- copied unchanged from r498595,
maven/components/branches/maven-2.0.x/maven-model/maven.mdo
maven/components/branches/maven-2.0.x/maven-settings/src/main/mdo/
maven/components/branches/maven-2.0.x/maven-settings/src/main/mdo/settings.mdo
- copied unchanged from r498316,
maven/components/branches/maven-2.0.x/maven-settings/settings.mdo
Removed:
maven/components/branches/maven-2.0.x/maven-model/maven.mdo
maven/components/branches/maven-2.0.x/maven-settings/settings.mdo
Modified:
maven/components/branches/maven-2.0.x/maven-model/maven.xml
maven/components/branches/maven-2.0.x/maven-model/pom.xml
maven/components/branches/maven-2.0.x/maven-model/project.properties
maven/components/branches/maven-2.0.x/maven-settings/pom.xml
Modified: maven/components/branches/maven-2.0.x/maven-model/maven.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-model/maven.xml?view=diff&rev=498608&r1=498607&r2=498608
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-model/maven.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-model/maven.xml Mon Jan 22
05:26:30 2007
@@ -23,12 +23,12 @@
<maven:addPath id="maven.compile.src.set" refid="modello.sources" />
<j:set var="sourcesPresent" value="true" />
- <modello:generate model="maven.mdo" type="java" packageWithVersion="false"
version="3.0.0" targetDirectory="target/generated-sources" />
- <modello:generate model="maven.mdo" type="xpp3-reader"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
- <modello:generate model="maven.mdo" type="xpp3-writer"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
+ <modello:generate model="${maven.modello.model}" type="java"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
+ <modello:generate model="${maven.modello.model}" type="xpp3-reader"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
+ <modello:generate model="${maven.modello.model}" type="xpp3-writer"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
<!-- Need the original package as well -->
- <ant:copy tofile="target/maven.mdo.m1" file="maven.mdo" />
+ <ant:copy tofile="target/maven.mdo.m1" file="${maven.modello.model}" />
<ant:replace file="target/maven.mdo.m1" token="org.apache.maven.model"
value="org.apache.maven.project" />
<modello:generate model="target/maven.mdo.m1" type="java"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
Modified: maven/components/branches/maven-2.0.x/maven-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-model/pom.xml?view=diff&rev=498608&r1=498607&r2=498608
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-model/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-model/pom.xml Mon Jan 22
05:26:30 2007
@@ -55,7 +55,7 @@
</executions>
<configuration>
<version>4.0.0</version>
- <model>maven.mdo</model>
+ <model>src/main/mdo/maven.mdo</model>
</configuration>
</plugin>
</plugins>
Modified: maven/components/branches/maven-2.0.x/maven-model/project.properties
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-model/project.properties?view=diff&rev=498608&r1=498607&r2=498608
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-model/project.properties
(original)
+++ maven/components/branches/maven-2.0.x/maven-model/project.properties Mon
Jan 22 05:26:30 2007
@@ -29,3 +29,6 @@
maven.compile.source=1.4
maven.compile.target=1.4
+
+# Modello settings
+maven.modello.model=${basedir}/src/main/mdo/maven.mdo
Modified: maven/components/branches/maven-2.0.x/maven-settings/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-settings/pom.xml?view=diff&rev=498608&r1=498607&r2=498608
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-settings/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-settings/pom.xml Mon Jan 22
05:26:30 2007
@@ -53,7 +53,7 @@
</executions>
<configuration>
<version>1.0.0</version>
- <model>settings.mdo</model>
+ <model>src/main/mdo/settings.mdo</model>
</configuration>
</plugin>
</plugins>
