You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2011/01/09 11:29:11 UTC
svn commit: r1056907 - in
/maven/plugins/trunk/maven-remote-resources-plugin: pom.xml
src/main/mdo/remote-resources.mdo src/main/mdo/supplemental-model.mdo
Author: dennisl
Date: Sun Jan 9 10:29:10 2011
New Revision: 1056907
URL: http://svn.apache.org/viewvc?rev=1056907&view=rev
Log:
[MRRESOURCES-51] Publish the XML schemas for remote-resources and supplemental-model
o Make sure that the generated xsd:s are included in the generated site with the correct file names.
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/main/mdo/remote-resources.mdo
maven/plugins/trunk/maven-remote-resources-plugin/src/main/mdo/supplemental-model.mdo
Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1056907&r1=1056906&r2=1056907&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Sun Jan 9 10:29:10 2011
@@ -207,11 +207,38 @@ under the License.
<version>1.1</version>
<executions>
<execution>
+ <id>generate-xsd-site-remote-resources</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>xsd</goal>
+ </goals>
+ <configuration>
+ <version>1.1.0</version>
+ <outputDirectory>${project.reporting.outputDirectory}/xsd</outputDirectory>
+ <models>
+ <model>src/main/mdo/remote-resources.mdo</model>
+ </models>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-xsd-site-supplemental-model</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>xsd</goal>
+ </goals>
+ <configuration>
+ <version>1.0.0</version>
+ <outputDirectory>${project.reporting.outputDirectory}/xsd</outputDirectory>
+ <models>
+ <model>src/main/mdo/supplemental-model.mdo</model>
+ </models>
+ </configuration>
+ </execution>
+ <execution>
<id>site-docs-remote-resources</id>
<phase>pre-site</phase>
<goals>
<goal>xdoc</goal>
- <goal>xsd</goal>
</goals>
<configuration>
<version>1.1.0</version>
@@ -225,7 +252,6 @@ under the License.
<phase>pre-site</phase>
<goals>
<goal>xdoc</goal>
- <goal>xsd</goal>
</goals>
<configuration>
<version>1.0.0</version>
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/main/mdo/remote-resources.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/mdo/remote-resources.mdo?rev=1056907&r1=1056906&r2=1056907&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/main/mdo/remote-resources.mdo (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/main/mdo/remote-resources.mdo Sun Jan 9 10:29:10 2011
@@ -21,7 +21,7 @@ under the License.
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.1.0 http://modello.codehaus.org/xsd/modello-1.1.0.xsd"
xml.namespace="http://maven.apache.org/plugins/maven-remote-resources-plugin/remote-resources/${version}"
xml.schemaLocation="http://maven.apache.org/plugins/maven-remote-resources-plugin/xsd/remote-resources-${version}.xsd">
- <id>remoteResourcesBundle</id>
+ <id>remote-resources</id>
<name>RemoteResourcesBundle</name>
<description><![CDATA[
A bundle of remote resources.
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/main/mdo/supplemental-model.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/mdo/supplemental-model.mdo?rev=1056907&r1=1056906&r2=1056907&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/main/mdo/supplemental-model.mdo (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/main/mdo/supplemental-model.mdo Sun Jan 9 10:29:10 2011
@@ -21,7 +21,7 @@ under the License.
xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.1.0 http://modello.codehaus.org/xsd/modello-1.1.0.xsd"
xml.namespace="http://maven.apache.org/plugins/maven-remote-resources-plugin/supplemental-model/${version}"
xml.schemaLocation="http://maven.apache.org/plugins/maven-remote-resources-plugin/xsd/supplemental-model-${version}.xsd">
- <id>supplementalModel</id>
+ <id>supplemental-model</id>
<name>SupplementalDataModel</name>
<description>Provides access to supplemental POM data models.</description>
<defaults>