vmassol 2003/09/07 13:32:24
Modified: integration/ant/src/java/org/apache/cactus/integration/ant
Tag: CACTUS_15_BRANCH CactusTask.java
Log:
Merged from CVS HEAD. I'm worried as it seems the first merge failed but no error
was reported to me... The second merge was better but not quite right and I had to
manually fix stuff. I'm worried that others errors like this may have crept in the 1.5
branch... Will need to do a thorough check before releasing it
Revision Changes Path
No revision
No revision
1.20.2.3 +0 -16
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactusTask.java
Index: CactusTask.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactusTask.java,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -r1.20.2.2 -r1.20.2.3
--- CactusTask.java 7 Sep 2003 20:19:13 -0000 1.20.2.2
+++ CactusTask.java 7 Sep 2003 20:32:23 -0000 1.20.2.3
@@ -105,13 +105,6 @@
private File warFile;
/**
- * The WAR context where the cactus tests are located. If not specified
- * this task will try to guess the context from the WAR file name or if
- * an EAR is used from parsing the <code>application.xml</code> file.
- */
- private String contextName;
-
- /**
* The factory for creating ant tasks that is passed to the containers.
*/
private AntTaskFactory antTaskFactory = new AntTaskFactory()
@@ -272,15 +265,6 @@
"You may only specify one of [earfile] and [warfile]");
}
this.warFile = theWarFile;
- }
-
- /**
- * @param theContextName the context name of the webapp where the Cactus
- * tests are located
- */
- public final void setContext(String theContextName)
- {
- this.contextName = theContextName;
}
// Private Methods ---------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
