[portal-commits] JBoss Portal SVN: r8557 - in modules/test/trunk/tooling: src/main/org/jboss/unit/tooling/ant and 1 other directory.
Author: bdaw
Date: 2007-10-08 08:12:52 -0400 (Mon, 08 Oct 2007)
New Revision: 8557
Modified:
modules/test/trunk/tooling/build.xml
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/JBossUnitTask.java
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/TestsTask.java
Log:
remove unneeded taskdef and typedef
Modified: modules/test/trunk/tooling/build.xml
===================================================================
--- modules/test/trunk/tooling/build.xml 2007-10-07 23:14:52 UTC (rev 8556)
+++ modules/test/trunk/tooling/build.xml 2007-10-08 12:12:52 UTC (rev 8557)
@@ -211,19 +211,8 @@
name="jboss-unit"
classname="org.jboss.unit.tooling.ant.JBossUnitTask"
classpathref="jboss.unit.tooling.test.classpath"/>
- <taskdef
- name="tests"
- classname="org.jboss.unit.tooling.ant.TestsTask"
- classpathref="jboss.unit.tooling.test.classpath"/>
- <typedef
- name="include"
- classname="org.jboss.unit.tooling.ant.IncludeTask"
- classpathref="jboss.unit.tooling.test.classpath" />
- <typedef
- name="exclude"
- classname="org.jboss.unit.tooling.ant.ExcludeTask"
- classpathref="jboss.unit.tooling.test.classpath"/>
+
<jboss-unit>
<tests
config="/home/bdaw/Workshop/JBoss/portal/modules/test/trunk/tooling/output/resources/test/bobo-tests.xml">
Modified:
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/JBossUnitTask.java
===================================================================
---
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/JBossUnitTask.java 2007-10-07
23:14:52 UTC (rev 8556)
+++
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/JBossUnitTask.java 2007-10-08
12:12:52 UTC (rev 8557)
@@ -46,6 +46,7 @@
public void addConfiguredTests(TestsTask tests)
{
+ tests.setProject(getProject());
testsTasks.add(tests);
}
Modified: modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/TestsTask.java
===================================================================
---
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/TestsTask.java 2007-10-07
23:14:52 UTC (rev 8556)
+++
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/TestsTask.java 2007-10-08
12:12:52 UTC (rev 8557)
@@ -24,6 +24,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.taskdefs.Java;
import org.jboss.unit.tooling.IncludeTestFilter;
@@ -43,7 +44,7 @@
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot
com">Boleslaw Dawidowicz</a>
* @version $Revision: 0.1 $
*/
-public class TestsTask extends Task
+public class TestsTask
{
private String config;
@@ -53,6 +54,8 @@
private List<ExcludeTask> excludes = new LinkedList();
+ private Project project;
+
private Path path;
@@ -93,6 +96,12 @@
Java javaTask = null;
try
{
+
+ if (getProject() == null)
+ {
+ throw new IllegalStateException("Current project is missing. Task was
not setup properly");
+ }
+
javaTask = (Java)getProject().createTask("java");
@@ -267,4 +276,15 @@
{
this.fork = fork;
}
+
+
+ public Project getProject()
+ {
+ return project;
+ }
+
+ public void setProject(Project project)
+ {
+ this.project = project;
+ }
}