From 4bfc8390b75fcc1364806a1387d5609c5f95fffe Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 24 Sep 2003 04:46:33 +0000
Subject: [PATCH] Make pom:validate work again.

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

diff --git a/pom/plugin.jelly b/pom/plugin.jelly
index 81f6857a..13baaa4e 100644
--- a/pom/plugin.jelly
+++ b/pom/plugin.jelly
@@ -31,17 +31,17 @@
     name="pom:validate"
     description="Validate the Maven XML project descriptor">
 
-    <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}" />
-
+    <path id="validate.path">
+      <pathelement path="${plugin.getDependencyPath('isorelax')}"/>
+      <pathelement path="${plugin.getDependencyPath('thaiopensource:jing')}"/>
+      <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+    </path>
+    
+    <java classname="com.thaiopensource.relaxng.util.Driver" fork="true">
+      <classpath refid="validate.path"/>
+      <arg value="${maven.home}/maven-project.xsd"/>
+      <arg value="${pom.file.canonicalPath}"/>
+    </java>
   </goal>
   
   <goal
diff --git a/pom/project.xml b/pom/project.xml
index 3ee63c42..a879af3e 100644
--- a/pom/project.xml
+++ b/pom/project.xml
@@ -49,17 +49,11 @@
     <dependency>
       <id>dom4j</id>
       <version>1.4</version>
-      <properties>
-        <classloader>root.maven</classloader>
-      </properties>
     </dependency>
 
     <dependency>
       <id>xml-apis</id>
       <version>1.0.b2</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
     </dependency>
     
     <dependency>
@@ -78,8 +72,9 @@
 
     <!-- validator being used -->
     <dependency>
-      <id>xercesjarv</id>
-      <version>20020712-DG</version>
+      <groupId>thaiopensource</groupId>
+      <artifactId>jing</artifactId>
+      <version>20030619</version>
       <properties>
         <classloader>root</classloader>
       </properties>