You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/02/19 01:12:51 UTC
svn commit: r628937 - in /maven/plugins/trunk/maven-assembly-plugin: pom.xml
src/main/mdo/component.mdo src/main/mdo/descriptor.mdo
Author: jdcasey
Date: Mon Feb 18 16:12:46 2008
New Revision: 628937
URL: http://svn.apache.org/viewvc?rev=628937&view=rev
Log:
[MASSEMBLY-212] Fixing this, though the namespaces need to be filtered for ${mdoVersion} in the future, and I'm not completely sure why it didn't work when I tried to run the resources plugin over the src/main/mdo directory to do this...will have to investigate further.
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=628937&r1=628936&r2=628937&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Mon Feb 18 16:12:46 2008
@@ -56,6 +56,10 @@
<system>jira</system>
<url>http://jira.codehaus.org/browse/MASSEMBLY</url>
</issueManagement>
+
+ <properties>
+ <mdoVersion>1.1.0</mdoVersion>
+ </properties>
<build>
<plugins>
@@ -95,10 +99,13 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-14</version>
+ <version>1.0-alpha-18</version>
+ <configuration>
+ <version>${mdoVersion}</version>
+ </configuration>
<executions>
<execution>
- <id>descriptor</id>
+ <id>mdo</id>
<phase>generate-sources</phase>
<goals>
<goal>xpp3-reader</goal>
@@ -107,46 +114,24 @@
<goal>xsd</goal>
</goals>
<configuration>
- <model>src/main/mdo/descriptor.mdo</model>
- <version>1.1.0</version>
+ <models>
+ <model>src/main/mdo/descriptor.mdo</model>
+ <model>src/main/mdo/component.mdo</model>
+ </models>
</configuration>
</execution>
<execution>
- <id>component</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>xpp3-reader</goal>
- <goal>xpp3-writer</goal>
- <goal>java</goal>
- <goal>xsd</goal>
- </goals>
- <configuration>
- <model>src/main/mdo/component.mdo</model>
- <version>1.1.0</version>
- </configuration>
- </execution>
- <execution>
- <id>descriptor-site</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xdoc</goal>
- <goal>xsd</goal>
- </goals>
- <configuration>
- <model>src/main/mdo/descriptor.mdo</model>
- <version>1.1.0</version>
- </configuration>
- </execution>
- <execution>
- <id>component-site</id>
+ <id>mdo-site</id>
<phase>pre-site</phase>
<goals>
<goal>xdoc</goal>
<goal>xsd</goal>
</goals>
<configuration>
- <model>src/main/mdo/component.mdo</model>
- <version>1.1.0</version>
+ <models>
+ <model>src/main/mdo/descriptor.mdo</model>
+ <model>src/main/mdo/component.mdo</model>
+ </models>
</configuration>
</execution>
</executions>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo?rev=628937&r1=628936&r2=628937&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Mon Feb 18 16:12:46 2008
@@ -21,7 +21,9 @@
Modello currently does not have capability to share files
-->
-<model>
+<model xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0"
+ xsd.target-namespace="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0">
+
<id>component</id>
<name>Component</name>
<description>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo?rev=628937&r1=628936&r2=628937&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Mon Feb 18 16:12:46 2008
@@ -23,7 +23,9 @@
to "component.mdo".
-->
-<model>
+<model xsd.namespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xsd.target-namespace="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0">
+
<id>assembly</id>
<name>Assembly</name>
<description>