Author: dkulp
Date: Wed Apr 11 09:28:11 2007
New Revision: 527568
URL: http://svn.apache.org/viewvc?view=rev&rev=527568
Log:
Flatten the list of projects to remove the semi-redundant wrapper element
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
maven/plugins/trunk/maven-remote-resources-plugin/src/main/mdo/supplemental-model.mdo
maven/plugins/trunk/maven-remote-resources-plugin/src/site/fml/faq.fml
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java?view=diff&rev=527568&r1=527567&r2=527568
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Wed Apr 11 09:28:11 2007
@@ -738,7 +738,7 @@
SupplementalDataModelXpp3Reader reader = new
SupplementalDataModelXpp3Reader();
SupplementalDataModel supplementalModel = reader.read( new
FileReader( f ) );
- supplements.addAll( supplementalModel.getSupplements() );
+ supplements.addAll( supplementalModel.getSupplement() );
}
catch ( Exception e )
{
@@ -751,10 +751,9 @@
getLog().debug( "Loading supplements complete." );
Map supplementMap = new HashMap();
-
for ( Iterator i = supplements.iterator(); i.hasNext(); )
{
- SupplementalData sd = (SupplementalData) i.next();
+ Supplement sd = (Supplement) i.next();
Xpp3Dom dom = (Xpp3Dom) sd.getProject();
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?view=diff&rev=527568&r1=527567&r2=527568
==============================================================================
---
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
Wed Apr 11 09:28:11 2007
@@ -33,19 +33,19 @@
<version>1.0.0</version>
<description>Root element of the supplemental-models.xml
file.</description>
<fields>
- <field>
- <name>supplements</name>
+ <field xml.listStyle="flat">
+ <name>supplement</name>
<version>1.0.0</version>
<description>Snippits of POM xml files used to supplement the data
model.</description>
<association>
- <type>SupplementalData</type>
+ <type>Supplement</type>
<multiplicity>*</multiplicity>
</association>
</field>
</fields>
</class>
<class>
- <name>SupplementalData</name>
+ <name>Supplement</name>
<version>1.0.0</version>
<description>A single supplement</description>
<fields>
@@ -55,7 +55,7 @@
<description>Snippits of POM xml files used to supplement the data
model.</description>
<type>DOM</type>
</field>
- </fields>
+ </fields>
</class>
</classes>
</model>
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/site/fml/faq.fml?view=diff&rev=527568&r1=527567&r2=527568
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/site/fml/faq.fml
(original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/site/fml/faq.fml Wed
Apr 11 09:28:11 2007
@@ -51,25 +51,23 @@
For example:
<source>
<supplementalDataModels>
- <supplements>
- <supplement>
- <project>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <name>Sun JAXB Reference Implementation Runtime</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
(CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- </supplements>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <name>Sun JAXB Reference Implementation Runtime</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
(CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
</supplementalDataModels>
</source>
That location for that file can then be configured into the
supplementalModels configuration for the process mojo. The
