[pkg-java] r8693 - in trunk/maven-repo-helper/src: main/java/org/debian/maven/repo test/java/org/debian/maven/repo test/resources

Ludovic Claude ludovicc-guest at alioth.debian.org
Tue Jun 30 11:40:46 UTC 2009


Author: ludovicc-guest
Date: 2009-06-30 11:40:43 +0000 (Tue, 30 Jun 2009)
New Revision: 8693

Added:
   trunk/maven-repo-helper/src/test/resources/doxia-module-fml.transformed
   trunk/maven-repo-helper/src/test/resources/doxia-module-fml.xml
Modified:
   trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMInfo.java
   trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMReader.java
   trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java
   trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java
   trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/TestBase.java
   trunk/maven-repo-helper/src/test/resources/commons-validator.cleaned
   trunk/maven-repo-helper/src/test/resources/maven-core.transformed
   trunk/maven-repo-helper/src/test/resources/maven.cleaned
   trunk/maven-repo-helper/src/test/resources/maven.transformed
   trunk/maven-repo-helper/src/test/resources/modello-core.cleaned
   trunk/maven-repo-helper/src/test/resources/modello-core.keep.cleaned
   trunk/maven-repo-helper/src/test/resources/modello-core.transformed
   trunk/maven-repo-helper/src/test/resources/plexus-active-collections.cleaned
   trunk/maven-repo-helper/src/test/resources/plexus-container-default.cleaned
   trunk/maven-repo-helper/src/test/resources/plexus-container-default.transformed
   trunk/maven-repo-helper/src/test/resources/slf4j.cleaned
   trunk/maven-repo-helper/src/test/resources/wagon-http-lightweight.cleaned
Log:
* POM transformation and cleaning keeps namespaces and element attributes

Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMInfo.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMInfo.java	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMInfo.java	2009-06-30 11:40:43 UTC (rev 8693)
@@ -19,8 +19,10 @@
     private List extensions;
     private List plugins;
     private List pluginManagement;
+    private List pluginDependencies;
     private List profileDependencies;
     private List profileDependencyManagement;
+    private List profilePluginDependencies;
     private Map properties;
 
     public Dependency getOriginalPom() {
@@ -158,6 +160,22 @@
         this.extensions = extensions;
     }
 
+    public List getPluginDependencies() {
+        return pluginDependencies;
+    }
+
+    public void setPluginDependencies(List pluginDependencies) {
+        this.pluginDependencies = pluginDependencies;
+    }
+
+    public List getProfilePluginDependencies() {
+        return profilePluginDependencies;
+    }
+
+    public void setProfilePluginDependencies(List profilePluginDependencies) {
+        this.profilePluginDependencies = profilePluginDependencies;
+    }
+
     public Set getPublishedRules(boolean includeDefault) {
         Set rules = new TreeSet();
         if (includeDefault) {
@@ -194,8 +212,10 @@
         result.setDependencyManagement(Dependency.applyRules(getDependencyManagement(), rules));
         result.setExtensions(Dependency.applyRules(getExtensions(), rules));
         result.setPlugins(Dependency.applyRules(getPlugins(), rules));
+        result.setPluginDependencies(Dependency.applyRules(getPluginDependencies(), rules));
         result.setPluginManagement(Dependency.applyRules(getPluginManagement(), rules));
         result.setProfileDependencies(Dependency.applyRules(getProfileDependencies(), rules));
+        result.setProfilePluginDependencies(Dependency.applyRules(getProfilePluginDependencies(), rules));
         result.setProfileDependencyManagement(Dependency.applyRules(getProfileDependencyManagement(), rules));
         result.setProperties(getProperties());
 

Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMReader.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMReader.java	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMReader.java	2009-06-30 11:40:43 UTC (rev 8693)
@@ -29,7 +29,7 @@
     protected final XMLInputFactory factory = XMLInputFactory.newInstance();
 
     public POMInfo readPom(File originalPom) throws XMLStreamException, FileNotFoundException {
-        if (! originalPom.exists()) {
+        if (!originalPom.exists()) {
             System.err.println("Cannot find pom file " + originalPom.getAbsolutePath());
         }
         return readPom(new FileReader(originalPom));
@@ -43,8 +43,10 @@
         List extensions = new ArrayList();
         List plugins = new ArrayList();
         List pluginManagement = new ArrayList();
+        List pluginDependencies = new ArrayList();
         List profileDependencies = new ArrayList();
         List profileDependencyManagement = new ArrayList();
+        List profilePluginDependencies = new ArrayList();
         List modules = new ArrayList();
 
         Map properties = new TreeMap();
@@ -88,7 +90,16 @@
                                     dependencies.add(currentDependency);
                                 } else if ("profile".equals(parentParentElement)) {
                                     profileDependencies.add(currentDependency);
+                                } else if ("plugin".equals(parentParentElement)) {
+                                    String p5Element = (String) path.get(path.size() - 6);
+                                    if ("project".equals(p5Element)) {
+                                        pluginDependencies.add(currentDependency);
+                                    } else if ("profile".equals(p5Element)) {
+                                        profilePluginDependencies.add(currentDependency);
+                                    }
                                 }
+                            } else {
+                                System.err.println("Unexpected element: " + parentElement);
                             }
                         } else if (inDependency > 0) {
                             inDependency++;
@@ -225,15 +236,17 @@
         inferedProperties.put("project.version", thisPom.getVersion());
         expendProperties(dependencies, inferedProperties);
         expendProperties(dependencyManagement, inferedProperties);
+        expendProperties(plugins, inferedProperties);
+        expendProperties(pluginManagement, inferedProperties);
+        expendProperties(pluginDependencies, inferedProperties);
         expendProperties(profileDependencies, inferedProperties);
         expendProperties(profileDependencyManagement, inferedProperties);
-        expendProperties(plugins, inferedProperties);
-        expendProperties(pluginManagement, inferedProperties);
+        expendProperties(profilePluginDependencies, inferedProperties);
 
         POMInfo info = new POMInfo();
         if (properties.get("debian.originalVersion") != null) {
             Dependency originalPomDep = new Dependency(thisPom.getGroupId(),
-                    thisPom.getArtifactId(), thisPom.getType(), 
+                    thisPom.getArtifactId(), thisPom.getType(),
                     (String) properties.get("debian.originalVersion"));
             info.setOriginalPom(originalPomDep);
         }
@@ -243,10 +256,12 @@
         info.setDependencies(dependencies);
         info.setDependencyManagement(dependencyManagement);
         info.setExtensions(extensions);
+        info.setPlugins(plugins);
+        info.setPluginManagement(pluginManagement);
+        info.setPluginDependencies(pluginDependencies);
         info.setProfileDependencies(profileDependencies);
         info.setProfileDependencyManagement(profileDependencyManagement);
-        info.setPlugins(plugins);
-        info.setPluginManagement(pluginManagement);
+        info.setProfilePluginDependencies(profilePluginDependencies);
         info.setProperties(properties);
         return info;
     }
@@ -289,4 +304,4 @@
         }
         return str;
     }
-}
\ No newline at end of file
+}

Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java	2009-06-30 11:40:43 UTC (rev 8693)
@@ -173,65 +173,13 @@
                         } else {
                             indent(writer, inLevel);
                             writer.writeStartElement(element);
+                            copyNsAndAttributes(parser, writer);
+
                             inLevel++;
                             path.add(element);
 
                             if ("project".equals(element) && inLevel == 1) {
-                                indent(writer, inLevel);
-                                writer.writeStartElement("modelVersion");
-                                writer.writeCharacters("4.0.0");
-                                writer.writeEndElement();
-                                indent(writer, inLevel);
-                                writer.writeStartElement("groupId");
-                                writer.writeCharacters(pomInfo.getGroupId());
-                                writer.writeEndElement();
-                                indent(writer, inLevel);
-                                writer.writeStartElement("artifactId");
-                                writer.writeCharacters(pomInfo.getArtifactId());
-                                writer.writeEndElement();
-                                indent(writer, inLevel);
-                                writer.writeStartElement("version");
-                                if (keepPomVersion) {
-                                    writer.writeCharacters(info.getOriginalVersion());
-                                } else {
-                                    writer.writeCharacters(pomInfo.getVersion());
-                                }
-                                writer.writeEndElement();
-                                indent(writer, inLevel);
-                                writer.writeStartElement("packaging");
-                                writer.writeCharacters(pomInfo.getType());
-                                writer.writeEndElement();
-                                indent(writer, inLevel);
-                                if (!noParent && parent != null) {
-                                    writer.writeStartElement("parent");
-                                    indent(writer, inLevel + 1);
-                                    writer.writeStartElement("groupId");
-                                    writer.writeCharacters(parent.getGroupId());
-                                    writer.writeEndElement();
-                                    indent(writer, inLevel + 1);
-                                    writer.writeStartElement("artifactId");
-                                    writer.writeCharacters(parent.getArtifactId());
-                                    writer.writeEndElement();
-                                    indent(writer, inLevel + 1);
-                                    writer.writeStartElement("version");
-                                    if (keepPomVersion) {
-                                        // use original parent version
-                                        writer.writeCharacters(info.getOriginalParentVersion());
-                                    } else {
-                                        writer.writeCharacters(parent.getVersion());
-                                    }
-                                    writer.writeEndElement();
-                                    indent(writer, inLevel);
-                                    writer.writeEndElement();
-                                    indent(writer, inLevel);
-                                }
-                                if (info.getProperties().isEmpty()) {
-                                    writer.writeStartElement("properties");
-                                    writeDebianProperties(writer, inLevel, info, debianPackage);
-                                    indent(writer, inLevel);
-                                    writer.writeEndElement();
-                                    indent(writer, inLevel);
-                                }
+                                copyAndFillProjectHeader(parser, writer, inLevel, pomInfo, keepPomVersion, info, noParent, parent, debianPackage);
                             } else if (inLevel == 2 && "properties".equals(element)) {
                                 inProperty++;
                             } else if (inProperty > 0) {
@@ -253,6 +201,13 @@
                                         dependencyList = info.getDependencies();
                                     } else if ("profile".equals(parentParentElement)) {
                                         dependencyList = info.getProfileDependencies();
+                                    } else if ("plugin".equals(parentParentElement)) {
+                                        String p5Element = (String) path.get(path.size() - 6);
+                                        if ("project".equals(p5Element)) {
+                                            dependencyList = info.getPluginDependencies();
+                                        } else if ("profile".equals(p5Element)) {
+                                            dependencyList = info.getProfilePluginDependencies();
+                                        }
                                     }
                                     if (dependencyList != null) {
                                         int index = inc(dependencyIndexes, dependencyList);
@@ -292,6 +247,7 @@
 
                             }
                         }
+
                         break;
                     }
 
@@ -344,7 +300,7 @@
                                 }
                             }
                             writer.writeCharacters(value);
-                            afterText = !value.isEmpty();
+                            afterText = value != null && !value.isEmpty();
                         }
                         break;
                     }
@@ -370,6 +326,91 @@
         }
     }
 
+    private void copyAndFillProjectHeader(XMLStreamReader parser, XMLStreamWriter writer, int inLevel, Dependency pomInfo, boolean keepPomVersion, POMInfo info, boolean noParent, Dependency parent, String debianPackage) throws XMLStreamException {
+        if (parser.getNamespaceCount() == 0) {
+            writer.writeNamespace(null, "http://maven.apache.org/POM/4.0.0");
+            writer.writeNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
+            writer.writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "schemaLocation",
+                    "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd");
+        }
+        indent(writer, inLevel);
+        writer.writeStartElement("modelVersion");
+        writer.writeCharacters("4.0.0");
+        writer.writeEndElement();
+        indent(writer, inLevel);
+        writer.writeStartElement("groupId");
+        writer.writeCharacters(pomInfo.getGroupId());
+        writer.writeEndElement();
+        indent(writer, inLevel);
+        writer.writeStartElement("artifactId");
+        writer.writeCharacters(pomInfo.getArtifactId());
+        writer.writeEndElement();
+        indent(writer, inLevel);
+        writer.writeStartElement("version");
+        if (keepPomVersion) {
+            writer.writeCharacters(info.getOriginalVersion());
+        } else {
+            writer.writeCharacters(pomInfo.getVersion());
+        }
+        writer.writeEndElement();
+        indent(writer, inLevel);
+        writer.writeStartElement("packaging");
+        writer.writeCharacters(pomInfo.getType());
+        writer.writeEndElement();
+        indent(writer, inLevel);
+        if (!noParent && parent != null) {
+            writer.writeStartElement("parent");
+            indent(writer, inLevel + 1);
+            writer.writeStartElement("groupId");
+            writer.writeCharacters(parent.getGroupId());
+            writer.writeEndElement();
+            indent(writer, inLevel + 1);
+            writer.writeStartElement("artifactId");
+            writer.writeCharacters(parent.getArtifactId());
+            writer.writeEndElement();
+            indent(writer, inLevel + 1);
+            writer.writeStartElement("version");
+            if (keepPomVersion) {
+                // use original parent version
+                writer.writeCharacters(info.getOriginalParentVersion());
+            } else {
+                writer.writeCharacters(parent.getVersion());
+            }
+            writer.writeEndElement();
+            indent(writer, inLevel);
+            writer.writeEndElement();
+            indent(writer, inLevel);
+        }
+        if (info.getProperties().isEmpty()) {
+            writer.writeStartElement("properties");
+            writeDebianProperties(writer, inLevel, info, debianPackage);
+            indent(writer, inLevel);
+            writer.writeEndElement();
+            indent(writer, inLevel);
+        }
+    }
+
+    private void copyNsAndAttributes(XMLStreamReader parser, XMLStreamWriter writer) throws XMLStreamException {
+        int nbNamespace = parser.getNamespaceCount();
+        for (int i = 0; i < nbNamespace; i++) {
+            String nsPrefix = parser.getNamespacePrefix(i);
+            String nsURI = parser.getNamespaceURI(i);
+            writer.writeNamespace(nsPrefix, nsURI);
+        }
+        int nbAttributes = parser.getAttributeCount();
+        for (int i = 0; i < nbAttributes; i++) {
+            String attrNamespace = parser.getAttributeNamespace(i);
+            String attrPrefix = parser.getAttributePrefix(i);
+            String attrName = parser.getAttributeLocalName(i);
+            String value = parser.getAttributeValue(i);
+            if (attrNamespace == null) {
+                writer.writeAttribute(attrName, value);
+            } else {
+                writer.writeAttribute(attrPrefix, attrNamespace, attrName, value);
+            }
+        }
+    }
+
     protected void indent(XMLStreamWriter writer, int inLevel) throws XMLStreamException {
         writer.writeCharacters("\n");
         for (int i = 0; i < inLevel; i++) {

Modified: trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java
===================================================================
--- trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMTransformerTest.java	2009-06-30 11:40:43 UTC (rev 8693)
@@ -61,4 +61,16 @@
         assertXMLEqual(read("plexus-container-default.transformed"), read(updatedPom));
     }
 
+    /**
+     * Test of cleanPom method, of class POMCleaner.
+     */
+    public void testTransformDoxiaFmlPom() throws Exception {
+        usePom("doxia-module-fml.xml");
+        boolean noParent = false;
+        POMTransformer instance = new POMTransformer();
+        instance.addDefaultRules();
+        instance.transformPom(pom, updatedPom, noParent, true, "libdoxia-java");
+        assertXMLEqual(read("doxia-module-fml.transformed"), read(updatedPom));
+    }
+
 }
\ No newline at end of file

Modified: trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/TestBase.java
===================================================================
--- trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/TestBase.java	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/TestBase.java	2009-06-30 11:40:43 UTC (rev 8693)
@@ -10,6 +10,7 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.LineNumberReader;
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -81,4 +82,19 @@
         return r;
     }
 
+    protected void show(File f) {
+            try {
+        LineNumberReader lnr = new LineNumberReader(read(f));
+        do {
+                String l = lnr.readLine();
+                if (l == null) {
+                    break;
+                }
+                System.out.println(l);
+        } while (true);
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+    }
+
 }
\ No newline at end of file

Modified: trunk/maven-repo-helper/src/test/resources/commons-validator.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/commons-validator.cleaned	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/resources/commons-validator.cleaned	2009-06-30 11:40:43 UTC (rev 8693)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>commons-validator</groupId>
 	<artifactId>commons-validator</artifactId>

Added: trunk/maven-repo-helper/src/test/resources/doxia-module-fml.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/doxia-module-fml.transformed	                        (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/doxia-module-fml.transformed	2009-06-30 11:40:43 UTC (rev 8693)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+        <modelVersion>4.0.0</modelVersion>
+        <groupId>org.apache.maven.doxia</groupId>
+        <artifactId>doxia-module-fml</artifactId>
+        <version>1.1</version>
+        <packaging>jar</packaging>
+        <parent>
+                <groupId>org.apache.maven.doxia</groupId>
+                <artifactId>doxia-modules</artifactId>
+                <version>1.1</version>
+        </parent>
+        <properties>
+                <debian.originalVersion>1.1</debian.originalVersion>
+                <debian.package>libdoxia-java</debian.package>
+        </properties>
+
+        <name>Doxia :: FML Module</name>
+        <description>A Doxia module for FML source documents.</description>
+        <dependencies>
+                <dependency>
+                        <groupId>org.codehaus.plexus</groupId>
+                        <artifactId>plexus-utils</artifactId>
+                </dependency>
+                <dependency>
+                        <groupId>org.apache.maven.doxia</groupId>
+                        <artifactId>doxia-test-docs</artifactId>
+                        <scope>test</scope>
+                </dependency>
+                <dependency>
+                        <groupId>xerces</groupId>
+                        <artifactId>xercesImpl</artifactId>
+                        <version>debian</version>
+                        <scope>test</scope>
+                </dependency>
+        </dependencies>
+        <build>
+                <plugins>
+                        <plugin>
+                                <groupId>org.codehaus.modello</groupId>
+                                <artifactId>modello-maven-plugin</artifactId>
+                                <executions>
+                                        <execution>
+                                                <id>descriptor</id>
+                                                <phase>generate-sources</phase>
+                                                <goals>
+                                                        <goal>java</goal>
+                                                </goals>
+                                                <configuration>
+                                                        <models>
+                                                                <model>src/main/mdo/fml.mdo</model>
+                                                        </models>
+                                                        <version>1.0.0</version>
+                                                </configuration>
+                                        </execution>
+                                </executions>
+                        </plugin>
+                </plugins>
+        </build>
+        <profiles>
+                <profile>
+                        <id>reporting</id>
+                        <build>
+                                <plugins>
+                                        <plugin>
+                                                <groupId>org.apache.maven.plugins</groupId>
+                                                <artifactId>maven-antrun-plugin</artifactId>
+                                                <executions>
+                                                        <execution>
+                                                                <phase>site</phase>
+                                                                <configuration>
+                                                                        <tasks>
+                                                                                <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task">
+                                                                                </taskdef>
+                                                                                <mkdir dir="${reporting.outputDirectory}/xsddoc">
+                                                                                </mkdir>
+                                                                                <xsddoc file="${basedir}/src/main/resources/fml-1.0.xsd" out="${basedir}/${reporting.outputDirectory}/xsddoc" doctitle="Reference of Schema FML 1.0" verbose="true">
+                                                                                </xsddoc>
+                                                                        </tasks>
+                                                                </configuration>
+                                                                <goals>
+                                                                        <goal>run</goal>
+                                                                </goals>
+                                                        </execution>
+                                                </executions>
+                                                <dependencies>
+                                                        <dependency>
+                                                                <groupId>xsddoc</groupId>
+                                                                <artifactId>xsddoc</artifactId>
+                                                                <version>debian</version>
+                                                        </dependency>
+                                                        <dependency>
+                                                                <groupId>xalan</groupId>
+                                                                <artifactId>xalan</artifactId>
+                                                                <version>debian</version>
+                                                        </dependency>
+                                                </dependencies>
+                                        </plugin>
+                                </plugins>
+                        </build>
+                </profile>
+        </profiles>
+</project>

Added: trunk/maven-repo-helper/src/test/resources/doxia-module-fml.xml
===================================================================
--- trunk/maven-repo-helper/src/test/resources/doxia-module-fml.xml	                        (rev 0)
+++ trunk/maven-repo-helper/src/test/resources/doxia-module-fml.xml	2009-06-30 11:40:43 UTC (rev 8693)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>doxia-modules</artifactId>
+    <groupId>org.apache.maven.doxia</groupId>
+    <version>1.1</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>doxia-module-fml</artifactId>
+
+  <name>Doxia :: FML Module</name>
+  <description>A Doxia module for FML source documents.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+
+    <!-- test -->
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-test-docs</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>descriptor</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+            <configuration>
+              <models>
+                <model>src/main/mdo/fml.mdo</model>
+              </models>
+              <version>1.0.0</version>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>reporting</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>site</phase>
+                <configuration>
+                  <tasks>
+                    <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" />
+
+                    <mkdir dir="${reporting.outputDirectory}/xsddoc" />
+
+                    <xsddoc file="${basedir}/src/main/resources/fml-1.0.xsd" out="${basedir}/${reporting.outputDirectory}/xsddoc" doctitle="Reference of Schema FML 1.0" verbose="true" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>xsddoc</groupId>
+                <artifactId>xsddoc</artifactId>
+                <version>1.0</version>
+              </dependency>
+              <dependency>
+                <groupId>xalan</groupId>
+                <artifactId>xalan</artifactId>
+                <version>2.7.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
\ No newline at end of file

Modified: trunk/maven-repo-helper/src/test/resources/maven-core.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/maven-core.transformed	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/resources/maven-core.transformed	2009-06-30 11:40:43 UTC (rev 8693)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.apache.maven</groupId>
 	<artifactId>maven-core</artifactId>

Modified: trunk/maven-repo-helper/src/test/resources/maven.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/maven.cleaned	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/resources/maven.cleaned	2009-06-30 11:40:43 UTC (rev 8693)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.apache.maven</groupId>
 	<artifactId>maven</artifactId>

Modified: trunk/maven-repo-helper/src/test/resources/maven.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/maven.transformed	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/resources/maven.transformed	2009-06-30 11:40:43 UTC (rev 8693)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+        <modelVersion>4.0.0</modelVersion>
 	<groupId>org.apache.maven</groupId>
 	<artifactId>maven</artifactId>
 	<version>debian</version>

Modified: trunk/maven-repo-helper/src/test/resources/modello-core.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/modello-core.cleaned	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/resources/modello-core.cleaned	2009-06-30 11:40:43 UTC (rev 8693)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>modello</artifactId>
     <groupId>org.codehaus.modello</groupId>

Modified: trunk/maven-repo-helper/src/test/resources/modello-core.keep.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/modello-core.keep.cleaned	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/resources/modello-core.keep.cleaned	2009-06-30 11:40:43 UTC (rev 8693)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.modello</groupId>
   <artifactId>modello-core</artifactId>

Modified: trunk/maven-repo-helper/src/test/resources/modello-core.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/modello-core.transformed	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/resources/modello-core.transformed	2009-06-30 11:40:43 UTC (rev 8693)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.codehaus.modello</groupId>
 	<artifactId>modello-core</artifactId>

Modified: trunk/maven-repo-helper/src/test/resources/plexus-active-collections.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-active-collections.cleaned	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/resources/plexus-active-collections.cleaned	2009-06-30 11:40:43 UTC (rev 8693)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.codehaus.plexus</groupId>
 	<artifactId>plexus-active-collections</artifactId>

Modified: trunk/maven-repo-helper/src/test/resources/plexus-container-default.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-container-default.cleaned	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/resources/plexus-container-default.cleaned	2009-06-30 11:40:43 UTC (rev 8693)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.codehaus.plexus</groupId>
 	<artifactId>plexus-container-default</artifactId>

Modified: trunk/maven-repo-helper/src/test/resources/plexus-container-default.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-container-default.transformed	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/resources/plexus-container-default.transformed	2009-06-30 11:40:43 UTC (rev 8693)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.codehaus.plexus</groupId>
 	<artifactId>plexus-container-default</artifactId>

Modified: trunk/maven-repo-helper/src/test/resources/slf4j.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/slf4j.cleaned	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/resources/slf4j.cleaned	2009-06-30 11:40:43 UTC (rev 8693)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.slf4j</groupId>
 	<artifactId>slf4j-parent</artifactId>

Modified: trunk/maven-repo-helper/src/test/resources/wagon-http-lightweight.cleaned
===================================================================
--- trunk/maven-repo-helper/src/test/resources/wagon-http-lightweight.cleaned	2009-06-29 20:35:54 UTC (rev 8692)
+++ trunk/maven-repo-helper/src/test/resources/wagon-http-lightweight.cleaned	2009-06-30 11:40:43 UTC (rev 8693)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.apache.maven.wagon</groupId>
 	<artifactId>wagon-http-lightweight</artifactId>




More information about the pkg-java-commits mailing list