[jboss-cvs] JBossAS SVN: r101757 - in projects/jboss-jca/trunk: validator and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 3 02:30:13 EST 2010
Author: jeff.zhang
Date: 2010-03-03 02:30:11 -0500 (Wed, 03 Mar 2010)
New Revision: 101757
Added:
projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ant/
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/package.html
projects/jboss-jca/trunk/validator/src/main/resources/validator-ant-manifest.mf
projects/jboss-jca/trunk/validator/src/main/resources/validator.xml
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/ivy.xml
projects/jboss-jca/trunk/validator/build.xml
projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Main.java
projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Validator.java
projects/jboss-jca/trunk/validator/src/main/resources/validator-cli-manifest.mf
projects/jboss-jca/trunk/validator/src/main/resources/validator-manifest.mf
Log:
[JBJCA-290] Ant task for validate tool
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2010-03-03 07:06:18 UTC (rev 101756)
+++ projects/jboss-jca/trunk/build.xml 2010-03-03 07:30:11 UTC (rev 101757)
@@ -74,6 +74,7 @@
Versions
================================= -->
<property name="version.activation" value="1.1.1"/>
+ <property name="version.ant" value="1.7.1"/>
<property name="version.apache-log4j" value="1.2.14"/>
<property name="version.apache-logging" value="1.1.0.jboss"/>
<property name="version.apache-xerces" value="2.9.1"/>
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2010-03-03 07:06:18 UTC (rev 101756)
+++ projects/jboss-jca/trunk/ivy.xml 2010-03-03 07:30:11 UTC (rev 101757)
@@ -47,6 +47,7 @@
<dependency org="jboss.jbossts" name="jbossjts" rev="${version.jboss.ts}" conf="standalone->default;sjc->*"/>
<dependency org="jboss.jbossts" name="jbossjts-integration" rev="${version.jboss.ts}" conf="standalone->default;sjc->*"/>
<dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="standalone->default;sjc->*"/>
+ <dependency org="org.apache.ant" name="ant" rev="${version.ant}" conf="standalone->default;sjc->*"/>
<dependency org="junit" name="junit" rev="${version.junit}" conf="test->default"/>
<dependency org="org.mockito" name="mockito-all" rev="${version.mockito}" conf="test->default"/>
<dependency org="org.eclipse.jdt" name="core" rev="${version.eclipse-jdt}" conf="standalone->default;sjc->*"/>
Modified: projects/jboss-jca/trunk/validator/build.xml
===================================================================
--- projects/jboss-jca/trunk/validator/build.xml 2010-03-03 07:06:18 UTC (rev 101756)
+++ projects/jboss-jca/trunk/validator/build.xml 2010-03-03 07:30:11 UTC (rev 101757)
@@ -73,6 +73,11 @@
manifest="src/main/resources/validator-cli-manifest.mf"
basedir="${build.validator.dir}/jars/validator"
includes="**/Main*.class"/>
+
+ <jar destfile="${target.dir}/jboss-jca-validator-ant.jar"
+ manifest="src/main/resources/validator-ant-manifest.mf"
+ basedir="${build.validator.dir}/jars/validator"
+ includes="**/ant/**"/>
</target>
<!-- =================================
Modified: projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Main.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Main.java 2010-03-03 07:06:18 UTC (rev 101756)
+++ projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Main.java 2010-03-03 07:30:11 UTC (rev 101757)
@@ -69,7 +69,7 @@
* @param output directory of output
* @return The system exit code
*/
- private static int validate(URL url, String output)
+ public static int validate(URL url, String output)
{
if (url == null || !(url.toExternalForm().endsWith(".rar") || url.toExternalForm().endsWith(".rar/")))
return FAIL;
Modified: projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Validator.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Validator.java 2010-03-03 07:06:18 UTC (rev 101756)
+++ projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Validator.java 2010-03-03 07:30:11 UTC (rev 101757)
@@ -107,7 +107,7 @@
List<Rule> rules = extractRules(allRules);
return execRulesOnValidates(objects, rules);
- }
+ }
/**
* exec rules
Added: 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 (rev 0)
+++ projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ant/ValidatorTask.java 2010-03-03 07:30:11 UTC (rev 101757)
@@ -0,0 +1,122 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008-2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.validator.ant;
+
+import org.jboss.jca.validator.Main;
+
+import java.io.File;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+/**
+ * A ValidatorTask.
+ *
+ * @author Jeff Zhang</a>
+ * @version $Revision: $
+ */
+public class ValidatorTask extends Task
+{
+
+ /** output directory */
+ private String outputDir;
+
+ /** file need to be validated */
+ private String rarFile;
+
+ /**
+ * Constructor
+ */
+ public ValidatorTask()
+ {
+ outputDir = ".";
+ }
+
+ /**
+ * Get the output directory.
+ *
+ * @return the outputDir.
+ */
+ public String getOutputDir()
+ {
+ return outputDir;
+ }
+
+ /**
+ * Set the output directory.
+ *
+ * @param outputDir The outputDir to set.
+ */
+ public void setOutputDir(String outputDir)
+ {
+ this.outputDir = outputDir;
+ }
+
+ /**
+ * Get the rarFile.
+ *
+ * @return the rarFile.
+ */
+ public String getRarFile()
+ {
+ return rarFile;
+ }
+
+ /**
+ * Set the rarFile.
+ *
+ * @param rarFile The rarFile to set.
+ */
+ public void setRarFile(String rarFile)
+ {
+ this.rarFile = rarFile;
+ }
+
+ /**
+ * Execute
+ * @exception BuildException If the build fails
+ */
+ @Override
+ public void execute() throws BuildException
+ {
+ ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ Thread.currentThread().setContextClassLoader(ValidatorTask.class.getClassLoader());
+
+ Main main = new Main();
+
+ //main.setOutput(getOutput());
+
+ main.validate(new File(getRarFile()).toURI().toURL(), getOutputDir());
+ }
+ catch (Throwable t)
+ {
+ throw new BuildException(t.getMessage(), t);
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(oldCL);
+ }
+ }
+
+}
Added: projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ant/package.html
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ant/package.html (rev 0)
+++ projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ant/package.html 2010-03-03 07:30:11 UTC (rev 101757)
@@ -0,0 +1,3 @@
+<body>
+This package contains the specification validator ant task
+</body>
Added: projects/jboss-jca/trunk/validator/src/main/resources/validator-ant-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/validator-ant-manifest.mf (rev 0)
+++ projects/jboss-jca/trunk/validator/src/main/resources/validator-ant-manifest.mf 2010-03-03 07:30:11 UTC (rev 101757)
@@ -0,0 +1,5 @@
+Implementation-Title: JBoss JCA Validator Command Line Tool
+Implementation-Vendor: Red Hat Middleware LLC
+Implementation-Vendor-Id: org.jboss
+Implementation-Version: 0.1
+Class-Path: jboss-jca-validator-cli.jar
Modified: projects/jboss-jca/trunk/validator/src/main/resources/validator-cli-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/validator-cli-manifest.mf 2010-03-03 07:06:18 UTC (rev 101756)
+++ projects/jboss-jca/trunk/validator/src/main/resources/validator-cli-manifest.mf 2010-03-03 07:30:11 UTC (rev 101757)
@@ -3,4 +3,4 @@
Implementation-Vendor-Id: org.jboss
Implementation-Version: 0.1
Main-Class: org.jboss.jca.validator.Main
-Class-Path: jbossxb.jar jboss-logging-spi.jar jboss-common-core.jar jboss-metadata-rar.jar jboss-metadata-common.jar jboss-reflect.jar jboss-mdr.jar jboss-jca-spec-api.jar papaki-core.jar javassist.jar jboss-jca-common-impl.jar jboss-jca-validator.jar
+Class-Path: jboss-jca-validator.jar
Modified: projects/jboss-jca/trunk/validator/src/main/resources/validator-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/validator-manifest.mf 2010-03-03 07:06:18 UTC (rev 101756)
+++ projects/jboss-jca/trunk/validator/src/main/resources/validator-manifest.mf 2010-03-03 07:30:11 UTC (rev 101757)
@@ -2,3 +2,4 @@
Implementation-Vendor: Red Hat Middleware LLC
Implementation-Vendor-Id: org.jboss
Implementation-Version: 0.1
+Class-Path: jbossxb.jar jboss-logging-spi.jar jboss-common-core.jar jboss-metadata-rar.jar jboss-metadata-common.jar jboss-reflect.jar jboss-mdr.jar jboss-jca-spec-api.jar papaki-core.jar javassist.jar jboss-jca-common-impl.jar
\ No newline at end of file
Added: projects/jboss-jca/trunk/validator/src/main/resources/validator.xml
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/validator.xml (rev 0)
+++ projects/jboss-jca/trunk/validator/src/main/resources/validator.xml 2010-03-03 07:30:11 UTC (rev 101757)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<project name="ValidatorProject" default="validate" basedir="..">
+ <path id="validator.lib.path.id">
+ <fileset dir="${basedir}/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <taskdef name="validator"
+ classname="org.jboss.jca.validator.ant.ValidatorTask"
+ classpathref="validator.lib.path.id"/>
+
+ <target name="validate">
+ <validator outputDir="." rarFile="../deploy/ra16inout.rar"/>
+ </target>
+</project>
+
+
+
+
More information about the jboss-cvs-commits
mailing list