Author: ptahchiev
Date: Thu Feb 28 02:25:32 2008
New Revision: 631916
URL: http://svn.apache.org/viewvc?rev=631916&view=rev
Log:
Added tests to the ant tasks.
Removed:
jakarta/cactus/trunk/integration/ant/src/test/
Modified:
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactifyEarTask.java
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactifyear.xml
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactifywar.xml
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactus.xml
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactustest.xml
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-runservertests.xml
Modified:
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactifyEarTask.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactifyEarTask.java?rev=631916&r1=631915&r2=631916&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactifyEarTask.java
(original)
+++
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactifyEarTask.java
Thu Feb 28 02:25:32 2008
@@ -287,6 +287,7 @@
Project.MSG_VERBOSE);
EjbRef ref = new EjbRef();
ref.setType("Session");
+ ref.setEjbName(name);
ref.setName("ejb/" + name);
ref.setEjbInterface(local);
ref.setEjbHomeInterface(localHome);
@@ -309,6 +310,7 @@
Project.MSG_VERBOSE);
EjbRef ref = new EjbRef();
ref.setType("Entity");
+ ref.setEjbName(name);
ref.setName("ejb/" + name);
ref.setEjbInterface(local);
ref.setEjbHomeInterface(localHome);
Modified:
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java?rev=631916&r1=631915&r2=631916&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
(original)
+++
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
Thu Feb 28 02:25:32 2008
@@ -145,7 +145,7 @@
addRedirectorNameProperties(deployableFile);
- if (containerSet.getCargos() == null)
+ if (containerSet==null || containerSet.getCargos() == null)
{
log("No cargo configurations specified, tests will run locally",
Project.MSG_VERBOSE);
Modified:
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java?rev=631916&r1=631915&r2=631916&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java
(original)
+++
jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java
Thu Feb 28 02:25:32 2008
@@ -130,7 +130,6 @@
}
}
}
- System.out.println("Could not find servlet redirs");
return null;
}
Modified:
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactifyear.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactifyear.xml?rev=631916&r1=631915&r2=631916&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactifyear.xml
(original)
+++
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactifyear.xml
Thu Feb 28 02:25:32 2008
@@ -1,27 +1,28 @@
<?xml version="1.0"?>
<project name="test-cactifyear" basedir="." default="help">
- <property name="work.dir" location="${basedir}/work"/>
+ <property name="work.dir" location="${basedir}/target/work"/>
+ <property name="src.dir"
location="${basedir}/src/test-input/org/apache/cactus/integration/ant/"/>
<target name="setUp">
<mkdir dir="${work.dir}"/>
</target>
<target name="testCanAddCactifiedWar">
- <cactifyear srcfile="empty.ear" destfile="${work.dir}/cactified.ear"/>
+ <cactifyear srcfile="${src.dir}/empty.ear"
destfile="${work.dir}/cactified.ear"/>
</target>
<target name="testCustomCactusWarContext">
- <cactifyear srcfile="empty.ear" destfile="${work.dir}/cactified.ear">
+ <cactifyear srcfile="${src.dir}/empty.ear"
destfile="${work.dir}/cactified.ear">
<cactuswar context="/myTestFramework" version="2.3"/>
</cactifyear>
</target>
<target name="testAddEjbReferences">
- <cactifyear srcfile="weblogic.ear"
+ <cactifyear srcfile="${src.dir}/weblogic.ear"
destfile="${work.dir}/cactified.ear"
addEjbReferences="yes">
- <cactuswar srcfile="weblogic.war"/>
+ <cactuswar srcfile="${src.dir}/weblogic.war"/>
</cactifyear>
</target>
Modified:
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactifywar.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactifywar.xml?rev=631916&r1=631915&r2=631916&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactifywar.xml
(original)
+++
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactifywar.xml
Thu Feb 28 02:25:32 2008
@@ -2,47 +2,47 @@
<project name="test-cactifywar" basedir="." default="help">
- <property name="work.dir" location="${basedir}/work"/>
-
+ <property name="work.dir" location="${basedir}/target/work"/>
+ <property name="src.dir"
location="${basedir}/src/test-input/org/apache/cactus/integration/ant/"/>
<target name="setUp">
<mkdir dir="${work.dir}"/>
</target>
<target name="testNeitherSrcFileNorVersionSet">
- <cactifywar destfile="destfile.war"/>
+ <cactifywar destfile="${work.dir}/destfile.war"/>
</target>
<target name="testDestFileNotSet">
- <cactifywar srcfile="empty.war"/>
+ <cactifywar srcfile="${src.dir}/empty.war"/>
</target>
<target name="testSrcFileWithoutWebXml">
- <cactifywar srcfile="nowebxml.war"
+ <cactifywar srcfile="${src.dir}/nowebxml.war"
destfile="${work.dir}/destfile.war"/>
</target>
<target name="testSrcFileWithoutWebXmlNewWebXml22">
- <cactifywar srcfile="nowebxml.war" version="2.2"
+ <cactifywar srcfile="${src.dir}/nowebxml.war" version="2.2"
destfile="${work.dir}/destfile.war"/>
</target>
<target name="testSrcFileWithoutWebXmlNewWebXml23">
- <cactifywar srcfile="nowebxml.war" version="2.3"
+ <cactifywar srcfile="${src.dir}/nowebxml.war" version="2.3"
destfile="${work.dir}/destfile.war"/>
</target>
<target name="testDefaultRedirectorsNoDoctype">
- <cactifywar srcfile="empty.war"
+ <cactifywar srcfile="${src.dir}/empty.war"
destfile="${work.dir}/destfile.war"/>
</target>
<target name="testDefaultRedirectors22Doctype">
- <cactifywar srcfile="empty-2_2.war"
+ <cactifywar srcfile="${src.dir}/empty-2_2.war"
destfile="${work.dir}/destfile.war"/>
</target>
<target name="testDefaultRedirectors23Doctype">
- <cactifywar srcfile="empty-2_3.war"
+ <cactifywar srcfile="${src.dir}/empty-2_3.war"
destfile="${work.dir}/destfile.war"/>
</target>
@@ -57,35 +57,35 @@
</target>
<target name="testCustomServletRedirectorMapping">
- <cactifywar srcfile="empty-2_3.war"
+ <cactifywar srcfile="${src.dir}/empty-2_3.war"
destfile="${work.dir}/destfile.war">
<servletredirector mapping="/test/servletRedirector"/>
</cactifywar>
</target>
<target name="testCustomJspRedirectorMapping">
- <cactifywar srcfile="empty-2_3.war"
+ <cactifywar srcfile="${src.dir}/empty-2_3.war"
destfile="${work.dir}/destfile.war">
<jspredirector mapping="/test/jspRedirector"/>
</cactifywar>
</target>
<target name="testCustomFilterRedirectorMapping">
- <cactifywar srcfile="empty-2_3.war"
+ <cactifywar srcfile="${src.dir}/empty-2_3.war"
destfile="${work.dir}/destfile.war">
<filterredirector mapping="/test/filterRedirector"/>
</cactifywar>
</target>
<target name="testCustomFilterRedirectorMappingIgnored">
- <cactifywar srcfile="empty-2_2.war"
+ <cactifywar srcfile="${src.dir}/empty-2_2.war"
destfile="${work.dir}/destfile.war">
<filterredirector mapping="/test/filterRedirector"/>
</cactifywar>
</target>
<target name="testMultipleNamedServletRedirectors">
- <cactifywar srcfile="empty-2_3.war"
+ <cactifywar srcfile="${src.dir}/empty-2_3.war"
destfile="${work.dir}/destfile.war">
<servletredirector name="ServletRedirector"
mapping="/test/ServletRedirector"/>
@@ -95,7 +95,7 @@
</target>
<target name="testMultipleNamedJspRedirectors">
- <cactifywar srcfile="empty-2_3.war"
+ <cactifywar srcfile="${src.dir}/empty-2_3.war"
destfile="${work.dir}/destfile.war">
<jspredirector name="JspRedirector"
mapping="/test/JspRedirector"/>
@@ -105,7 +105,7 @@
</target>
<target name="testMultipleNamedFilterRedirectors">
- <cactifywar srcfile="empty-2_3.war"
+ <cactifywar srcfile="${src.dir}/empty-2_3.war"
destfile="${work.dir}/destfile.war">
<filterredirector name="FilterRedirector"
mapping="/test/FilterRedirector"/>
@@ -115,7 +115,7 @@
</target>
<target name="testSecuredServletRedirector">
- <cactifywar srcfile="empty-2_3.war"
+ <cactifywar srcfile="${src.dir}/empty-2_3.war"
destfile="${work.dir}/destfile.war">
<servletredirector name="ServletRedirectorSecure"
mapping="/ServletRedirectorSecure"
@@ -124,7 +124,7 @@
</target>
<target name="testLoginConfigNotOverwritten">
- <cactifywar srcfile="formloginconfig.war"
+ <cactifywar srcfile="${src.dir}/formloginconfig.war"
destfile="${work.dir}/destfile.war">
<servletredirector name="ServletRedirectorSecure"
mapping="/ServletRedirectorSecure"
@@ -133,16 +133,16 @@
</target>
<target name="testNoDuplicateJars">
- <cactifywar srcfile="containscactusjars.war"
+ <cactifywar srcfile="${src.dir}/containscactusjars.war"
destfile="${work.dir}/destfile.war"/>
</target>
<target name="testAddWeblogicEjbRefs">
- <cactifywar srcfile="weblogic.war"
+ <cactifywar srcfile="${src.dir}/weblogic.war"
destfile="${work.dir}/destfile.war">
<ejbref name="MyEjb"
- localInterface="com.wombat.MyEjb"
- localHomeInterface="com.wombat.MyEjbHome"
+ ejbInterface="com.wombat.MyEjb"
+ ejbHomeInterface="com.wombat.MyEjbHome"
jndiName="/wombat/MyEjb"
type="Session"/>
</cactifywar>
Modified:
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactus.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactus.xml?rev=631916&r1=631915&r2=631916&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactus.xml
(original)
+++
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactus.xml
Thu Feb 28 02:25:32 2008
@@ -1,33 +1,33 @@
<?xml version="1.0"?>
<project name="test-cactus" basedir="." default="setup">
-
+ <property name="src.dir"
location="${basedir}/src/test-input/org/apache/cactus/integration/ant/"/>
<target name="testNeitherWarFileNorEarFileSet">
<cactus/>
</target>
<target name="testWarFileNotExisting">
- <cactus warfile="idontexist.war"/>
+ <cactus warfile="${src.dir}/idontexist.war"/>
</target>
<target name="testWarFileNotCactified">
- <cactus warfile="empty.war"/>
+ <cactus warfile="${src.dir}/empty.war"/>
</target>
<target name="testWarFileCactified">
- <cactus warfile="cactified.war"/>
+ <cactus warfile="${src.dir}/cactified.war"/>
</target>
<target name="testEarFileEmpty">
- <cactus earfile="empty.ear"/>
+ <cactus earfile="${src.dir}/empty.ear"/>
</target>
<target name="testEarFileNotCactified">
- <cactus earfile="notcactified.ear"/>
+ <cactus earfile="${src.dir}/notcactified.ear"/>
</target>
<target name="testEarFileCactified">
- <cactus earfile="cactified.ear"/>
+ <cactus earfile="${src.dir}/cactified.ear"/>
</target>
</project>
Modified:
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactustest.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactustest.xml?rev=631916&r1=631915&r2=631916&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactustest.xml
(original)
+++
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactustest.xml
Thu Feb 28 02:25:32 2008
@@ -1,33 +1,33 @@
<?xml version="1.0"?>
<project name="test-cactustest" basedir="." default="setup">
-
+ <property name="src.dir"
location="${basedir}/src/test-input/org/apache/cactus/integration/ant/"/>
<target name="testNeitherWarFileNorEarFileSet">
<cactustests/>
</target>
<target name="testWarFileNotExisting">
- <cactustests runlocal="true" warfile="idontexist.war"/>
+ <cactustests runlocal="true" warfile="${src.dir}/idontexist.war"/>
</target>
<target name="testWarFileNotCactified">
- <cactustests runlocal="true" warfile="empty.war"/>
+ <cactustests runlocal="true" warfile="${src.dir}/empty.war"/>
</target>
<target name="testWarFileCactified">
- <cactustests runlocal="true" warfile="cactified.war"/>
+ <cactustests runlocal="true" warfile="${src.dir}/cactified.war"/>
</target>
<target name="testEarFileEmpty">
- <cactustests runlocal="true" earfile="empty.ear"/>
+ <cactustests runlocal="true" earfile="${src.dir}/empty.ear"/>
</target>
<target name="testEarFileNotCactified">
- <cactustests runlocal="true" earfile="notcactified.ear"/>
+ <cactustests runlocal="true" earfile="${src.dir}/notcactified.ear"/>
</target>
<target name="testEarFileCactified">
- <cactustests runlocal="true" earfile="cactified.ear"/>
+ <cactustests runlocal="true" earfile="${src.dir}/cactified.ear"/>
</target>
</project>
Modified:
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-runservertests.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-runservertests.xml?rev=631916&r1=631915&r2=631916&view=diff
==============================================================================
---
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-runservertests.xml
(original)
+++
jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-runservertests.xml
Thu Feb 28 02:25:32 2008
@@ -2,8 +2,8 @@
<project name="test-runservertests" basedir="." default="help">
- <property name="work.dir" location="${basedir}/work"/>
-
+ <property name="work.dir" location="${basedir}/target/work"/>
+
<target name="setUp">
<mkdir dir="${work.dir}"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
