From 47ea8bae727f89e6773c62122dd0af6cd5a007a9 Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 20 Sep 2005 04:49:55 +0000
Subject: [PATCH] Make pom:validate use the new plugin:validate-xml tag

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@290356 13f79535-47bb-0310-9956-ffa450edef68
---
 pom/plugin.jelly | 28 +++++++++++-----------------
 pom/project.xml  | 22 ----------------------
 2 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/pom/plugin.jelly b/pom/plugin.jelly
index 1968f638..f803796d 100644
--- a/pom/plugin.jelly
+++ b/pom/plugin.jelly
@@ -22,6 +22,7 @@
   xmlns:j="jelly:core"
   xmlns:d="jelly:define"
   xmlns:pom="pom"
+  xmlns:plugin="plugin"
   xmlns:util="jelly:util"
   xmlns:ant="jelly:ant"
   xmlns:artifact="artifact">
@@ -54,17 +55,10 @@
   <!-- ================================================================== -->
   <!-- V A L I D A T E  P O M                                             -->
   <!-- ================================================================== -->
-  <goal name="pom:validate" prereqs="pom:verify-version"
-      description="Validate the Maven XML project descriptor">
+  <goal
+    name="pom:validate"
+    description="Validate the Maven XML project descriptor">
 
-    <path id="validate.path">
-      <pathelement path="${plugin.getDependencyPath('isorelax')}"/>
-      <pathelement path="${plugin.getDependencyPath('thaiopensource:jing')}"/>
-      <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
-      <pathelement path="${plugin.getDependencyPath('xerces')}"/>
-    </path>
-
-    <!-- Support Maven 1.0 rc1 and before which only had a single XSD file. -->
     <j:set var="xsd" 
         value="${maven.home}/maven-project-${pom.pomVersion}.xsd"/>
     <util:file var="xsdAsFile" name="${xsd}"/>
@@ -72,15 +66,15 @@
       <j:set var="xsd" 
           value="${maven.home}/maven-project.xsd"/>
     </j:if>
-    
-    <java classname="com.thaiopensource.relaxng.util.Driver" fork="true">
-      <classpath refid="validate.path"/>
-      <arg value="${xsd}"/>
-      <arg value="${pom.file.canonicalPath}"/>
-    </java>
+    <echo>xsd file: ${xsd}</echo>
+
+    <plugin:validate-xml
+        schema="${xsd}"
+        file="${pom.file.canonicalPath}"/>
 
   </goal>
-  
+
+
   <goal name="pom:contentvalidate"
       description="Validate the content of the Maven POM">
 
diff --git a/pom/project.xml b/pom/project.xml
index e3ef8ad3..3b515a86 100644
--- a/pom/project.xml
+++ b/pom/project.xml
@@ -87,32 +87,10 @@
       <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
     </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
-    </dependency>
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven</artifactId>
       <version>1.0</version>
     </dependency>
-    <dependency>
-      <groupId>isorelax</groupId>
-      <artifactId>isorelax</artifactId>
-      <version>20030108</version>
-    </dependency>
-    <!-- validator being used -->
-
-    <dependency>
-      <groupId>thaiopensource</groupId>
-      <artifactId>jing</artifactId>
-      <version>20030619</version>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xerces</artifactId>
-      <version>2.4.0</version>
-    </dependency>
   </dependencies>
 </project>