[jboss-cvs] JBossAS SVN: r102715 - in projects/jboss-jca/trunk/validator: src/main/java/org/jboss/jca/validator/ant and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2010-03-22 05:08:32 -0400 (Mon, 22 Mar 2010)
New Revision: 102715

Modified:
   projects/jboss-jca/trunk/validator/.classpath
   projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ant/ValidatorTask.java
   projects/jboss-jca/trunk/validator/src/main/resources/validator.xml
Log:
[JBJCA-290] ant task -classpath property

Modified: projects/jboss-jca/trunk/validator/.classpath
===================================================================
--- projects/jboss-jca/trunk/validator/.classpath	2010-03-22 07:15:34 UTC (rev 102714)
+++ projects/jboss-jca/trunk/validator/.classpath	2010-03-22 09:08:32 UTC (rev 102715)
@@ -2,9 +2,12 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="eclipse-target/tests-classes" path="src/test/java"/>
+	<classpathentry excluding="**/*.java" kind="src" output="eclipse-target/tests-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-api"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jboss-jca-common"/>
 	<classpathentry kind="var" path="JBJCA_LIB/standalone/jboss-metadata-rar.jar"/>
+	<classpathentry kind="var" path="JBJCA_LIB/standalone/ant.jar"/>
 	<classpathentry kind="output" path="eclipse-target/classes"/>
 </classpath>

Modified: projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ant/ValidatorTask.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ant/ValidatorTask.java	2010-03-22 07:15:34 UTC (rev 102714)
+++ projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ant/ValidatorTask.java	2010-03-22 09:08:32 UTC (rev 102715)
@@ -27,6 +27,8 @@
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.CommandlineJava;
+import org.apache.tools.ant.types.Path;
 
 /**
  * A ValidatorTask.
@@ -43,6 +45,9 @@
    /** file need to be validated */
    private String rarFile;
    
+   /** CommandlineJava */
+   private CommandlineJava cmdl = new CommandlineJava();
+   
    /**
     * Constructor
     */
@@ -92,6 +97,36 @@
    }
 
    /**
+    * Set the classpath to be used when running the Java class.
+    *
+    * @param s an Ant Path object containing the classpath.
+    */
+   public void setClasspath(Path s)
+   {
+      createClasspath().append(s);
+   }
+
+   /**
+    * Add a path to the classpath.
+    *
+    * @return created classpath.
+    */
+   public Path createClasspath()
+   {
+      return getCommandLine().createClasspath(getProject()).createPath();
+   }
+
+   /**
+    * Accessor to the command line.
+    *
+    * @return the current command line.
+    */
+   public CommandlineJava getCommandLine()
+   {
+      return cmdl;
+   }
+
+   /**
     * Execute
     * @exception BuildException If the build fails
     */
@@ -105,9 +140,7 @@
          
          Main main = new Main();
 
-         //main.setOutput(getOutput());
-
-         main.validate(new File(getRarFile()).toURI().toURL(), getOutputDir());
+         main.validate(new File(getRarFile()).toURI().toURL(), getOutputDir(), getCommandLine().getClasspath().list());
       }
       catch (Throwable t) 
       {

Modified: projects/jboss-jca/trunk/validator/src/main/resources/validator.xml
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/validator.xml	2010-03-22 07:15:34 UTC (rev 102714)
+++ projects/jboss-jca/trunk/validator/src/main/resources/validator.xml	2010-03-22 09:08:32 UTC (rev 102715)
@@ -12,7 +12,13 @@
          classpathref="validator.lib.path.id"/>
          
   <target name="validate">
-    <validator outputDir="." rarFile="../deploy/ra16inout.rar"/>
+    <validator outputDir="." rarFile="../deploy/ra16inout.rar">
+     <classpath>
+       <fileset dir="${basedir}/lib">
+         <include name="**/*.jar"/>
+       </fileset>
+     </classpath>
+    </validator>
   </target>
 </project>