Resurrect pom:validate without licensing issues

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113359 13f79535-47bb-0310-9956-ffa450edef68

pom/plugin.jelly

@@ -3,27 +3,21 @@
 <project 
   xmlns:j="jelly:core"
   xmlns:d="jelly:define"
-  xmlns:v="jelly:validate"
-  xmlns:x="jelly:xml"
   xmlns:deploy="deploy"
-  xmlns:pom="pom">
+  xmlns:pom="pom"
+  xmlns:util="jelly:util"
+  xmlns:v="jelly:validate">
 
   <!-- set up validation tag library -->
 
   <d:taglib uri="pom">
-    <!--
-    <d:jellybean
-      name="validate"
-      className="org.apache.maven.Validator"
-      method="execute"
-    />
-    -->
     
     <d:jellybean
       name="contentvalidator"
       className="org.apache.maven.ContentValidator"
       method="execute"
     />
+
   </d:taglib>
 
   <!-- default goal -->
@@ -38,25 +32,29 @@
     name="pom:validate"
     description="Validate the Maven XML project descriptor">
 
-    <pom:validate
-      validator="${maven.home}/maven-project.xsd"
-      projectDescriptor="project.xml"
-    />
+    <taskdef name="validate" classname="org.iso_relax.ant.JARVTask">
+      <classpath path="${plugin.getDependencyPath('isorelax')}"/>
+      <classpath path="${plugin.getDependencyPath('xercesjarv')}"/>
+      <classpath path="${plugin.getDependencyPath('xerces')}"/>
+    </taskdef>
 
-    <echo>POM is valid</echo>
+    <validate
+      schemaLanguage="http://www.w3.org/2001/XMLSchema"
+      schema="${maven.home}/maven-project.xsd"
+      file="${pom.file.canonicalPath}" />
 
   </goal>
   
   <goal
     name="pom:contentvalidate"
     description="Validate the content of the Maven POM">
-  <j:new className="org.apache.maven.ContentValidator" var="contentvalidator"/>
-  <j:setProperties object="${contentvalidator}" project="${pom}"/>
+    <j:new className="org.apache.maven.ContentValidator" var="contentvalidator"/>
+    <j:setProperties object="${contentvalidator}" project="${pom}"/>
     
     <j:set var="notices" value="${contentvalidator.execute()}"/>
      
-  <j:forEach var="notice" items="${notices}">
-    <echo>${notice.Level} : ${notice.Section} : ${notice.Message}</echo>
+    <j:forEach var="notice" items="${notices}">
+      <echo>${notice.Level} : ${notice.Section} : ${notice.Message}</echo>
     </j:forEach>
 
   </goal>

pom/project.xml

@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-pom-plugin</id>
   <name>Maven POM Plugin</name>
-  <currentVersion>1.2</currentVersion>
+  <currentVersion>1.3-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/pom/</url>
@@ -45,13 +45,7 @@
     </developer>
   </developers>
   <dependencies>
-    <dependency>
-      <id>ant</id>
-      <version>1.5.1</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
-    </dependency>
+
     <dependency>
       <id>dom4j</id>
       <version>1.4-dev-7</version>
@@ -59,46 +53,7 @@
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
-    <dependency>
-      <id>commons-jelly</id>
-      <version>20030211.141339</version>
-      <url>http://jakarta.apache.org/commons/jelly/</url>
-      <properties>
-        <classloader>root.maven</classloader>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>commons-jelly</groupId>
-      <artifactId>commons-jelly-tags-validate</artifactId>
-      <version>20030211.143411</version>
-      <properties>
-        <classloader>root.maven</classloader>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>commons-jelly</groupId>
-      <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>20030211.142705</version>
-      <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
-      <properties>
-        <classloader>root.maven</classloader>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>junit</id>
-      <version>3.8.1</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>maven</id>
-      <version>b5</version>
-      <jar>maven.jar</jar>
-      <properties>
-        <classloader>root.maven</classloader>
-      </properties>
-    </dependency>
+
     <dependency>
       <id>xml-apis</id>
       <version>1.0.b2</version>
@@ -106,19 +61,37 @@
         <classloader>root</classloader>
       </properties>
     </dependency>
-    <!-- runtime dependency for validate taglib -->
+    
+    <dependency>
+      <id>maven</id>
+      <version>1.0-beta5</version>
+      <jar>maven.jar</jar>
+    </dependency>
 
     <dependency>
       <id>isorelax</id>
-      <version>20020414</version>
+      <version>20030108</version>
+      <properties>
+        <classloader>root</classloader>
+      </properties>
     </dependency>
+
+    <!-- validator being used -->
     <dependency>
-      <id>msv</id>
-      <version>20020414</version>
+      <id>xercesjarv</id>
+      <version>20020712-DG</version>
+      <properties>
+        <classloader>root</classloader>gy
+      </properties>
     </dependency>
+
     <dependency>
-      <id>relaxngDatatype</id>
-      <version>20020414</version>
+      <id>xerces</id>
+      <version>2.2.1</version>
+      <properties>
+        <classloader>root</classloader>
+      </properties>
     </dependency>
+
   </dependencies>
 </project>

pom/xdocs/index.xml

@@ -14,7 +14,8 @@
       </p>
       <p>
         <strong>WARNING:</strong>  pom:validate doesn't work properly on 
-        descriptors which extend another one.
+        descriptors which extend another one. i.e. it only works on the
+        xml file before processing.
       </p>
     </section>
  </body>