You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/04/20 07:04:37 UTC
cvs commit: maven/src/plugins-build/pom/xdocs index.xml
dion 2003/04/19 22:04:36
Modified: src/plugins-build/pom plugin.jelly project.xml
src/plugins-build/pom/xdocs index.xml
Log:
Resurrect pom:validate without licensing issues
Revision Changes Path
1.6 +18 -20 maven/src/plugins-build/pom/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/pom/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 30 Mar 2003 16:17:19 -0000 1.5
+++ plugin.jelly 20 Apr 2003 05:04:36 -0000 1.6
@@ -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"
- />
-
- <echo>POM is valid</echo>
+ <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>
+
+ <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>
1.16 +21 -48 maven/src/plugins-build/pom/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/pom/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 9 Apr 2003 01:06:48 -0000 1.15
+++ project.xml 20 Apr 2003 05:04:36 -0000 1.16
@@ -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,66 +53,45 @@
<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>
+ <id>xml-apis</id>
+ <version>1.0.b2</version>
<properties>
- <classloader>root.maven</classloader>
+ <classloader>root</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>
+ <id>maven</id>
+ <version>1.0-beta5</version>
+ <jar>maven.jar</jar>
</dependency>
+
<dependency>
- <id>junit</id>
- <version>3.8.1</version>
+ <id>isorelax</id>
+ <version>20030108</version>
<properties>
<classloader>root</classloader>
</properties>
</dependency>
+
+ <!-- validator being used -->
<dependency>
- <id>maven</id>
- <version>b5</version>
- <jar>maven.jar</jar>
+ <id>xercesjarv</id>
+ <version>20020712-DG</version>
<properties>
- <classloader>root.maven</classloader>
+ <classloader>root</classloader>gy
</properties>
</dependency>
+
<dependency>
- <id>xml-apis</id>
- <version>1.0.b2</version>
+ <id>xerces</id>
+ <version>2.2.1</version>
<properties>
<classloader>root</classloader>
</properties>
</dependency>
- <!-- runtime dependency for validate taglib -->
- <dependency>
- <id>isorelax</id>
- <version>20020414</version>
- </dependency>
- <dependency>
- <id>msv</id>
- <version>20020414</version>
- </dependency>
- <dependency>
- <id>relaxngDatatype</id>
- <version>20020414</version>
- </dependency>
</dependencies>
</project>
1.2 +2 -1 maven/src/plugins-build/pom/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/pom/xdocs/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 24 Jan 2003 03:44:33 -0000 1.1
+++ index.xml 20 Apr 2003 05:04:36 -0000 1.2
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org